openssl-1.0.0e: resolve conflicts

1 files changed, 0 insertions, 7 deletions

diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c
index e3fce53430..3bf728318a 100644
--- a/src/lib/libssl/s23_lib.c
+++ b/src/lib/libssl/s23_lib.c
@@ -92,15 +92,8 @@ const SSL_CIPHER *ssl23_get_cipher(unsigned int u)
  * available */
 const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
         {
-        SSL_CIPHER c;
         const SSL_CIPHER *cp;
-        unsigned long id;
-        int n;
 
-        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)