import openssl-0.9.7-beta1

2 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libcrypto/aes/aes_cfb.c b/src/lib/libcrypto/aes/aes_cfb.c
index 9b2917298a..41c2a5ec3d 100644
--- a/src/lib/libcrypto/aes/aes_cfb.c
+++ b/src/lib/libcrypto/aes/aes_cfb.c
@@ -137,7 +137,7 @@ void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
         } else {
                 while (l--) {
                         if (n == 0) {
-                                AES_decrypt(ivec, ivec, key);
+                                AES_encrypt(ivec, ivec, key);
                         }
                         c = *(in);
                         *(out++) = *(in++) ^ ivec[n];
diff --git a/src/lib/libcrypto/aes/aes_ctr.c b/src/lib/libcrypto/aes/aes_ctr.c
index 8e800481de..aea3db2092 100644
--- a/src/lib/libcrypto/aes/aes_ctr.c
+++ b/src/lib/libcrypto/aes/aes_ctr.c
@@ -106,8 +106,8 @@ void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 
         while (l--) {
                 if (n == 0) {
-                        AES_ctr128_inc(counter);
                         AES_encrypt(counter, tmp, key);
+                        AES_ctr128_inc(counter);
                 }
                 *(out++) = *(in++) ^ tmp[n];
                 n = (n+1) % AES_BLOCK_SIZE;