projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify CMS_decrypt behaviour.
[openssl.git]
/
ssl
/
s23_lib.c
diff --git
a/ssl/s23_lib.c
b/ssl/s23_lib.c
index fc2981308d55e3d4b16e5f6fb59482ea5226cd4b..3bf728318a4cec530eb25d41b05e7b83cebe817b 100644
(file)
--- a/
ssl/s23_lib.c
+++ b/
ssl/s23_lib.c
@@
-65,11
+65,6
@@
long ssl23_default_timeout(void)
return(300);
}
return(300);
}
-IMPLEMENT_ssl23_meth_func(sslv23_base_method,
- ssl_undefined_function,
- ssl_undefined_function,
- ssl_bad_method)
-
int ssl23_num_ciphers(void)
{
return(ssl3_num_ciphers()
int ssl23_num_ciphers(void)
{
return(ssl3_num_ciphers()
@@
-79,7
+74,7
@@
int ssl23_num_ciphers(void)
);
}
);
}
-SSL_CIPHER *ssl23_get_cipher(unsigned int u)
+
const
SSL_CIPHER *ssl23_get_cipher(unsigned int u)
{
unsigned int uu=ssl3_num_ciphers();
{
unsigned int uu=ssl3_num_ciphers();
@@
-95,16
+90,10
@@
SSL_CIPHER *ssl23_get_cipher(unsigned int u)
/* This function needs to check if the ciphers required are actually
* available */
/* This function needs to check if the ciphers required are actually
* available */
-SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
+
const
SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
{
{
- SSL_CIPHER c,*cp;
- unsigned long id;
- int n;
+ const SSL_CIPHER *cp;
- n=ssl3_num_ciphers();
- id=0x03000000|((unsigned long)p[0]<<16L)|
- ((unsigned long)p[1]<<8L)|(unsigned long)p[2];
- c.id=id;
cp=ssl3_get_cipher_by_char(p);
#ifndef OPENSSL_NO_SSL2
if (cp == NULL)
cp=ssl3_get_cipher_by_char(p);
#ifndef OPENSSL_NO_SSL2
if (cp == NULL)