projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move ec.h to ec2.h because it is not compatible with what we will use.
[oweals/openssl.git]
/
ssl
/
s23_lib.c
diff --git
a/ssl/s23_lib.c
b/ssl/s23_lib.c
index 41843dfea21fde8af5c931ad701b61af4d641eaf..ec739deff194535fb81c1daeb35e35ab77535d56 100644
(file)
--- a/
ssl/s23_lib.c
+++ b/
ssl/s23_lib.c
@@
-92,6
+92,9
@@
static SSL_METHOD SSLv23_data= {
ssl_bad_method,
ssl23_default_timeout,
&ssl3_undef_enc_method,
ssl_bad_method,
ssl23_default_timeout,
&ssl3_undef_enc_method,
+ ssl_undefined_function,
+ ssl3_callback_ctrl,
+ ssl3_ctx_callback_ctrl,
};
static long ssl23_default_timeout(void)
};
static long ssl23_default_timeout(void)
@@
-107,7
+110,7
@@
SSL_METHOD *sslv23_base_method(void)
static int ssl23_num_ciphers(void)
{
return(ssl3_num_ciphers()
static int ssl23_num_ciphers(void)
{
return(ssl3_num_ciphers()
-#ifndef NO_SSL2
+#ifndef
OPENSSL_
NO_SSL2
+ ssl2_num_ciphers()
#endif
);
+ ssl2_num_ciphers()
#endif
);
@@
-120,7
+123,7
@@
static SSL_CIPHER *ssl23_get_cipher(unsigned int u)
if (u < uu)
return(ssl3_get_cipher(u));
else
if (u < uu)
return(ssl3_get_cipher(u));
else
-#ifndef NO_SSL2
+#ifndef
OPENSSL_
NO_SSL2
return(ssl2_get_cipher(u-uu));
#else
return(NULL);
return(ssl2_get_cipher(u-uu));
#else
return(NULL);
@@
-140,7
+143,7
@@
static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
((unsigned long)p[1]<<8L)|(unsigned long)p[2];
c.id=id;
cp=ssl3_get_cipher_by_char(p);
((unsigned long)p[1]<<8L)|(unsigned long)p[2];
c.id=id;
cp=ssl3_get_cipher_by_char(p);
-#ifndef NO_SSL2
+#ifndef
OPENSSL_
NO_SSL2
if (cp == NULL)
cp=ssl2_get_cipher_by_char(p);
#endif
if (cp == NULL)
cp=ssl2_get_cipher_by_char(p);
#endif