projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bn/asm/rsaz-*.pl: allow spaces in Perl path name.
[oweals/openssl.git]
/
ssl
/
s23_meth.c
diff --git
a/ssl/s23_meth.c
b/ssl/s23_meth.c
index c88569d32ceb9fa16912c8f28ac18c6a314afd25..40eae0f0be624868f85f7cfb471aa80a32f5e368 100644
(file)
--- a/
ssl/s23_meth.c
+++ b/
ssl/s23_meth.c
@@
-60,16
+60,28
@@
#include <openssl/objects.h>
#include "ssl_locl.h"
#include <openssl/objects.h>
#include "ssl_locl.h"
-static SSL_METHOD *ssl23_get_method(int ver);
-static SSL_METHOD *ssl23_get_method(int ver)
+static
const
SSL_METHOD *ssl23_get_method(int ver);
+static
const
SSL_METHOD *ssl23_get_method(int ver)
{
{
+#ifndef OPENSSL_NO_SSL2
if (ver == SSL2_VERSION)
return(SSLv2_method());
if (ver == SSL2_VERSION)
return(SSLv2_method());
- else if (ver == SSL3_VERSION)
+ else
+#endif
+#ifndef OPENSSL_NO_SSL3
+ if (ver == SSL3_VERSION)
return(SSLv3_method());
return(SSLv3_method());
- else if (ver == TLS1_VERSION)
+ else
+#endif
+#ifndef OPENSSL_NO_TLS1
+ if (ver == TLS1_VERSION)
return(TLSv1_method());
return(TLSv1_method());
+ else if (ver == TLS1_1_VERSION)
+ return(TLSv1_1_method());
+ else if (ver == TLS1_2_VERSION)
+ return(TLSv1_2_method());
else
else
+#endif
return(NULL);
}
return(NULL);
}