2003-06-08 Moritz Schulte <moritz@g10code.com>

	* pubkey.c (gcry_pk_encrypt): Improve calculation for size of the
	format string.

2003-06-07  Moritz Schulte  <moritz@g10code.com>

	* arcfour.c, bithelp.h, blowfish.c, cast5.c, cipher.c, crc.c,
	des.c, dsa.c, elgamal.c, md4.c, md5.c, md.c, primegen.c, pubkey.c,
	rand-internal.h, random.c, random.h, rijndael.c, rmd160.c,
	rmd160test.c, rmd.h, rndeged.c, rndlinux.c, rndunix.c, rndw32.c,
	rsa.c, sha1.c, sha256.c, sha512.c, tiger.c, twofish.c: Edited all
	preprocessor instructions to remove whitespace before the '#'.
	This is not required by C89, but there are some compilers out
	there that don't like it.  Replaced any occurence of the now
	deprecated type names with the new ones.

2003-06-04  Moritz Schulte  <moritz@g10code.com>

	* pubkey.c (gcry_pk_encrypt): Construct an arg_list and use
	gcry_sexp_build_array instead of gcry_sexp_build.
	(gcry_pk_sign): Likewise.
	(gcry_pk_genkey): Likewise.

2003-06-01  Moritz Schulte  <moritz@g10code.com>

	* dsa.c (_gcry_dsa_generate): Do not check wether the algorithm ID
	does indeed belong to DSA.
	(_gcry_dsa_sign): Likewise.
	(_gcry_dsa_verify): Likewise.
	(_gcry_dsa_get_nbits): Likewise.

	* elgamal.c (_gcry_elg_check_secret_key): Do not check wether the
	algorithm ID does indeed belong to ElGamal.
	(_gcry_elg_encrypt): Likewise.
	(_gcry_elg_decrypt): Likewise.
	(_gcry_elg_sign): Likewise.
	(_gcry_elg_verify): Likewise.
	(_gcry_elg_get_nbits): Likewise.
	(_gcry_elg_generate): Likewise.

	* rsa.c (_gcry_rsa_generate): Do not check wether the algorithm ID
	does indeed belong to RSA.
	(_gcry_rsa_encrypt): Likewise.
	(_gcry_rsa_decrypt): Likewise.
	(_gcry_rsa_sign): Likewise.
	(_gcry_rsa_verify): Likewise.
	(_gcry_rsa_get_nbits): Likewise.

2003-05-30  Moritz Schulte  <moritz@g10code.com>

	* md.c (md_get_algo): Return zero in case to algorithm is enabled.

	* md.c (gcry_md_info): Adjusted for new no-errno-API.
	(md_final): Likewise.
	(gcry_md_get_algo): Likewise.
	* pubkey.c (gcry_pk_get_keygrip): Likewise.
	(gcry_pk_ctl): Likewise.
	(gcry_pk_algo_info): Likewise.
	* des.c (selftest): Likewise.

2003-05-29  Moritz Schulte  <moritz@g10code.com>

	* md.c (md_enable): Do not forget to release module on error.
	(gcry_md_open): Adjusted for new no-errno-API.
	(md_open): Likewise.
	(md_copy): Likewise.
	(gcry_md_copy): Likewise.
	(gcry_md_setkey): Likewise.
	(gcry_md_algo_info): Likewise.

	* cipher.c (gcry_cipher_open): Adjusted for new no-errno-API and
	also fixed a locking bug.
	(gcry_cipher_encrypt): Adjusted for new no-errno-API.
	(gcry_cipher_decrypt): Likewise.
	(gcry_cipher_ctl): Likewise.
	(gcry_cipher_info): Likewise.
	(gcry_cipher_algo_info): Likewise.

2003-05-28  Moritz Schulte  <moritz@g10code.com>

	* md.c (md_enable): Adjusted for libgpg-error.
	(gcry_md_enable): Likewise.
	(gcry_digest_register_default): Likewise.
	(gcry_digest_register): Likewise.
	(check_digest_algo): Likewise.
	(prepare_macpads): Likewise.
	(gcry_md_setkey): Likewise.
	(gcry_md_ctl): Likewise.
	(gcry_md_get): Likewise.
	(gcry_md_algo_info): Likewise.
	(gcry_md_info): Likewise.
	* dsa.c (_gcry_dsa_generate): Likewise.
	(_gcry_dsa_check_secret_key): Likewise.
	(_gcry_dsa_sign): Likewie.
	(_gcry_dsa_verify): Likewise.
	* twofish.c (do_twofish_setkey): Likewise.
	(twofish_setkey): Likewise.
	* cipher.c (gcry_cipher_register): Likewise.

2003-05-25  Moritz Schulte  <moritz@g10code.com>

	* rijndael.c (do_setkey): Adjusted for libgpg-error.
	(rijndael_setkey): Likewise.
	* random.c (gcry_random_add_bytes): Likewise.
	* elgamal.c (_gcry_elg_generate): Likewise.
	(_gcry_elg_check_secret_key): Likewise.
	(_gcry_elg_encrypt): Likewise.
	(_gcry_elg_decrypt): Likewise.
	(_gcry_elg_sign): Likewise.
	(_gcry_elg_verify): Likewise.
	* rsa.c (_gcry_rsa_generate): Likewise.
	(_gcry_rsa_check_secret_key): Likewise.
	(_gcry_rsa_encrypt): Likewise.
	(_gcry_rsa_decrypt): Likewise.
	(_gcry_rsa_sign): Likewise.
	(_gcry_rsa_verify): Likewise.
	* pubkey.c (dummy_generate, dummy_check_secret_key, dummy_encrypt,
	dummy_decrypt, dummy_sign, dummy_verify): Likewise.
	(gcry_pubkey_register): Likewise.
	(check_pubkey_algo): Likewise.
	(pubkey_generate): Likewise.
	(pubkey_check_secret_key): Likewise.
	(pubkey_encrypt): Likewise.
	(pubkey_decrypt): Likewise.
	(pubkey_sign): Likewise.
	(pubkey_verify): Likewise.
	(sexp_elements_extract): Likewise.
	(sexp_to_key): Likewise.
	(sexp_to_sig): Likewise.
	(sexp_to_enc): Likewise.
	(sexp_data_to_mpi): Likewise.
	(gcry_pk_encrypt): Likewise.
	(gcry_pk_decrypt): Likewise.
	(gcry_pk_sign): Likewise.
	(gcry_pk_verify): Likewise.
	(gcry_pk_testkey): Likewise.
	(gcry_pk_genkey): Likewise.
	(gcry_pk_ctl): Likewise.
	* cipher.c (dummy_setkey): Likewise.
	(check_cipher_algo): Likewise.
	(gcry_cipher_open): Likewise.
	(cipher_setkey): Likewise.
	(gcry_cipher_ctl): Likewise.
	(cipher_encrypt): Likewise.
	(gcry_cipher_encrypt): Likewise.
	(cipher_decrypt): Likewise.
	(gcry_cipher_decrypt): Likewise.
	(gcry_cipher_info): Likewise.
	(gcry_cipher_algo_info): Likewise.
	* cast5.c (cast_setkey): Likewise.
	(do_cast_setkey): Likewise.
	* arcfour.c (arcfour_setkey): Likewise.
	(do_arcfour_setkey): Likewise.
	* blowfish.c (do_bf_setkey): Likewise.
	(bf_setkey): Likewise.
	* des.c (do_des_setkey): Likewise.
	(do_tripledes_setkey): Likewise.

2003-05-22  Moritz Schulte  <moritz@g10code.com>

	* tiger.c: Merged code ussing the U64_C macro from GnuPG.

	* sha512.c: Likewise.

2003-05-17  Moritz Schulte  <moritz@g10code.com>

	* pubkey.c (gcry_pk_genkey): Fix type: acquire a lock, instead of
	releasing it.

2003-05-11  Moritz Schulte  <moritz@g10code.com>

	* pubkey.c (gcry_pk_testkey): Call REGISTER_DEFAULT_CIPHERS.
	(gcry_pk_ctl): Likewise.

1 files changed, 12 insertions, 12 deletions

diff --git a/cipher/rijndael.c b/cipher/rijndael.c
index d7814cbd..90d0c469 100644
--- a/cipher/rijndael.c
+++ b/cipher/rijndael.c
@@ -1710,7 +1710,7 @@ static const u32 rcon[30] = {
 
 /* Perform the key setup.
  */  
-static int
+static gpg_err_code_t
 do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
 {
     static int initialized = 0;
@@ -1728,7 +1728,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
             log_error ("%s\n", selftest_failed );
     }
     if( selftest_failed )
-        return GCRYERR_SELFTEST;
+        return GPG_ERR_SELFTEST_FAILED;
 
     if( keylen == 128/8 ) {
         ROUNDS = 10;
@@ -1743,7 +1743,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
         KC = 8;
     }
     else
-	return GCRYERR_INV_KEYLEN;
+	return GPG_ERR_INV_KEYLEN;
 
     ctx->ROUNDS = ROUNDS;
     ctx->decryption_prepared = 0;
@@ -1751,7 +1751,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
     for (i = 0; i < keylen; i++) {
         k[i >> 2][i & 3] = key[i]; 
     }
- #define W (ctx->keySched)
+#define W (ctx->keySched)
 
     for (j = KC-1; j >= 0; j--) {
         *((u32*)tk[j]) = *((u32*)k[j]);
@@ -1806,11 +1806,11 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
         }
     }		
     
-  #undef W    
+#undef W    
     return 0;
 }
 
-static int
+static gpg_err_code_t
 rijndael_setkey (void *context, const byte *key, const unsigned keylen)
 {
   RIJNDAEL_context *ctx = (RIJNDAEL_context *) context;
@@ -1833,7 +1833,7 @@ prepare_decryption( RIJNDAEL_context *ctx )
         *((u32*)ctx->keySched2[r][2]) = *((u32*)ctx->keySched[r][2]);
         *((u32*)ctx->keySched2[r][3]) = *((u32*)ctx->keySched[r][3]);
     }
-  #define W (ctx->keySched2)
+#define W (ctx->keySched2)
     for (r = 1; r < ctx->ROUNDS; r++) {
         w = W[r][0];
         *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]])
@@ -1851,7 +1851,7 @@ prepare_decryption( RIJNDAEL_context *ctx )
         *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]])
                    ^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]);
     }
-  #undef W
+#undef W
 }	
 
 
@@ -1863,7 +1863,7 @@ do_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
     int r;
     byte temp[4][4];
     int ROUNDS = ctx->ROUNDS;
-  #define rk (ctx->keySched)
+#define rk (ctx->keySched)
 
     *((u32*)temp[0]) = *((u32*)(a   )) ^ *((u32*)rk[0][0]);
     *((u32*)temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[0][1]);
@@ -1933,7 +1933,7 @@ do_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
     *((u32*)(b+ 4)) ^= *((u32*)rk[ROUNDS][1]);
     *((u32*)(b+ 8)) ^= *((u32*)rk[ROUNDS][2]);
     *((u32*)(b+12)) ^= *((u32*)rk[ROUNDS][3]);
-  #undef rk
+#undef rk
 }
 
 static void
@@ -1950,7 +1950,7 @@ rijndael_encrypt (void *context, byte *b, const byte *a)
 static void
 do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
 {
-  #define rk  (ctx->keySched2)
+#define rk  (ctx->keySched2)
     int ROUNDS = ctx->ROUNDS; 
     int r;
     byte temp[4][4];
@@ -2029,7 +2029,7 @@ do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
 	*((u32*)(b+ 4)) ^= *((u32*)rk[0][1]);
 	*((u32*)(b+ 8)) ^= *((u32*)rk[0][2]);
 	*((u32*)(b+12)) ^= *((u32*)rk[0][3]);
-  #undef rk
+#undef rk
 }
 
 static void