Replace the remaining ssl3_get_cipher_by_char() calls with n2s() and

ssl3_get_cipher_by_id().

ok bcook@

1 files changed, 1 insertions, 23 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 1d84effeea..1578f0388d 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.76 2014/08/11 01:06:22 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.77 2014/08/23 14:52:41 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2452,28 +2452,6 @@ ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
         return (1);
 }
 
-/* This function needs to check if the ciphers required are actually
- * available */
-const SSL_CIPHER *
-ssl3_get_cipher_by_char(const unsigned char *p)
-{
-        SSL_CIPHER               c;
-        const SSL_CIPHER        *cp;
-        unsigned long            id;
-
-        id = 0x03000000L | ((unsigned long)p[0] << 8L) | (unsigned long)p[1];
-        c.id = id;
-        cp = OBJ_bsearch_ssl_cipher_id(&c, ssl3_ciphers, SSL3_NUM_CIPHERS);
-#ifdef DEBUG_PRINT_UNKNOWN_CIPHERSUITES
-        if (cp == NULL)
-                fprintf(stderr, "Unknown cipher ID %x\n", (p[0] << 8) | p[1]);
-#endif
-        if (cp == NULL || cp->valid == 0)
-                return NULL;
-        else
-                return cp;
-}
-
 int
 ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
 {