| Index: openssl/ssl/s23_lib.c
|
| ===================================================================
|
| --- openssl/ssl/s23_lib.c (revision 105093)
|
| +++ openssl/ssl/s23_lib.c (working copy)
|
| @@ -65,11 +65,6 @@
|
| 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()
|
| @@ -79,7 +74,7 @@
|
| );
|
| }
|
|
|
| -SSL_CIPHER *ssl23_get_cipher(unsigned int u)
|
| +const SSL_CIPHER *ssl23_get_cipher(unsigned int u)
|
| {
|
| unsigned int uu=ssl3_num_ciphers();
|
|
|
| @@ -95,16 +90,10 @@
|
|
|
| /* 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)
|
|
|