diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 05fa290edf..bcd9b500f4 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.60 2014/07/10 09:26:08 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.61 2014/07/10 10:09:54 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 | * |
@@ -641,15 +641,6 @@ ssl_load_ciphers(void) | |||
641 | EVP_MD_size(ssl_digest_methods[SSL_MD_SHA384_IDX]); | 641 | EVP_MD_size(ssl_digest_methods[SSL_MD_SHA384_IDX]); |
642 | } | 642 | } |
643 | 643 | ||
644 | /* ssl_cipher_get_comp sets comp to the correct SSL_COMP for the given | ||
645 | * session and returns 1. On error it returns 0. */ | ||
646 | int | ||
647 | ssl_cipher_get_comp(const SSL_SESSION *s, SSL_COMP **comp) | ||
648 | { | ||
649 | *comp = NULL; | ||
650 | return 1; | ||
651 | } | ||
652 | |||
653 | int | 644 | int |
654 | ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, | 645 | ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, |
655 | const EVP_MD **md, int *mac_pkey_type, int *mac_secret_size) | 646 | const EVP_MD **md, int *mac_pkey_type, int *mac_secret_size) |