add crypto/ecdh

[openssl.git] / crypto / cryptlib.c

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 3bceddfbbf3860ebb872f1d3d9357302bfb18a17..b72f7fb015913058333ff3bd91346022cd44ce91 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>
@@ -105,7 +110,8 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
        "ui",
        "ecdsa",
        "ec",
-#if CRYPTO_NUM_LOCKS != 33
+       "ecdh",
+#if CRYPTO_NUM_LOCKS != 34
 # error "Inconsistency between crypto.h and cryptlib.c"
 #endif
        };
@@ -494,11 +500,3 @@ BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason,
 #endif
 
 #endif
-
-void OpenSSLDie(const char *file,int line,const char *assertion)
-    {
-    fprintf(stderr,"%s(%d): OpenSSL internal error, assertion failed: %s\n",
-           file,line,assertion);
-    abort();
-    }
-