really fix race conditions

[oweals/openssl.git] / ssl / s3_both.c

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 805c6eecddfa3bd945c5132d5d5c2c811c14cb6d..8864366f59228a97789c79fd3e0f6a3f368d6e59 100644 (file)
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -108,11 +108,6 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
 
 #include <limits.h>
 #include <string.h>
@@ -525,12 +520,6 @@ int ssl_cert_type(X509 *x, EVP_PKEY *pkey)
                        else ret= -1;
                        }
                }
-#ifndef OPENSSL_NO_EC
-       else if (i == EVP_PKEY_EC)
-               {
-               ret = SSL_PKEY_ECC;
-               }
-#endif
        else
                ret= -1;