OpenSSL 1.1.1-pre2
This commit is contained in:
+173
-126
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2005 Nokia. All rights reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
@@ -7,37 +8,11 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
/* ====================================================================
|
||||
* Copyright 2005 Nokia. All rights reserved.
|
||||
*
|
||||
* The portions of the attached software ("Contribution") is developed by
|
||||
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
|
||||
* license.
|
||||
*
|
||||
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
|
||||
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
|
||||
* support (see RFC 4279) to OpenSSL.
|
||||
*
|
||||
* No patent licenses or other rights except those expressly stated in
|
||||
* the OpenSSL open source license shall be deemed granted or received
|
||||
* expressly, by implication, estoppel, or otherwise.
|
||||
*
|
||||
* No assurances are provided by Nokia that the Contribution does not
|
||||
* infringe the patent or other intellectual property rights of any third
|
||||
* party or that the license provides you with all the necessary rights
|
||||
* to make use of the Contribution.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
|
||||
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
|
||||
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
|
||||
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
|
||||
* OTHERWISE.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "ssl_locl.h"
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/md5.h>
|
||||
#include "internal/cryptlib.h"
|
||||
|
||||
static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
|
||||
{
|
||||
@@ -55,7 +30,8 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
|
||||
m5 = EVP_MD_CTX_new();
|
||||
s1 = EVP_MD_CTX_new();
|
||||
if (m5 == NULL || s1 == NULL) {
|
||||
SSLerr(SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_MALLOC_FAILURE);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_GENERATE_KEY_BLOCK,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
EVP_MD_CTX_set_flags(m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
|
||||
@@ -63,7 +39,8 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
|
||||
k++;
|
||||
if (k > sizeof(buf)) {
|
||||
/* bug: 'buf' is too small for this ciphersuite */
|
||||
SSLerr(SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_INTERNAL_ERROR);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_GENERATE_KEY_BLOCK,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
|
||||
@@ -80,15 +57,24 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
|
||||
|| !EVP_DigestInit_ex(m5, EVP_md5(), NULL)
|
||||
|| !EVP_DigestUpdate(m5, s->session->master_key,
|
||||
s->session->master_key_length)
|
||||
|| !EVP_DigestUpdate(m5, smd, SHA_DIGEST_LENGTH))
|
||||
|| !EVP_DigestUpdate(m5, smd, SHA_DIGEST_LENGTH)) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_GENERATE_KEY_BLOCK,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
if ((int)(i + MD5_DIGEST_LENGTH) > num) {
|
||||
if (!EVP_DigestFinal_ex(m5, smd, NULL))
|
||||
if (!EVP_DigestFinal_ex(m5, smd, NULL)) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
||||
SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
memcpy(km, smd, (num - i));
|
||||
} else {
|
||||
if (!EVP_DigestFinal_ex(m5, km, NULL))
|
||||
if (!EVP_DigestFinal_ex(m5, km, NULL)) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
||||
SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
km += MD5_DIGEST_LENGTH;
|
||||
@@ -113,13 +99,18 @@ int ssl3_change_cipher_state(SSL *s, int which)
|
||||
COMP_METHOD *comp;
|
||||
#endif
|
||||
const EVP_MD *m;
|
||||
int n, i, j, k, cl;
|
||||
int mdi;
|
||||
size_t n, i, j, k, cl;
|
||||
int reuse_dd = 0;
|
||||
|
||||
c = s->s3->tmp.new_sym_enc;
|
||||
m = s->s3->tmp.new_hash;
|
||||
/* m == NULL will lead to a crash later */
|
||||
OPENSSL_assert(m);
|
||||
if (!ossl_assert(m != NULL)) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
#ifndef OPENSSL_NO_COMP
|
||||
if (s->s3->tmp.new_compression == NULL)
|
||||
comp = NULL;
|
||||
@@ -128,20 +119,24 @@ int ssl3_change_cipher_state(SSL *s, int which)
|
||||
#endif
|
||||
|
||||
if (which & SSL3_CC_READ) {
|
||||
if (s->enc_read_ctx != NULL)
|
||||
if (s->enc_read_ctx != NULL) {
|
||||
reuse_dd = 1;
|
||||
else if ((s->enc_read_ctx = EVP_CIPHER_CTX_new()) == NULL)
|
||||
} else if ((s->enc_read_ctx = EVP_CIPHER_CTX_new()) == NULL) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
else
|
||||
} else {
|
||||
/*
|
||||
* make sure it's initialised in case we exit later with an error
|
||||
*/
|
||||
EVP_CIPHER_CTX_reset(s->enc_read_ctx);
|
||||
}
|
||||
dd = s->enc_read_ctx;
|
||||
|
||||
if (ssl_replace_hash(&s->read_hash, m) == NULL) {
|
||||
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
|
||||
goto err2;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
#ifndef OPENSSL_NO_COMP
|
||||
/* COMPRESS */
|
||||
@@ -150,28 +145,33 @@ int ssl3_change_cipher_state(SSL *s, int which)
|
||||
if (comp != NULL) {
|
||||
s->expand = COMP_CTX_new(comp);
|
||||
if (s->expand == NULL) {
|
||||
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
SSL_R_COMPRESSION_LIBRARY_ERROR);
|
||||
goto err2;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
||||
SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
SSL_R_COMPRESSION_LIBRARY_ERROR);
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
RECORD_LAYER_reset_read_sequence(&s->rlayer);
|
||||
mac_secret = &(s->s3->read_mac_secret[0]);
|
||||
} else {
|
||||
if (s->enc_write_ctx != NULL)
|
||||
if (s->enc_write_ctx != NULL) {
|
||||
reuse_dd = 1;
|
||||
else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL)
|
||||
} else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
else
|
||||
} else {
|
||||
/*
|
||||
* make sure it's initialised in case we exit later with an error
|
||||
*/
|
||||
EVP_CIPHER_CTX_reset(s->enc_write_ctx);
|
||||
}
|
||||
dd = s->enc_write_ctx;
|
||||
if (ssl_replace_hash(&s->write_hash, m) == NULL) {
|
||||
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
|
||||
goto err2;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
#ifndef OPENSSL_NO_COMP
|
||||
/* COMPRESS */
|
||||
@@ -180,9 +180,10 @@ int ssl3_change_cipher_state(SSL *s, int which)
|
||||
if (comp != NULL) {
|
||||
s->compress = COMP_CTX_new(comp);
|
||||
if (s->compress == NULL) {
|
||||
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
SSL_R_COMPRESSION_LIBRARY_ERROR);
|
||||
goto err2;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
||||
SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
SSL_R_COMPRESSION_LIBRARY_ERROR);
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -194,9 +195,13 @@ int ssl3_change_cipher_state(SSL *s, int which)
|
||||
EVP_CIPHER_CTX_reset(dd);
|
||||
|
||||
p = s->s3->tmp.key_block;
|
||||
i = EVP_MD_size(m);
|
||||
if (i < 0)
|
||||
goto err2;
|
||||
mdi = EVP_MD_size(m);
|
||||
if (mdi < 0) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
i = mdi;
|
||||
cl = EVP_CIPHER_key_length(c);
|
||||
j = cl;
|
||||
k = EVP_CIPHER_iv_length(c);
|
||||
@@ -219,24 +224,26 @@ int ssl3_change_cipher_state(SSL *s, int which)
|
||||
}
|
||||
|
||||
if (n > s->s3->tmp.key_block_length) {
|
||||
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
|
||||
goto err2;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
|
||||
memcpy(mac_secret, ms, i);
|
||||
|
||||
if (!EVP_CipherInit_ex(dd, c, NULL, key, iv, (which & SSL3_CC_WRITE)))
|
||||
goto err2;
|
||||
if (!EVP_CipherInit_ex(dd, c, NULL, key, iv, (which & SSL3_CC_WRITE))) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_CHANGE_CIPHER_STATE,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
goto err;
|
||||
}
|
||||
|
||||
OPENSSL_cleanse(exp_key, sizeof(exp_key));
|
||||
OPENSSL_cleanse(exp_iv, sizeof(exp_iv));
|
||||
return (1);
|
||||
return 1;
|
||||
err:
|
||||
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_MALLOC_FAILURE);
|
||||
err2:
|
||||
OPENSSL_cleanse(exp_key, sizeof(exp_key));
|
||||
OPENSSL_cleanse(exp_iv, sizeof(exp_iv));
|
||||
return (0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ssl3_setup_key_block(SSL *s)
|
||||
@@ -249,11 +256,12 @@ int ssl3_setup_key_block(SSL *s)
|
||||
SSL_COMP *comp;
|
||||
|
||||
if (s->s3->tmp.key_block_length != 0)
|
||||
return (1);
|
||||
return 1;
|
||||
|
||||
if (!ssl_cipher_get_evp(s->session, &c, &hash, NULL, NULL, &comp, 0)) {
|
||||
SSLerr(SSL_F_SSL3_SETUP_KEY_BLOCK, SSL_R_CIPHER_OR_HASH_UNAVAILABLE);
|
||||
return (0);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_SETUP_KEY_BLOCK,
|
||||
SSL_R_CIPHER_OR_HASH_UNAVAILABLE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->s3->tmp.new_sym_enc = c;
|
||||
@@ -273,12 +281,16 @@ int ssl3_setup_key_block(SSL *s)
|
||||
|
||||
ssl3_cleanup_key_block(s);
|
||||
|
||||
if ((p = OPENSSL_malloc(num)) == NULL)
|
||||
goto err;
|
||||
if ((p = OPENSSL_malloc(num)) == NULL) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_SETUP_KEY_BLOCK,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->s3->tmp.key_block_length = num;
|
||||
s->s3->tmp.key_block = p;
|
||||
|
||||
/* Calls SSLfatal() as required */
|
||||
ret = ssl3_generate_key_block(s, p, num);
|
||||
|
||||
if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS)) {
|
||||
@@ -300,10 +312,6 @@ int ssl3_setup_key_block(SSL *s)
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
err:
|
||||
SSLerr(SSL_F_SSL3_SETUP_KEY_BLOCK, ERR_R_MALLOC_FAILURE);
|
||||
return (0);
|
||||
}
|
||||
|
||||
void ssl3_cleanup_key_block(SSL *s)
|
||||
@@ -318,7 +326,8 @@ int ssl3_init_finished_mac(SSL *s)
|
||||
BIO *buf = BIO_new(BIO_s_mem());
|
||||
|
||||
if (buf == NULL) {
|
||||
SSLerr(SSL_F_SSL3_INIT_FINISHED_MAC, ERR_R_MALLOC_FAILURE);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_INIT_FINISHED_MAC,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
ssl3_free_digest_list(s);
|
||||
@@ -340,13 +349,32 @@ void ssl3_free_digest_list(SSL *s)
|
||||
s->s3->handshake_dgst = NULL;
|
||||
}
|
||||
|
||||
int ssl3_finish_mac(SSL *s, const unsigned char *buf, int len)
|
||||
int ssl3_finish_mac(SSL *s, const unsigned char *buf, size_t len)
|
||||
{
|
||||
if (s->s3->handshake_dgst == NULL)
|
||||
int ret;
|
||||
|
||||
if (s->s3->handshake_dgst == NULL) {
|
||||
/* Note: this writes to a memory BIO so a failure is a fatal error */
|
||||
return BIO_write(s->s3->handshake_buffer, (void *)buf, len) == len;
|
||||
else
|
||||
return EVP_DigestUpdate(s->s3->handshake_dgst, buf, len);
|
||||
if (len > INT_MAX) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINISH_MAC,
|
||||
SSL_R_OVERFLOW_ERROR);
|
||||
return 0;
|
||||
}
|
||||
ret = BIO_write(s->s3->handshake_buffer, (void *)buf, (int)len);
|
||||
if (ret <= 0 || ret != (int)len) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINISH_MAC,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
ret = EVP_DigestUpdate(s->s3->handshake_dgst, buf, len);
|
||||
if (!ret) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINISH_MAC,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ssl3_digest_cached_records(SSL *s, int keep)
|
||||
@@ -358,21 +386,23 @@ int ssl3_digest_cached_records(SSL *s, int keep)
|
||||
if (s->s3->handshake_dgst == NULL) {
|
||||
hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
|
||||
if (hdatalen <= 0) {
|
||||
SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS,
|
||||
SSL_R_BAD_HANDSHAKE_LENGTH);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_DIGEST_CACHED_RECORDS,
|
||||
SSL_R_BAD_HANDSHAKE_LENGTH);
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->s3->handshake_dgst = EVP_MD_CTX_new();
|
||||
if (s->s3->handshake_dgst == NULL) {
|
||||
SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_MALLOC_FAILURE);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_DIGEST_CACHED_RECORDS,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
md = ssl_handshake_md(s);
|
||||
if (md == NULL || !EVP_DigestInit_ex(s->s3->handshake_dgst, md, NULL)
|
||||
|| !EVP_DigestUpdate(s->s3->handshake_dgst, hdata, hdatalen)) {
|
||||
SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_INTERNAL_ERROR);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_DIGEST_CACHED_RECORDS,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -384,41 +414,50 @@ int ssl3_digest_cached_records(SSL *s, int keep)
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p)
|
||||
size_t ssl3_final_finish_mac(SSL *s, const char *sender, size_t len,
|
||||
unsigned char *p)
|
||||
{
|
||||
int ret;
|
||||
EVP_MD_CTX *ctx = NULL;
|
||||
|
||||
if (!ssl3_digest_cached_records(s, 0))
|
||||
if (!ssl3_digest_cached_records(s, 0)) {
|
||||
/* SSLfatal() already called */
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (EVP_MD_CTX_type(s->s3->handshake_dgst) != NID_md5_sha1) {
|
||||
SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, SSL_R_NO_REQUIRED_DIGEST);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINAL_FINISH_MAC,
|
||||
SSL_R_NO_REQUIRED_DIGEST);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ctx = EVP_MD_CTX_new();
|
||||
if (ctx == NULL) {
|
||||
SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_MALLOC_FAILURE);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINAL_FINISH_MAC,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
if (!EVP_MD_CTX_copy_ex(ctx, s->s3->handshake_dgst)) {
|
||||
SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_INTERNAL_ERROR);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINAL_FINISH_MAC,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ret = EVP_MD_CTX_size(ctx);
|
||||
if (ret < 0) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINAL_FINISH_MAC,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
EVP_MD_CTX_reset(ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ((sender != NULL && EVP_DigestUpdate(ctx, sender, len) <= 0)
|
||||
|| EVP_MD_CTX_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET,
|
||||
s->session->master_key_length,
|
||||
(int)s->session->master_key_length,
|
||||
s->session->master_key) <= 0
|
||||
|| EVP_DigestFinal_ex(ctx, p, NULL) <= 0) {
|
||||
SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_INTERNAL_ERROR);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINAL_FINISH_MAC,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
@@ -428,7 +467,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p)
|
||||
}
|
||||
|
||||
int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
|
||||
int len)
|
||||
size_t len, size_t *secret_size)
|
||||
{
|
||||
static const unsigned char *salt[3] = {
|
||||
#ifndef CHARSET_EBCDIC
|
||||
@@ -443,11 +482,13 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
|
||||
};
|
||||
unsigned char buf[EVP_MAX_MD_SIZE];
|
||||
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
|
||||
int i, ret = 0;
|
||||
int i, ret = 1;
|
||||
unsigned int n;
|
||||
size_t ret_secret_size = 0;
|
||||
|
||||
if (ctx == NULL) {
|
||||
SSLerr(SSL_F_SSL3_GENERATE_MASTER_SECRET, ERR_R_MALLOC_FAILURE);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_GENERATE_MASTER_SECRET,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
for (i = 0; i < 3; i++) {
|
||||
@@ -459,92 +500,98 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
|
||||
SSL3_RANDOM_SIZE) <= 0
|
||||
|| EVP_DigestUpdate(ctx, &(s->s3->server_random[0]),
|
||||
SSL3_RANDOM_SIZE) <= 0
|
||||
/* TODO(size_t) : convert me */
|
||||
|| EVP_DigestFinal_ex(ctx, buf, &n) <= 0
|
||||
|| EVP_DigestInit_ex(ctx, s->ctx->md5, NULL) <= 0
|
||||
|| EVP_DigestUpdate(ctx, p, len) <= 0
|
||||
|| EVP_DigestUpdate(ctx, buf, n) <= 0
|
||||
|| EVP_DigestFinal_ex(ctx, out, &n) <= 0) {
|
||||
SSLerr(SSL_F_SSL3_GENERATE_MASTER_SECRET, ERR_R_INTERNAL_ERROR);
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
||||
SSL_F_SSL3_GENERATE_MASTER_SECRET, ERR_R_INTERNAL_ERROR);
|
||||
ret = 0;
|
||||
break;
|
||||
}
|
||||
out += n;
|
||||
ret += n;
|
||||
ret_secret_size += n;
|
||||
}
|
||||
EVP_MD_CTX_free(ctx);
|
||||
|
||||
OPENSSL_cleanse(buf, sizeof(buf));
|
||||
return (ret);
|
||||
if (ret)
|
||||
*secret_size = ret_secret_size;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ssl3_alert_code(int code)
|
||||
{
|
||||
switch (code) {
|
||||
case SSL_AD_CLOSE_NOTIFY:
|
||||
return (SSL3_AD_CLOSE_NOTIFY);
|
||||
return SSL3_AD_CLOSE_NOTIFY;
|
||||
case SSL_AD_UNEXPECTED_MESSAGE:
|
||||
return (SSL3_AD_UNEXPECTED_MESSAGE);
|
||||
return SSL3_AD_UNEXPECTED_MESSAGE;
|
||||
case SSL_AD_BAD_RECORD_MAC:
|
||||
return (SSL3_AD_BAD_RECORD_MAC);
|
||||
return SSL3_AD_BAD_RECORD_MAC;
|
||||
case SSL_AD_DECRYPTION_FAILED:
|
||||
return (SSL3_AD_BAD_RECORD_MAC);
|
||||
return SSL3_AD_BAD_RECORD_MAC;
|
||||
case SSL_AD_RECORD_OVERFLOW:
|
||||
return (SSL3_AD_BAD_RECORD_MAC);
|
||||
return SSL3_AD_BAD_RECORD_MAC;
|
||||
case SSL_AD_DECOMPRESSION_FAILURE:
|
||||
return (SSL3_AD_DECOMPRESSION_FAILURE);
|
||||
return SSL3_AD_DECOMPRESSION_FAILURE;
|
||||
case SSL_AD_HANDSHAKE_FAILURE:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_NO_CERTIFICATE:
|
||||
return (SSL3_AD_NO_CERTIFICATE);
|
||||
return SSL3_AD_NO_CERTIFICATE;
|
||||
case SSL_AD_BAD_CERTIFICATE:
|
||||
return (SSL3_AD_BAD_CERTIFICATE);
|
||||
return SSL3_AD_BAD_CERTIFICATE;
|
||||
case SSL_AD_UNSUPPORTED_CERTIFICATE:
|
||||
return (SSL3_AD_UNSUPPORTED_CERTIFICATE);
|
||||
return SSL3_AD_UNSUPPORTED_CERTIFICATE;
|
||||
case SSL_AD_CERTIFICATE_REVOKED:
|
||||
return (SSL3_AD_CERTIFICATE_REVOKED);
|
||||
return SSL3_AD_CERTIFICATE_REVOKED;
|
||||
case SSL_AD_CERTIFICATE_EXPIRED:
|
||||
return (SSL3_AD_CERTIFICATE_EXPIRED);
|
||||
return SSL3_AD_CERTIFICATE_EXPIRED;
|
||||
case SSL_AD_CERTIFICATE_UNKNOWN:
|
||||
return (SSL3_AD_CERTIFICATE_UNKNOWN);
|
||||
return SSL3_AD_CERTIFICATE_UNKNOWN;
|
||||
case SSL_AD_ILLEGAL_PARAMETER:
|
||||
return (SSL3_AD_ILLEGAL_PARAMETER);
|
||||
return SSL3_AD_ILLEGAL_PARAMETER;
|
||||
case SSL_AD_UNKNOWN_CA:
|
||||
return (SSL3_AD_BAD_CERTIFICATE);
|
||||
return SSL3_AD_BAD_CERTIFICATE;
|
||||
case SSL_AD_ACCESS_DENIED:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_DECODE_ERROR:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_DECRYPT_ERROR:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_EXPORT_RESTRICTION:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_PROTOCOL_VERSION:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_INSUFFICIENT_SECURITY:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_INTERNAL_ERROR:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_USER_CANCELLED:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_NO_RENEGOTIATION:
|
||||
return (-1); /* Don't send it :-) */
|
||||
return -1; /* Don't send it :-) */
|
||||
case SSL_AD_UNSUPPORTED_EXTENSION:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_CERTIFICATE_UNOBTAINABLE:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_UNRECOGNIZED_NAME:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_BAD_CERTIFICATE_HASH_VALUE:
|
||||
return (SSL3_AD_HANDSHAKE_FAILURE);
|
||||
return SSL3_AD_HANDSHAKE_FAILURE;
|
||||
case SSL_AD_UNKNOWN_PSK_IDENTITY:
|
||||
return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
|
||||
return TLS1_AD_UNKNOWN_PSK_IDENTITY;
|
||||
case SSL_AD_INAPPROPRIATE_FALLBACK:
|
||||
return (TLS1_AD_INAPPROPRIATE_FALLBACK);
|
||||
return TLS1_AD_INAPPROPRIATE_FALLBACK;
|
||||
case SSL_AD_NO_APPLICATION_PROTOCOL:
|
||||
return (TLS1_AD_NO_APPLICATION_PROTOCOL);
|
||||
return TLS1_AD_NO_APPLICATION_PROTOCOL;
|
||||
case SSL_AD_CERTIFICATE_REQUIRED:
|
||||
return SSL_AD_HANDSHAKE_FAILURE;
|
||||
default:
|
||||
return (-1);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user