Add support for legacy PEM format private keys in EVP_PKEY_ASN1_METHOD.

[openssl.git] / ssl / s2_meth.c

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index cfc8828cc7185e85cee6d71c87cc36558393d5e1..2bffa78ff4ca35b5eb0b64b9e8c1fa8edf9b202e 100644 (file)
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -56,12 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include "objects.h"
 #include "ssl_locl.h"
+#ifndef OPENSSL_NO_SSL2
+#include <stdio.h>
+#include <openssl/objects.h>
 
-static SSL_METHOD *ssl2_get_method(ver)
-int ver;
+static const SSL_METHOD *ssl2_get_method(int ver);
+static const SSL_METHOD *ssl2_get_method(int ver)
        {
        if (ver == SSL2_VERSION)
                return(SSLv2_method());
@@ -69,20 +70,15 @@ int ver;
                return(NULL);
        }
 
-SSL_METHOD *SSLv2_method()
-       {
-       static int init=1;
-       static SSL_METHOD SSLv2_data;
+IMPLEMENT_ssl2_meth_func(SSLv2_method,
+                       ssl2_accept,
+                       ssl2_connect,
+                       ssl2_get_method)
 
-       if (init)
-               {
-               init=0;
-               memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(),
-                       sizeof(SSL_METHOD));
-               SSLv2_data.ssl_connect=ssl2_connect;
-               SSLv2_data.ssl_accept=ssl2_accept;
-               SSLv2_data.get_ssl_method=ssl2_get_method;
-               }
-       return(&SSLv2_data);
-       }
+#else /* !OPENSSL_NO_SSL2 */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
 
+#endif