summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_ciph.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r--src/lib/libssl/ssl_ciph.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index da48765aba..49af292d6c 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.95 2017/03/05 14:39:53 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.96 2017/03/10 16:03:27 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -193,12 +193,6 @@ static int ssl_mac_secret_size[SSL_MD_NUM_IDX] = {
193 0, 0, 0, 0, 0, 0, 0, 193 0, 0, 0, 0, 0, 0, 0,
194}; 194};
195 195
196static int ssl_handshake_digest_flag[SSL_MD_NUM_IDX] = {
197 SSL_HANDSHAKE_MAC_MD5, SSL_HANDSHAKE_MAC_SHA,
198 SSL_HANDSHAKE_MAC_GOST94, 0, SSL_HANDSHAKE_MAC_SHA256,
199 SSL_HANDSHAKE_MAC_SHA384, SSL_HANDSHAKE_MAC_STREEBOG256,
200};
201
202#define CIPHER_ADD 1 196#define CIPHER_ADD 1
203#define CIPHER_KILL 2 197#define CIPHER_KILL 2
204#define CIPHER_DEL 3 198#define CIPHER_DEL 3
@@ -706,20 +700,6 @@ ssl_cipher_get_evp_aead(const SSL_SESSION *s, const EVP_AEAD **aead)
706} 700}
707 701
708int 702int
709ssl_get_handshake_digest(int idx, long *mask, const EVP_MD **md)
710{
711 if (idx < 0 || idx >= SSL_MD_NUM_IDX) {
712 return 0;
713 }
714 *mask = ssl_handshake_digest_flag[idx];
715 if (*mask)
716 *md = ssl_digest_methods[idx];
717 else
718 *md = NULL;
719 return 1;
720}
721
722int
723ssl_get_handshake_evp_md(SSL *s, const EVP_MD **md) 703ssl_get_handshake_evp_md(SSL *s, const EVP_MD **md)
724{ 704{
725 *md = NULL; 705 *md = NULL;