Replace the array of 8 mit_des_cblock object 'mit_des_zeroblock' defined

locally in multiple files with one defined in f_cbc.c; make it a single element
rather than an array.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15945 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 70cf9b8a96eb287e96a433ec72d606b9b8f76050..e537e3c26c6b460a63f7c965e74d3f69c130e83a 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-19  Ken Raeburn  <raeburn@mit.edu>
+
+       * f_cbc.c (mit_des_zeroblock): Define, as a single cblock, not the
+       array of 8 that was used elsewhere.
+       * des_int.h (mit_des_zeroblock): Declare, and use a macro to stick
+       a krb5int prefix on it.
+
 2003-07-22  Ken Raeburn  <raeburn@mit.edu>
 
        * f_cbc.c (krb5int_des_cbc_decrypt): Move declarations that were

diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index 55f0c241f3dc8e78247057c1bde865996103af24..c330a935adff4743103dd58a463a31c13b927e16 100644 (file)
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -130,6 +130,9 @@ extern int mit_des_cbc_encrypt (const mit_des_cblock *in,
                                const mit_des_key_schedule schedule,
                                const mit_des_cblock ivec, int enc);
     
+#define mit_des_zeroblock krb5int_c_mit_des_zeroblock
+extern const mit_des_cblock mit_des_zeroblock;
+
 /* fin_rndkey.c */
 extern krb5_error_code mit_des_finish_random_key
     ( const krb5_encrypt_block *,

diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c
index c09060fc5e4e47f049f88d01f2b381cbd0e36339..dea27e70211f1cd481164627ea281a8e20362994 100644 (file)
--- a/src/lib/crypto/des/f_cbc.c
+++ b/src/lib/crypto/des/f_cbc.c
@@ -36,6 +36,8 @@
  * cleartext.
  */
 
+const mit_des_cblock mit_des_zeroblock /* = all zero */;
+
 #undef mit_des_cbc_encrypt
 int
 mit_des_cbc_encrypt(in, out, length, schedule, ivec, enc)

diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog
index 89bf6dec9b9d3e8617be8d9986188d8e1a06faaf..a11976c64d427e9fb7c4dcf47681740af1cd06d6 100644 (file)
--- a/src/lib/crypto/enc_provider/ChangeLog
+++ b/src/lib/crypto/enc_provider/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-19  Ken Raeburn  <raeburn@mit.edu>
+
+       * des.c (mit_des_zeroblock): Don't define here.
+       * des3.c (mit_des_zeroblock): Don't define here.
+
 2003-07-22  Ken Raeburn  <raeburn@mit.edu>
 
        * aes.c (aes_block_size, aes128_keysize, aes256_keysize):

diff --git a/src/lib/crypto/enc_provider/des.c b/src/lib/crypto/enc_provider/des.c
index 70082bc245a1ea92397e6cb793730b62c2074d0d..561e980f8795dad26a11d1693ec9fd9524c49841 100644 (file)
--- a/src/lib/crypto/enc_provider/des.c
+++ b/src/lib/crypto/enc_provider/des.c
@@ -28,8 +28,6 @@
 #include "des_int.h"
 #include "enc_provider.h"
 
-static const mit_des_cblock mit_des_zeroblock[8] /* = all zero */;
-
 static krb5_error_code
 k5_des_docrypt(const krb5_keyblock *key, const krb5_data *ivec,
               const krb5_data *input, krb5_data *output, int enc)

diff --git a/src/lib/crypto/enc_provider/des3.c b/src/lib/crypto/enc_provider/des3.c
index 048a220e605685d61d6fcfbf9005e2cb9701eb9e..f844747c85bb6821ef21d91846a4eddbc2e965fd 100644 (file)
--- a/src/lib/crypto/enc_provider/des3.c
+++ b/src/lib/crypto/enc_provider/des3.c
@@ -27,8 +27,6 @@
 #include "k5-int.h"
 #include "des_int.h"
 
-static const mit_des_cblock mit_des_zeroblock[8] /* = all zero */;
-
 static krb5_error_code
 validate_and_schedule(const krb5_keyblock *key, const krb5_data *ivec,
                      const krb5_data *input, const krb5_data *output,

diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog
index 6f0931f1dbf5990cfe1c9fb1793ddda82e9d5c3a..accfb953dfdd278310fbbb2aa4fc045038c4e0c0 100644 (file)
--- a/src/lib/crypto/keyhash_provider/ChangeLog
+++ b/src/lib/crypto/keyhash_provider/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-19  Ken Raeburn  <raeburn@mit.edu>
+
+       * descbc.c (mit_des_zeroblock): Don't define here.
+       * k5_md4des.c (mit_des_zeroblock): Don't define here.
+       * k5_md5des.c (mit_des_zeroblock): Don't define here.
+
 2003-07-22  Ken Raeburn  <raeburn@mit.edu>
 
        * descbc.c (k5_descbc_hash_size): Deleted.

diff --git a/src/lib/crypto/keyhash_provider/descbc.c b/src/lib/crypto/keyhash_provider/descbc.c
index e13b39b853f90a10a8252bade0f874db6d1e5754..fcccbfa7c0d853a2f71024ae8701d4b3b652b5a8 100644 (file)
--- a/src/lib/crypto/keyhash_provider/descbc.c
+++ b/src/lib/crypto/keyhash_provider/descbc.c
@@ -28,8 +28,6 @@
 #include "des_int.h"
 #include "keyhash_provider.h"
 
-static const mit_des_cblock mit_des_zeroblock[8] /* = all zero */;
-
 static krb5_error_code
 k5_descbc_hash(const krb5_keyblock *key, krb5_keyusage usage, const krb5_data *ivec,
               const krb5_data *input, krb5_data *output)

diff --git a/src/lib/crypto/keyhash_provider/k5_md4des.c b/src/lib/crypto/keyhash_provider/k5_md4des.c
index d31eb54a8591cde0a4ecb86a242c63c75a9da841..8e962390164412807ef6c7e206b2d529c12a4b6c 100644 (file)
--- a/src/lib/crypto/keyhash_provider/k5_md4des.c
+++ b/src/lib/crypto/keyhash_provider/k5_md4des.c
@@ -34,8 +34,6 @@
 /* Force acceptance of krb5-beta5 md4des checksum for now. */
 #define KRB5_MD4DES_BETA5_COMPAT
 
-static const mit_des_cblock mit_des_zeroblock[8] /* = all zero */;
-
 /* des-cbc(xorkey, conf | rsa-md4(conf | data)) */
 
 /* this could be done in terms of the md4 and des providers, but

diff --git a/src/lib/crypto/keyhash_provider/k5_md5des.c b/src/lib/crypto/keyhash_provider/k5_md5des.c
index 17353108367d34df3ac4f575aa47b24a6d5eb5a8..4f7b89812d0693b75f6fa03495bc548db4ac18ae 100644 (file)
--- a/src/lib/crypto/keyhash_provider/k5_md5des.c
+++ b/src/lib/crypto/keyhash_provider/k5_md5des.c
@@ -34,8 +34,6 @@
 /* Force acceptance of krb5-beta5 md5des checksum for now. */
 #define KRB5_MD5DES_BETA5_COMPAT
 
-static const mit_des_cblock mit_des_zeroblock[8] /* = all zero */;
-
 /* des-cbc(xorkey, conf | rsa-md5(conf | data)) */
 
 /* this could be done in terms of the md5 and des providers, but