From c323b76a9baa5f27be12748b60e008e1c279108e Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 22 Jul 2003 15:19:55 +0000 Subject: [PATCH] * 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 --- src/lib/crypto/des/ChangeLog | 6 ++++++ src/lib/crypto/des/d3_cbc.c | 4 ++-- src/lib/crypto/des/f_cbc.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 4a4cc7ec6..70cf9b8a9 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,9 @@ +2003-07-22 Ken Raeburn + + * 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 * 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 450b013e1..abef25737 100644 --- 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 bb17871a2..c09060fc5 100644 --- 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; -- 2.26.2