[svn] gcry - r1205 - in branches/LIBGCRYPT-1-2-BRANCH: . cipher
svn author wk
cvs at cvs.gnupg.org
Thu Feb 1 20:22:06 CET 2007
Author: wk
Date: 2007-02-01 20:22:04 +0100 (Thu, 01 Feb 2007)
New Revision: 1205
Modified:
branches/LIBGCRYPT-1-2-BRANCH/NEWS
branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog
branches/LIBGCRYPT-1-2-BRANCH/cipher/blowfish.c
branches/LIBGCRYPT-1-2-BRANCH/cipher/cast5.c
branches/LIBGCRYPT-1-2-BRANCH/cipher/cipher.c
branches/LIBGCRYPT-1-2-BRANCH/cipher/des.c
branches/LIBGCRYPT-1-2-BRANCH/cipher/rfc2268.c
branches/LIBGCRYPT-1-2-BRANCH/cipher/rijndael.c
branches/LIBGCRYPT-1-2-BRANCH/cipher/serpent.c
branches/LIBGCRYPT-1-2-BRANCH/cipher/twofish.c
Log:
Added some superflous initializatins to shutup gcc a bit.
Modified: branches/LIBGCRYPT-1-2-BRANCH/NEWS
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/NEWS 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/NEWS 2007-02-01 19:22:04 UTC (rev 1205)
@@ -1,8 +1,3 @@
-Noteworthy changes in version 1.2.5
-------------------------------------------------
-
-
-
Noteworthy changes in version 1.2.4 (2007-02-01)
------------------------------------------------
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog 2007-02-01 19:22:04 UTC (rev 1205)
@@ -1,3 +1,8 @@
+2007-02-01 Werner Koch <wk at g10code.com>
+
+ * serpent.c: Add some missing struct element inits. Also for all
+ other cipher modules.
+
2007-01-30 Werner Koch <wk at g10code.com>
* sha256.c (oid_spec_sha256): Add alias from pkcs#1.
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/blowfish.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/blowfish.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/blowfish.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -602,5 +602,5 @@
{
"BLOWFISH", NULL, NULL, BLOWFISH_BLOCKSIZE, 128,
sizeof (BLOWFISH_context),
- bf_setkey, encrypt_block, decrypt_block,
+ bf_setkey, encrypt_block, decrypt_block, NULL, NULL
};
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/cast5.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/cast5.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/cast5.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -616,5 +616,5 @@
gcry_cipher_spec_t _gcry_cipher_spec_cast5 =
{
"CAST5", NULL, NULL, CAST5_BLOCKSIZE, 128, sizeof (CAST5_context),
- cast_setkey, encrypt_block, decrypt_block,
+ cast_setkey, encrypt_block, decrypt_block, NULL, NULL
};
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/cipher.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/cipher.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/cipher.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -72,7 +72,7 @@
#ifdef USE_RFC2268
{ &_gcry_cipher_spec_rfc2268_40, GCRY_CIPHER_RFC2268_40 },
#endif
- { NULL },
+ { NULL, 0 }
};
/* List of registered ciphers. */
@@ -1057,6 +1057,7 @@
break;
default:
log_fatal("cipher_encrypt: invalid mode %d\n", c->mode );
+ /*NOTREACHED*/
rc = GPG_ERR_INV_CIPHER_MODE;
break;
}
@@ -1143,6 +1144,7 @@
break;
default:
log_fatal ("cipher_decrypt: invalid mode %d\n", c->mode );
+ /*NOTREACHED*/
rc = GPG_ERR_INV_CIPHER_MODE;
break;
}
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/des.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/des.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/des.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -1091,7 +1091,7 @@
gcry_cipher_spec_t _gcry_cipher_spec_des =
{
"DES", NULL, NULL, 8, 64, sizeof (struct _des_ctx),
- do_des_setkey, do_des_encrypt, do_des_decrypt
+ do_des_setkey, do_des_encrypt, do_des_decrypt, NULL, NULL
};
static gcry_cipher_oid_spec_t oids_tripledes[] =
@@ -1107,5 +1107,6 @@
gcry_cipher_spec_t _gcry_cipher_spec_tripledes =
{
"3DES", NULL, oids_tripledes, 8, 192, sizeof (struct _tripledes_ctx),
- do_tripledes_setkey, do_tripledes_encrypt, do_tripledes_decrypt
+ do_tripledes_setkey, do_tripledes_encrypt, do_tripledes_decrypt,
+ NULL, NULL
};
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/rfc2268.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/rfc2268.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/rfc2268.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -340,6 +340,6 @@
gcry_cipher_spec_t _gcry_cipher_spec_rfc2268_40 = {
"RFC2268_40", NULL, oids_rfc2268_40,
RFC2268_BLOCKSIZE, 40, sizeof(RFC2268_context),
- do_setkey, do_encrypt, do_decrypt
+ do_setkey, do_encrypt, do_decrypt, NULL, NULL
};
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/rijndael.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/rijndael.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/rijndael.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -2228,7 +2228,7 @@
gcry_cipher_spec_t _gcry_cipher_spec_aes =
{
"AES", rijndael_names, rijndael_oids, 16, 128, sizeof (RIJNDAEL_context),
- rijndael_setkey, rijndael_encrypt, rijndael_decrypt,
+ rijndael_setkey, rijndael_encrypt, rijndael_decrypt, NULL, NULL
};
static const char *rijndael192_names[] =
@@ -2249,7 +2249,7 @@
gcry_cipher_spec_t _gcry_cipher_spec_aes192 =
{
"AES192", rijndael192_names, rijndael192_oids, 16, 192, sizeof (RIJNDAEL_context),
- rijndael_setkey, rijndael_encrypt, rijndael_decrypt,
+ rijndael_setkey, rijndael_encrypt, rijndael_decrypt, NULL, NULL
};
static const char *rijndael256_names[] =
@@ -2271,5 +2271,5 @@
{
"AES256", rijndael256_names, rijndael256_oids, 16, 256,
sizeof (RIJNDAEL_context),
- rijndael_setkey, rijndael_encrypt, rijndael_decrypt,
+ rijndael_setkey, rijndael_encrypt, rijndael_decrypt, NULL, NULL
};
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/serpent.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/serpent.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/serpent.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -907,7 +907,7 @@
},
{
0
- },
+ }
};
for (i = 0; test_data[i].key_length; i++)
@@ -960,19 +960,19 @@
{
"SERPENT128", cipher_spec_serpent128_aliases, NULL, 16, 128,
sizeof (serpent_context_t),
- serpent_setkey, serpent_encrypt, serpent_decrypt,
+ serpent_setkey, serpent_encrypt, serpent_decrypt, NULL, NULL
};
gcry_cipher_spec_t _gcry_cipher_spec_serpent192 =
{
"SERPENT192", NULL, NULL, 16, 192,
sizeof (serpent_context_t),
- serpent_setkey, serpent_encrypt, serpent_decrypt,
+ serpent_setkey, serpent_encrypt, serpent_decrypt, NULL, NULL
};
gcry_cipher_spec_t _gcry_cipher_spec_serpent256 =
{
"SERPENT256", NULL, NULL, 16, 256,
sizeof (serpent_context_t),
- serpent_setkey, serpent_encrypt, serpent_decrypt,
+ serpent_setkey, serpent_encrypt, serpent_decrypt, NULL, NULL
};
Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/twofish.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/twofish.c 2007-02-01 18:53:23 UTC (rev 1204)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/twofish.c 2007-02-01 19:22:04 UTC (rev 1205)
@@ -1030,11 +1030,11 @@
gcry_cipher_spec_t _gcry_cipher_spec_twofish =
{
"TWOFISH", NULL, NULL, 16, 256, sizeof (TWOFISH_context),
- twofish_setkey, twofish_encrypt, twofish_decrypt,
+ twofish_setkey, twofish_encrypt, twofish_decrypt, NULL, NULL
};
gcry_cipher_spec_t _gcry_cipher_spec_twofish128 =
{
"TWOFISH128", NULL, NULL, 16, 128, sizeof (TWOFISH_context),
- twofish_setkey, twofish_encrypt, twofish_decrypt,
+ twofish_setkey, twofish_encrypt, twofish_decrypt, NULL, NULL
};
More information about the Gnupg-commits
mailing list