From ba83acf62b74ac38323cdf014409e05439e107e0 Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Mon, 11 Aug 2014 01:06:22 +0000
Subject: Provide a ssl3_get_cipher_by_id() function that allows ciphers to be
 looked up by their ID. For one, this avoids an ugly mess in ssl_sess.c, where
 the cipher value is manually written into a buffer, just so the cipher can be
 located using ssl3_get_cipher_by_char().

ok bcook@ miod@
---
 lib/libssl/src/ssl/s3_lib.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'lib/libssl/src/ssl/s3_lib.c')

diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c
index acb35a8f25f..1d84effeeab 100644
--- a/lib/libssl/src/ssl/s3_lib.c
+++ b/lib/libssl/src/ssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.75 2014/08/10 15:06:15 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.76 2014/08/11 01:06:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1873,6 +1873,19 @@ ssl3_get_cipher(unsigned int u)
 		return (NULL);
 }
 
+const SSL_CIPHER *
+ssl3_get_cipher_by_id(unsigned int id)
+{
+	const SSL_CIPHER *cp;
+	SSL_CIPHER c;
+
+	c.id = id;
+	cp = OBJ_bsearch_ssl_cipher_id(&c, ssl3_ciphers, SSL3_NUM_CIPHERS);
+	if (cp != NULL && cp->valid == 1)
+		return (cp);
+	return (NULL);
+}
+
 int
 ssl3_pending(const SSL *s)
 {
-- 
cgit v1.2.3-59-g8ed1b