projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow code which calls RSA temp key callback to cope
[openssl.git]
/
ssl
/
s2_meth.c
diff --git
a/ssl/s2_meth.c
b/ssl/s2_meth.c
index 96ac159ce410f436e46272556afd2edd045c5e05..deb9e1d6f36c316fdd1b005916c74540a05130e4 100644
(file)
--- a/
ssl/s2_meth.c
+++ b/
ssl/s2_meth.c
@@
-56,16
+56,12
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
-#include <stdio.h>
-#include "objects.h"
#include "ssl_locl.h"
#include "ssl_locl.h"
+#ifndef NO_SSL2
+#include <stdio.h>
+#include <openssl/objects.h>
-#ifndef NOPROTO
static SSL_METHOD *ssl2_get_method(int ver);
static SSL_METHOD *ssl2_get_method(int ver);
-#else
-static SSL_METHOD *ssl2_get_method();
-#endif
-
static SSL_METHOD *ssl2_get_method(int ver)
{
if (ver == SSL2_VERSION)
static SSL_METHOD *ssl2_get_method(int ver)
{
if (ver == SSL2_VERSION)
@@
-90,4
+86,10
@@
SSL_METHOD *SSLv2_method(void)
}
return(&SSLv2_data);
}
}
return(&SSLv2_data);
}
+#else /* !NO_SSL2 */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+#endif