aes.h   aes.h 
skipping to change at line 35 skipping to change at line 35
#ifndef _AES_H #ifndef _AES_H
#define _AES_H #define _AES_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
#include "beecrypt/aesopt.h" #include "beecrypt/aesopt.h"
/*!\brief Holds all the parameters necessary for the AES cipher. /*!\brief Holds all the parameters necessary for the AES cipher.
* \ingroup BC_aes_m * \ingroup BC_aes_m
*/ */
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI aesParam
#else
struct _aesParam
#endif
{ {
/*!\var k /*!\var k
* \brief Holds the key expansion. * \brief Holds the key expansion.
*/ */
uint32_t k[64]; uint32_t k[64];
/*!\var nr /*!\var nr
* \brief Number of rounds to be used in encryption/decryption. * \brief Number of rounds to be used in encryption/decryption.
*/ */
uint32_t nr; uint32_t nr;
/*!\var fdback /*!\var fdback
* \brief Buffer to be used by block chaining or feedback modes. * \brief Buffer to be used by block chaining or feedback modes.
*/ */
uint32_t fdback[4]; uint32_t fdback[4];
} aesParam; };
#ifndef __cplusplus
typedef struct _aesParam aesParam;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*!\var aes /*!\var aes
* \brief Holds the full API description of the AES algorithm. * \brief Holds the full API description of the AES algorithm.
*/ */
extern const BEECRYPTAPI blockCipher aes; extern const BEECRYPTAPI blockCipher aes;
 End of changes. 2 change blocks. 
2 lines changed or deleted 10 lines changed or added


 api.h   api.h 
/* /*
* Copyright (c) 2001, 2002 Virtual Unlimited B.V. * Copyright (c) 2001, 2002, 2004 Beeyond Software Holding BV
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 58 skipping to change at line 58
# define BEECRYPTAPI # define BEECRYPTAPI
# define BEECRYPTCXXAPI # define BEECRYPTCXXAPI
#endif #endif
#ifndef ROTL32 #ifndef ROTL32
# define ROTL32(x, s) (((x) << (s)) | ((x) >> (32 - (s)))) # define ROTL32(x, s) (((x) << (s)) | ((x) >> (32 - (s))))
#endif #endif
#ifndef ROTR32 #ifndef ROTR32
# define ROTR32(x, s) (((x) >> (s)) | ((x) << (32 - (s)))) # define ROTR32(x, s) (((x) >> (s)) | ((x) << (32 - (s))))
#endif #endif
#ifndef ROTR64
# define ROTR64(x, s) (((x) >> (s)) | ((x) << (64 - (s))))
#endif
typedef uint8_t byte; typedef uint8_t byte;
typedef int8_t javabyte; typedef int8_t javabyte;
typedef int16_t javashort; typedef int16_t javashort;
typedef int32_t javaint; typedef int32_t javaint;
typedef int64_t javalong; typedef int64_t javalong;
typedef uint16_t javachar; typedef uint16_t javachar;
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 beecrypt.h   beecrypt.h 
skipping to change at line 575 skipping to change at line 575
* \sa aesParam, blowfishParam. * \sa aesParam, blowfishParam.
* \ingroup BC_m * \ingroup BC_m
*/ */
typedef void blockCipherParam; typedef void blockCipherParam;
/*!\brief Prototype definition for a setup function. /*!\brief Prototype definition for a setup function.
* \ingroup BC_m * \ingroup BC_m
*/ */
typedef int (*blockCipherSetup )(blockCipherParam*, const byte*, size_t, c ipherOperation); typedef int (*blockCipherSetup )(blockCipherParam*, const byte*, size_t, c ipherOperation);
/*!\typedef int (*blockCipherSetIV)(blockCipherPatam* bp, const byte* iv) /*!\typedef int (*blockCipherSetIV)(blockCipherParam* bp, const byte* iv)
* \brief Prototype definition for an initialization vector setup function. * \brief Prototype definition for an initialization vector setup function.
* \param bp The blockcipher's parameters. * \param bp The blockcipher's parameters.
* \param iv The blockciphers' IV value. * \param iv The blockciphers' IV value.
* \note iv length must be equal to the cipher's block size. * \note iv length must be equal to the cipher's block size.
* \retval 0 on success. * \retval 0 on success.
* \retval -1 on failure. * \retval -1 on failure.
* \ingroup BC_m * \ingroup BC_m
*/ */
typedef int (*blockCipherSetIV )(blockCipherParam*, const byte*); typedef int (*blockCipherSetIV )(blockCipherParam*, const byte*);
skipping to change at line 681 skipping to change at line 681
*/ */
const blockCipherRaw raw; const blockCipherRaw raw;
/*!\var ecb /*!\var ecb
* \brief The cipher's ECB functions. * \brief The cipher's ECB functions.
*/ */
const blockCipherMode ecb; const blockCipherMode ecb;
const blockCipherMode cbc; const blockCipherMode cbc;
/*!\var getfb /*!\var getfb
* \brief Pointer to the cipher's feedback-returning function. * \brief Pointer to the cipher's feedback-returning function.
*/ */
const blockCipherFeedback getfb; const blockCipherFeedback getfb;
}; };
#ifndef __cplusplus #ifndef __cplusplus
typedef struct _blockCipher blockCipher; typedef struct _blockCipher blockCipher;
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
skipping to change at line 711 skipping to change at line 711
* \brief This function returns the \a n -th blockcipher implemented by * \brief This function returns the \a n -th blockcipher implemented by
* the library. * the library.
* \param n Index of the requested blockcipher; legal values are 0 * \param n Index of the requested blockcipher; legal values are 0
* through blockCipherCount() - 1. * through blockCipherCount() - 1.
* \return A pointer to a blockcipher or null, if the index was out of * \return A pointer to a blockcipher or null, if the index was out of
* range. * range.
*/ */
BEECRYPTAPI BEECRYPTAPI
const blockCipher* blockCipherGet(int); const blockCipher* blockCipherGet(int);
/*!\fn const blockCIiher* blockCipherFind(const char* name) /*!\fn const blockCipher* blockCipherFind(const char* name)
* \brief This function returns the blockcipher specified by the given name . * \brief This function returns the blockcipher specified by the given name .
* \param name Name of the requested blockcipher. * \param name Name of the requested blockcipher.
* \return A pointer to a blockcipher or null, if the name wasn't found. * \return A pointer to a blockcipher or null, if the name wasn't found.
*/ */
BEECRYPTAPI BEECRYPTAPI
const blockCipher* blockCipherFind(const char*); const blockCipher* blockCipherFind(const char*);
/*!\fn const blockCipher* blockCipherDefault() /*!\fn const blockCipher* blockCipherDefault()
* \brief This functions returns the default blockcipher; the default value * \brief This functions returns the default blockcipher; the default value
* can be specified by setting environment variable BEECRYPT_CIPHER. * can be specified by setting environment variable BEECRYPT_CIPHER.
skipping to change at line 792 skipping to change at line 792
BEECRYPTAPI BEECRYPTAPI
int blockCipherContextFree(blockCipherContext*); int blockCipherContextFree(blockCipherContext*);
BEECRYPTAPI BEECRYPTAPI
int blockCipherContextECB(blockCipherContext*, uint32_t*, const uint32_t*, int); int blockCipherContextECB(blockCipherContext*, uint32_t*, const uint32_t*, int);
BEECRYPTAPI BEECRYPTAPI
int blockCipherContextCBC(blockCipherContext*, uint32_t*, const uint32_t*, int); int blockCipherContextCBC(blockCipherContext*, uint32_t*, const uint32_t*, int);
BEECRYPTAPI
int blockCipherContextValidKeylen(blockCipherContext*, size_t);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 4 change blocks. 
3 lines changed or deleted 6 lines changed or added


 blowfish.h   blowfish.h 
skipping to change at line 46 skipping to change at line 46
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
#include "beecrypt/blowfishopt.h" #include "beecrypt/blowfishopt.h"
#define BLOWFISHROUNDS 16 #define BLOWFISHROUNDS 16
#define BLOWFISHPSIZE (BLOWFISHROUNDS+2) #define BLOWFISHPSIZE (BLOWFISHROUNDS+2)
/*!\brief Holds all the parameters necessary for the Blowfish cipher. /*!\brief Holds all the parameters necessary for the Blowfish cipher.
* \ingroup BC_blowfish_m * \ingroup BC_blowfish_m
*/ */
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI blowfishParam
#else
struct _blowfishParam
#endif
{ {
/*!\var p /*!\var p
* \brief Holds the key expansion. * \brief Holds the key expansion.
*/ */
uint32_t p[BLOWFISHPSIZE]; uint32_t p[BLOWFISHPSIZE];
/*!\var s /*!\var s
* \brief Holds the s-boxes. * \brief Holds the s-boxes.
*/ */
uint32_t s[1024]; uint32_t s[1024];
/*!\var fdback /*!\var fdback
* \brief Buffer to be used by block chaining or feedback modes. * \brief Buffer to be used by block chaining or feedback modes.
*/ */
uint32_t fdback[2]; uint32_t fdback[2];
} blowfishParam; };
#ifndef __cplusplus
typedef struct _blowfishParam blowfishParam;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*!\var blowfish /*!\var blowfish
* \brief Holds the full API description of the Blowfish algorithm. * \brief Holds the full API description of the Blowfish algorithm.
*/ */
extern const BEECRYPTAPI blockCipher blowfish; extern const BEECRYPTAPI blockCipher blowfish;
 End of changes. 2 change blocks. 
2 lines changed or deleted 10 lines changed or added


 dhaes.h   dhaes.h 
skipping to change at line 39 skipping to change at line 39
* \author Bob Deblier <bob.deblier@pandora.be> * \author Bob Deblier <bob.deblier@pandora.be>
* \ingroup DL_m DL_dh_m * \ingroup DL_m DL_dh_m
*/ */
#ifndef _DHAES_H #ifndef _DHAES_H
#define _DHAES_H #define _DHAES_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
#include "beecrypt/dldp.h" #include "beecrypt/dldp.h"
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI dhaes_pParameters
#else
struct _dhaes_pParameters
#endif
{ {
const dldp_p* param; const dldp_p* param;
const hashFunction* hash; const hashFunction* hash;
const blockCipher* cipher; const blockCipher* cipher;
const keyedHashFunction* mac; const keyedHashFunction* mac;
size_t cipherkeybits; size_t cipherkeybits;
size_t mackeybits; size_t mackeybits;
} dhaes_pParameters; };
typedef struct #ifndef __cplusplus
typedef struct _dhaes_pParameters dhaes_pParameters;
#endif
#ifdef __cplusplus
struct BEECRYPTAPI dhaes_pContext
#else
struct _dhaes_pContext
#endif
{ {
dldp_p param; dldp_p param;
mpnumber pub; mpnumber pub;
mpnumber pri; mpnumber pri;
hashFunctionContext hash; hashFunctionContext hash;
blockCipherContext cipher; blockCipherContext cipher;
keyedHashFunctionContext mac; keyedHashFunctionContext mac;
size_t cipherkeybits; size_t cipherkeybits;
size_t mackeybits; size_t mackeybits;
} dhaes_pContext; };
#ifndef __cplusplus
typedef struct _dhaes_pContext dhaes_pContext;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
BEECRYPTAPI BEECRYPTAPI
int dhaes_pUsable(const dhaes_pParameters*); int dhaes_pUsable(const dhaes_pParameters*);
BEECRYPTAPI BEECRYPTAPI
int dhaes_pContextInit (dhaes_pContext*, const dhaes_pParameters*); int dhaes_pContextInit (dhaes_pContext*, const dhaes_pParameters*);
 End of changes. 4 change blocks. 
4 lines changed or deleted 20 lines changed or added


 endianness.h   endianness.h 
/* /*
* endianness.h * endianness.h
* *
* Endian-dependant encoding/decoding, header * Endian-dependant encoding/decoding, header
* *
* Copyright (c) 1998, 1999, 2000, 2001 Virtual Unlimited B.V. * Copyright (c) 1998, 1999, 2000, 2001, 2004 Beeyond Software Holding
* *
* Author: Bob Deblier <bob@virtualunlimited.com> * Author: Bob Deblier <bob.deblier@telenet.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 31 skipping to change at line 31
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
* *
*/ */
#ifndef _ENDIANNESS_H #ifndef _ENDIANNESS_H
#define _ENDIANNESS_H #define _ENDIANNESS_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
#ifdef __cplusplus #if defined(__cplusplus) || HAVE_INLINE
inline int16_t swap16(int16_t n)
static inline int16_t _swap16(int16_t n)
{ {
return ( ((n & 0xff) << 8) | return ( ((n & 0xff) << 8) |
((n & 0xff00) >> 8) ); ((n & 0xff00) >> 8) );
} }
# define swap16(n) _swap16(n)
inline uint16_t swapu16(uint16_t n) static inline uint16_t _swapu16(uint16_t n)
{ {
return ( ((n & 0xffU) << 8) | return ( ((n & 0xffU) << 8) |
((n & 0xff00U) >> 8) ); ((n & 0xff00U) >> 8) );
} }
# define swapu16(n) _swap16(n)
inline int32_t swap32(int32_t n) # ifdef __arch__swab32
# define swap32(n) __arch__swab32(n)
# define swapu32(n) __arch__swab32(n)
# else
static inline int32_t _swap32(int32_t n)
{ {
return ( ((n & 0xff) << 24) | return ( ((n & 0xff) << 24) |
((n & 0xff00) << 8) | ((n & 0xff00) << 8) |
((n & 0xff0000) >> 8) | ((n & 0xff0000) >> 8) |
((n & 0xff000000) >> 24) ); ((n & 0xff000000) >> 24) );
} }
# define swap32(n) _swap32(n)
inline uint32_t swapu32(uint32_t n) static inline uint32_t _swapu32(uint32_t n)
{ {
return ( ((n & 0xffU) << 24) | return ( ((n & 0xffU) << 24) |
((n & 0xff00U) << 8) | ((n & 0xff00U) << 8) |
((n & 0xff0000U) >> 8) | ((n & 0xff0000U) >> 8) |
((n & 0xff000000U) >> 24) ); ((n & 0xff000000U) >> 24) );
} }
# define swapu32(n) _swapu32(n)
inline int64_t swap64(int64_t n) # endif
# ifdef __arch__swab64
# define swap64(n) __arch__swab64(n)
# define swapu64(n) __arch__swab64(n)
# else
static inline int64_t _swap64(int64_t n)
{ {
return ( ((n & ((int64_t) 0xff) ) << 56) | return ( ((n & ((int64_t) 0xff) ) << 56) |
((n & ((int64_t) 0xff) << 8) << 40) | ((n & ((int64_t) 0xff) << 8) << 40) |
((n & ((int64_t) 0xff) << 16) << 24) | ((n & ((int64_t) 0xff) << 16) << 24) |
((n & ((int64_t) 0xff) << 24) << 8) | ((n & ((int64_t) 0xff) << 24) << 8) |
((n & ((int64_t) 0xff) << 32) >> 8) | ((n & ((int64_t) 0xff) << 32) >> 8) |
((n & ((int64_t) 0xff) << 40) >> 24) | ((n & ((int64_t) 0xff) << 40) >> 24) |
((n & ((int64_t) 0xff) << 48) >> 40) | ((n & ((int64_t) 0xff) << 48) >> 40) |
((n & ((int64_t) 0xff) << 56) >> 56) ); ((n & ((int64_t) 0xff) << 56) >> 56) );
} }
# define swap64(n) _swap64(n)
static inline uint64_t _swapu64(uint64_t n)
{
return ( ((n & ((uint64_t) 0xff) ) << 56) |
((n & ((uint64_t) 0xff) << 8) << 40) |
((n & ((uint64_t) 0xff) << 16) << 24) |
((n & ((uint64_t) 0xff) << 24) << 8) |
((n & ((uint64_t) 0xff) << 32) >> 8) |
((n & ((uint64_t) 0xff) << 40) >> 24) |
((n & ((uint64_t) 0xff) << 48) >> 40) |
((n & ((uint64_t) 0xff) << 56) >> 56) );
}
# define swapu64(n) _swapu64(n)
# endif
#else #else
int16_t swap16 (int16_t); int16_t swap16 (int16_t);
uint16_t swapu16(uint16_t); uint16_t swapu16(uint16_t);
int32_t swap32 (int32_t); int32_t swap32 (int32_t);
uint32_t swapu32(uint32_t); uint32_t swapu32(uint32_t);
int64_t swap64 (int64_t); int64_t swap64 (int64_t);
uint64_t swapu64(uint64_t);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 13 change blocks. 
8 lines changed or deleted 43 lines changed or added


 entropy.h   entropy.h 
skipping to change at line 32 skipping to change at line 32
* \author Bob Deblier <bob.deblier@pandora.be> * \author Bob Deblier <bob.deblier@pandora.be>
* \ingroup ES_m ES_audio_m ES_dsp_m ES_random_m ES_urandom_m ES_tty_m * \ingroup ES_m ES_audio_m ES_dsp_m ES_random_m ES_urandom_m ES_tty_m
*/ */
#ifndef _ENTROPY_H #ifndef _ENTROPY_H
#define _ENTROPY_H #define _ENTROPY_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
#if WIN32 #if WIN32
#include <Windows.h> #include <windows.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if WIN32 #if WIN32
BEECRYPTAPI BEECRYPTAPI
int entropy_provider_setup(HINSTANCE); int entropy_provider_setup(HINSTANCE);
BEECRYPTAPI BEECRYPTAPI
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 fips186.h   fips186.h 
skipping to change at line 51 skipping to change at line 51
#if (MP_WBITS == 64) #if (MP_WBITS == 64)
# define FIPS186_STATE_SIZE 8 # define FIPS186_STATE_SIZE 8
#elif (MP_WBITS == 32) #elif (MP_WBITS == 32)
# define FIPS186_STATE_SIZE 16 # define FIPS186_STATE_SIZE 16
#else #else
# error # error
#endif #endif
/*!\ingroup PRNG_fips186_m /*!\ingroup PRNG_fips186_m
*/ */
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI fips186Param
#else
struct _fips186Param
#endif
{ {
#ifdef _REENTRANT #ifdef _REENTRANT
bc_mutex_t lock; bc_mutex_t lock;
#endif #endif
sha1Param param; sha1Param param;
mpw state[FIPS186_STATE_SIZE]; mpw state[FIPS186_STATE_SIZE];
byte digest[20]; byte digest[20];
unsigned char digestremain; unsigned char digestremain;
} fips186Param; };
#ifndef __cplusplus
typedef struct _fips186Param fips186Param;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern BEECRYPTAPI const randomGenerator fips186prng; extern BEECRYPTAPI const randomGenerator fips186prng;
BEECRYPTAPI BEECRYPTAPI
int fips186Setup (fips186Param*); int fips186Setup (fips186Param*);
BEECRYPTAPI BEECRYPTAPI
 End of changes. 2 change blocks. 
2 lines changed or deleted 10 lines changed or added


 gnu.h   gnu.h 
skipping to change at line 33 skipping to change at line 33
#include <inttypes.h> #include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <asm/byteorder.h>
typedef pthread_cond_t bc_cond_t; typedef pthread_cond_t bc_cond_t;
typedef pthread_mutex_t bc_mutex_t; typedef pthread_mutex_t bc_mutex_t;
typedef pthread_t bc_thread_t; typedef pthread_t bc_thread_t;
#if defined(__GNUC__)
# if !defined(__GNUC_PREREQ__)
# define __GNUC_PREREQ__(maj, min) (__GNUC__ > (maj) || __GNUC__ == (maj)
&& __GNUC_MINOR__ >= (min))
# endif
#else
# define __GNUC__ 0
# define __GNUC_PREREQ__(maj, min) 0
#endif
/* WARNING: overriding this value is dangerous; some assembler routines /* WARNING: overriding this value is dangerous; some assembler routines
* make assumptions about the size set by the configure script * make assumptions about the size set by the configure script
*/ */
#if !defined(MP_WBITS) #if !defined(MP_WBITS)
# define MP_WBITS 32U # define MP_WBITS 32U
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 11 lines changed or added


 md5.h   md5.h 
skipping to change at line 34 skipping to change at line 34
*/ */
#ifndef _MD5_H #ifndef _MD5_H
#define _MD5_H #define _MD5_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
/*!\brief Holds all the parameters necessary for the MD5 algorithm. /*!\brief Holds all the parameters necessary for the MD5 algorithm.
* \ingroup HASH_md5_h * \ingroup HASH_md5_h
*/ */
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI md5Param
#else
struct _md5Param
#endif
{ {
/*!\var h /*!\var h
*/ */
uint32_t h[4]; uint32_t h[4];
/*!\var data /*!\var data
*/ */
uint32_t data[16]; uint32_t data[16];
/*!\var length /*!\var length
* \brief Multi-precision integer counter for the bits that have bee n * \brief Multi-precision integer counter for the bits that have bee n
* processed so far. * processed so far.
skipping to change at line 58 skipping to change at line 62
#elif (MP_WBITS == 32) #elif (MP_WBITS == 32)
mpw length[2]; mpw length[2];
#else #else
# error # error
#endif #endif
/*!\var offset /*!\var offset
* \brief Offset into \a data; points to the place where new data will be * \brief Offset into \a data; points to the place where new data will be
* copied before it is processed. * copied before it is processed.
*/ */
uint32_t offset; uint32_t offset;
} md5Param; };
#ifndef __cplusplus
typedef struct _md5Param md5Param;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*!\var sha1 /*!\var sha1
* \brief Holds the full API description of the MD5 algorithm. * \brief Holds the full API description of the MD5 algorithm.
*/ */
extern BEECRYPTAPI const hashFunction md5; extern BEECRYPTAPI const hashFunction md5;
 End of changes. 2 change blocks. 
2 lines changed or deleted 10 lines changed or added


 mpbarrett.h   mpbarrett.h 
skipping to change at line 52 skipping to change at line 52
size_t size; size_t size;
mpw* modl; /* (size) words */ mpw* modl; /* (size) words */
mpw* mu; /* (size+1) words */ mpw* mu; /* (size+1) words */
#ifdef __cplusplus #ifdef __cplusplus
mpbarrett(); mpbarrett();
mpbarrett(const mpbarrett&); mpbarrett(const mpbarrett&);
~mpbarrett(); ~mpbarrett();
const mpbarrett& operator=(const mpbarrett&); const mpbarrett& operator=(const mpbarrett&);
bool operator==(const mpbarrett&); bool operator==(const mpbarrett&) const throw ();
bool operator!=(const mpbarrett&); bool operator!=(const mpbarrett&) const throw ();
void wipe(); void wipe();
size_t bitlength() const; size_t bitlength() const throw ();
#endif #endif
}; };
#ifndef __cplusplus #ifndef __cplusplus
typedef struct _mpbarrett mpbarrett; typedef struct _mpbarrett mpbarrett;
#else #else
BEECRYPTAPI BEECRYPTAPI
std::ostream& operator<<(std::ostream&, const mpbarrett&); std::ostream& operator<<(std::ostream&, const mpbarrett&);
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 mpnumber.h   mpnumber.h 
skipping to change at line 45 skipping to change at line 45
#ifdef __cplusplus #ifdef __cplusplus
struct BEECRYPTAPI mpnumber struct BEECRYPTAPI mpnumber
#else #else
struct _mpnumber struct _mpnumber
#endif #endif
{ {
size_t size; size_t size;
mpw* data; mpw* data;
#ifdef __cplusplus #ifdef __cplusplus
static const mpnumber ZERO;
static const mpnumber ONE;
mpnumber(); mpnumber();
mpnumber(unsigned int); mpnumber(unsigned int);
mpnumber(const mpnumber&); mpnumber(const mpnumber&);
~mpnumber(); ~mpnumber();
const mpnumber& operator=(const mpnumber&); const mpnumber& operator=(const mpnumber&);
bool operator==(const mpnumber&); bool operator==(const mpnumber&) const throw ();
bool operator!=(const mpnumber&); bool operator!=(const mpnumber&) const throw ();
void wipe(); void wipe();
size_t bitlength() const; size_t bitlength() const throw ();
#endif #endif
}; };
#ifndef __cplusplus #ifndef __cplusplus
typedef struct _mpnumber mpnumber; typedef struct _mpnumber mpnumber;
#else #else
BEECRYPTAPI BEECRYPTAPI
std::ostream& operator<<(std::ostream&, const mpnumber&); std::ostream& operator<<(std::ostream&, const mpnumber&);
/* /*
BEECRYPTAPI BEECRYPTAPI
 End of changes. 3 change blocks. 
3 lines changed or deleted 6 lines changed or added


 mpopt.h   mpopt.h 
skipping to change at line 110 skipping to change at line 110
# define ASM_MPADD # define ASM_MPADD
# define ASM_MPADDW # define ASM_MPADDW
# define ASM_MPSUB # define ASM_MPSUB
# define ASM_MPSUBW # define ASM_MPSUBW
# define ASM_MPMULTWO # define ASM_MPMULTWO
# define ASM_MPADDMUL # define ASM_MPADDMUL
# define ASM_MPADDSQRTRC # define ASM_MPADDSQRTRC
# elif defined(OPTIMIZE_S390X) # elif defined(OPTIMIZE_S390X)
# define ASM_MPSETMUL # define ASM_MPSETMUL
# define ASM_MPADDMUL # define ASM_MPADDMUL
# define ASM_MPADDSQRTRC
# elif defined(OPTIMIZE_SPARCV8) # elif defined(OPTIMIZE_SPARCV8)
# define ASM_MPSETMUL # define ASM_MPSETMUL
# define ASM_MPADDMUL # define ASM_MPADDMUL
# define ASM_MPADDSQRTRC # define ASM_MPADDSQRTRC
# elif defined(OPTIMIZE_SPARCV8PLUS) # elif defined(OPTIMIZE_SPARCV8PLUS)
# define ASM_MPADDW # define ASM_MPADDW
# define ASM_MPSUBW # define ASM_MPSUBW
# define ASM_MPADD # define ASM_MPADD
# define ASM_MPSUB # define ASM_MPSUB
# define ASM_MPMULTWO # define ASM_MPMULTWO
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mtprng.h   mtprng.h 
skipping to change at line 44 skipping to change at line 44
# include <winbase.h> # include <winbase.h>
# endif # endif
#endif #endif
#define N 624 #define N 624
#define M 397 #define M 397
#define K 0x9908B0DFU #define K 0x9908B0DFU
/* /*
*/ */
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI mtprngParam
#else
struct _mtprngParam
#endif
{ {
#ifdef _REENTRANT #ifdef _REENTRANT
bc_mutex_t lock; bc_mutex_t lock;
#endif #endif
uint32_t state[N+1]; uint32_t state[N+1];
uint32_t left; uint32_t left;
uint32_t* nextw; uint32_t* nextw;
} mtprngParam; };
#ifndef __cplusplus
typedef struct _mtprngParam mtprngParam;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* /*
*/ */
extern BEECRYPTAPI const randomGenerator mtprng; extern BEECRYPTAPI const randomGenerator mtprng;
/* /*
 End of changes. 2 change blocks. 
2 lines changed or deleted 10 lines changed or added


 sha1.h   sha1.h 
skipping to change at line 35 skipping to change at line 35
#ifndef _SHA1_H #ifndef _SHA1_H
#define _SHA1_H #define _SHA1_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
#include "beecrypt/sha1opt.h" #include "beecrypt/sha1opt.h"
/*!\brief Holds all the parameters necessary for the SHA-1 algorithm. /*!\brief Holds all the parameters necessary for the SHA-1 algorithm.
* \ingroup HASH_sha1_m * \ingroup HASH_sha1_m
*/ */
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI sha1Param
#else
struct _sha1Param
#endif
{ {
/*!\var h /*!\var h
*/ */
uint32_t h[5]; uint32_t h[5];
/*!\var data /*!\var data
*/ */
uint32_t data[80]; uint32_t data[80];
/*!\var length /*!\var length
* \brief Multi-precision integer counter for the bits that have bee n * \brief Multi-precision integer counter for the bits that have bee n
* processed so far. * processed so far.
skipping to change at line 59 skipping to change at line 63
#elif (MP_WBITS == 32) #elif (MP_WBITS == 32)
mpw length[2]; mpw length[2];
#else #else
# error # error
#endif #endif
/*!\var offset /*!\var offset
* \brief Offset into \a data; points to the place where new data wi ll be * \brief Offset into \a data; points to the place where new data wi ll be
* copied before it is processed. * copied before it is processed.
*/ */
uint32_t offset; uint32_t offset;
} sha1Param; };
#ifndef __cplusplus
typedef struct _sha1Param sha1Param;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*!\var sha1 /*!\var sha1
* \brief Holds the full API description of the SHA-1 algorithm. * \brief Holds the full API description of the SHA-1 algorithm.
*/ */
extern BEECRYPTAPI const hashFunction sha1; extern BEECRYPTAPI const hashFunction sha1;
 End of changes. 2 change blocks. 
2 lines changed or deleted 10 lines changed or added


 sha256.h   sha256.h 
skipping to change at line 34 skipping to change at line 34
*/ */
#ifndef _SHA256_H #ifndef _SHA256_H
#define _SHA256_H #define _SHA256_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
/*!\brief Holds all the parameters necessary for the SHA-256 algorithm. /*!\brief Holds all the parameters necessary for the SHA-256 algorithm.
* \ingroup HASH_sha256_m * \ingroup HASH_sha256_m
*/ */
typedef struct #ifdef __cplusplus
struct BEECRYPTAPI sha256Param
#else
struct _sha256Param
#endif
{ {
/*!\var h /*!\var h
*/ */
uint32_t h[8]; uint32_t h[8];
/*!\var data /*!\var data
*/ */
uint32_t data[64]; uint32_t data[64];
/*!\var length /*!\var length
* \brief Multi-precision integer counter for the bits that have bee n * \brief Multi-precision integer counter for the bits that have bee n
* processed so far. * processed so far.
skipping to change at line 58 skipping to change at line 62
#elif (MP_WBITS == 32) #elif (MP_WBITS == 32)
mpw length[2]; mpw length[2];
#else #else
# error # error
#endif #endif
/*!\var offset /*!\var offset
* \brief Offset into \a data; points to the place where new data wi ll be * \brief Offset into \a data; points to the place where new data wi ll be
* copied before it is processed. * copied before it is processed.
*/ */
uint32_t offset; uint32_t offset;
} sha256Param; };
#ifndef __cplusplus
typedef struct _sha256Param sha256Param;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*!\var sha256 /*!\var sha256
* \brief Holds the full API description of the SHA-256 algorithm. * \brief Holds the full API description of the SHA-256 algorithm.
*/ */
extern BEECRYPTAPI const hashFunction sha256; extern BEECRYPTAPI const hashFunction sha256;
 End of changes. 2 change blocks. 
2 lines changed or deleted 10 lines changed or added


 timestamp.h   timestamp.h 
skipping to change at line 31 skipping to change at line 31
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
* *
*/ */
#ifndef _TIMESTAMP_H #ifndef _TIMESTAMP_H
#define _TIMESTAMP_H #define _TIMESTAMP_H
#include "beecrypt/beecrypt.h" #include "beecrypt/beecrypt.h"
#if HAVE_LONG_LONG #if HAVE_LONG_LONG && !defined(__cplusplus) /* C++ doesn't like LL constant s */
# define ONE_SECOND 1000LL # define ONE_SECOND 1000LL
# define ONE_MINUTE 60000LL # define ONE_MINUTE 60000LL
# define ONE_HOUR 3600000LL # define ONE_HOUR 3600000LL
# define ONE_DAY 86400000LL # define ONE_DAY 86400000LL
# define ONE_WEEK 604800000LL # define ONE_WEEK 604800000LL
# define ONE_YEAR 31536000000LL # define ONE_YEAR 31536000000LL
#else #else
# define ONE_SECOND 1000L # define ONE_SECOND 1000L
# define ONE_MINUTE 60000L # define ONE_MINUTE 60000L
# define ONE_HOUR 3600000L # define ONE_HOUR 3600000L
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/