* f_cbc.c (krb5int_des_cbc_decrypt): Move declarations that were after

statements after flattening blocks is previous change.
* d3_cbc.c (krb5int_des3_cbc_decrypt): Likewise.

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

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 4a4cc7ec6261b9f1a142f860bee1e21ac46b175c..70cf9b8a96eb287e96a433ec72d606b9b8f76050 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-22  Ken Raeburn  <raeburn@mit.edu>
+
+       * f_cbc.c (krb5int_des_cbc_decrypt): Move declarations that were
+       after statements after flattening blocks is previous change.
+       * d3_cbc.c (krb5int_des3_cbc_decrypt): Likewise.
+
 2003-07-17  Ken Raeburn  <raeburn@mit.edu>
 
        * f_cbc.c (krb5int_des_cbc_encrypt, krb5int_des_cbc_decrypt): New

diff --git a/src/lib/crypto/des/d3_cbc.c b/src/lib/crypto/des/d3_cbc.c
index 450b013e11d45673952447e35cd3df8587225a5a..abef25737b47c0abfe93da390856858e78aadf1f 100644 (file)
--- a/src/lib/crypto/des/d3_cbc.c
+++ b/src/lib/crypto/des/d3_cbc.c
@@ -145,6 +145,8 @@ krb5int_des3_cbc_decrypt(const mit_des_cblock *in,
     const unsigned DES_INT32 *kp1, *kp2, *kp3;
     const unsigned char *ip;
     unsigned char *op;
+    unsigned DES_INT32 ocipherl, ocipherr;
+    unsigned DES_INT32 cipherl, cipherr;
 
     /*
      * Get key pointer here.  This won't need to be reinitialized
@@ -158,8 +160,6 @@ krb5int_des3_cbc_decrypt(const mit_des_cblock *in,
      * the necessity of remembering a lot more things.
      * Should think about this a little more...
      */
-    unsigned DES_INT32 ocipherl, ocipherr;
-    unsigned DES_INT32 cipherl, cipherr;
 
     if (length <= 0)
        return;

diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c
index bb17871a23b3a4e7564ecb4da6e90c611a9c3964..c09060fc5e4e47f049f88d01f2b381cbd0e36339 100644 (file)
--- a/src/lib/crypto/des/f_cbc.c
+++ b/src/lib/crypto/des/f_cbc.c
@@ -156,6 +156,8 @@ krb5int_des_cbc_decrypt(const mit_des_cblock *in,
        const unsigned DES_INT32 *kp;
        const unsigned char *ip;
        unsigned char *op;
+       unsigned DES_INT32 ocipherl, ocipherr;
+       unsigned DES_INT32 cipherl, cipherr;
 
        /*
         * Get key pointer here.  This won't need to be reinitialized
@@ -167,8 +169,6 @@ krb5int_des_cbc_decrypt(const mit_des_cblock *in,
         * the necessity of remembering a lot more things.
         * Should think about this a little more...
         */
-       unsigned DES_INT32 ocipherl, ocipherr;
-       unsigned DES_INT32 cipherl, cipherr;
 
        if (length <= 0)
                return;