diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 7ace9fe688..4eb1d78f17 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.108 2015/09/10 17:57:50 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.109 2015/09/11 17:29:36 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 | * |
@@ -3075,26 +3075,6 @@ SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, | |||
3075 | SSL_callback_ctrl(ssl, SSL_CTRL_SET_MSG_CALLBACK, (void (*)(void))cb); | 3075 | SSL_callback_ctrl(ssl, SSL_CTRL_SET_MSG_CALLBACK, (void (*)(void))cb); |
3076 | } | 3076 | } |
3077 | 3077 | ||
3078 | /* | ||
3079 | * Allocates new EVP_MD_CTX and sets pointer to it into given pointer | ||
3080 | * variable, freeing EVP_MD_CTX previously stored in that variable, if | ||
3081 | * any. If EVP_MD pointer is passed, initializes ctx with this md | ||
3082 | * Returns newly allocated ctx; | ||
3083 | */ | ||
3084 | EVP_MD_CTX * | ||
3085 | ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md) | ||
3086 | { | ||
3087 | ssl_clear_hash_ctx(hash); | ||
3088 | *hash = EVP_MD_CTX_create(); | ||
3089 | if (*hash != NULL && md != NULL) { | ||
3090 | if (!EVP_DigestInit_ex(*hash, md, NULL)) { | ||
3091 | ssl_clear_hash_ctx(hash); | ||
3092 | return (NULL); | ||
3093 | } | ||
3094 | } | ||
3095 | return (*hash); | ||
3096 | } | ||
3097 | |||
3098 | void | 3078 | void |
3099 | ssl_clear_hash_ctx(EVP_MD_CTX **hash) | 3079 | ssl_clear_hash_ctx(EVP_MD_CTX **hash) |
3100 | { | 3080 | { |