The AES CTR API was buggy, we need to save the encrypted counter as well

[openssl.git] / crypto / cryptlib.c

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 9a7ed2cf754d994ab108f33e7544b1e72947b2f0..5d8debd2c88a1ff606f106adff9cd0cc332829eb 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -55,6 +55,11 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * ECDH support in OpenSSL originally developed by 
+ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -89,6 +94,7 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
        "ssl_session",
        "ssl_sess_cert",
        "ssl",
+       "ssl_method",
        "rand",
        "rand2",
        "debug_malloc",
@@ -105,7 +111,8 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
        "ui",
        "ecdsa",
        "ec",
-#if CRYPTO_NUM_LOCKS != 33
+       "ecdh",
+#if CRYPTO_NUM_LOCKS != 35
 # error "Inconsistency between crypto.h and cryptlib.c"
 #endif
        };