diff options
| author |   jsing <jsing@openbsd.org> | 2014-06-13 14:15:14 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-06-13 14:15:14 +0000 |
| commit | b5336a59887f513877bd02fa60ceb832bc6097b5 (patch) | |
| tree | 041d3a1393df240694e81864aef2e5c80dcfb1d6 /lib/libssl/src | |
| parent | Rename a bunch of variables in ssl3_change_cipher_state() for readability. (diff) | |
| download | wireguard-openbsd-b5336a59887f513877bd02fa60ceb832bc6097b5.tar.xz wireguard-openbsd-b5336a59887f513877bd02fa60ceb832bc6097b5.zip | |
The export_key/export_iv variables are only used in the is_export case.
Also use c rather than &c[0].
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/s3_enc.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/libssl/src/ssl/s3_enc.c b/lib/libssl/src/ssl/s3_enc.c index 38ccc46724c..1fdccbb8427 100644 --- a/lib/libssl/src/ssl/s3_enc.c +++ b/lib/libssl/src/ssl/s3_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_enc.c,v 1.42 2014/06/13 14:11:35 jsing Exp $ */ +/* $OpenBSD: s3_enc.c,v 1.43 2014/06/13 14:15:14 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -355,23 +355,26 @@ ssl3_change_cipher_state(SSL *s, int which) EVP_DigestUpdate(&mac_ctx, key, j); EVP_DigestUpdate(&mac_ctx, er1, SSL3_RANDOM_SIZE); EVP_DigestUpdate(&mac_ctx, er2, SSL3_RANDOM_SIZE); - EVP_DigestFinal_ex(&mac_ctx, &(export_key[0]), NULL); - key = &(export_key[0]); + EVP_DigestFinal_ex(&mac_ctx, export_key, NULL); + key = export_key; if (k > 0) { EVP_DigestInit_ex(&mac_ctx, EVP_md5(), NULL); EVP_DigestUpdate(&mac_ctx, er1, SSL3_RANDOM_SIZE); EVP_DigestUpdate(&mac_ctx, er2, SSL3_RANDOM_SIZE); - EVP_DigestFinal_ex(&mac_ctx, &(export_iv[0]), NULL); - iv = &(export_iv[0]); + EVP_DigestFinal_ex(&mac_ctx, export_iv, NULL); + iv = export_iv; } } EVP_CipherInit_ex(cipher_ctx, cipher, NULL, key, iv, (which & SSL3_CC_WRITE)); - OPENSSL_cleanse(&(export_key[0]), sizeof(export_key)); - OPENSSL_cleanse(&(export_iv[0]), sizeof(export_iv)); + if (is_export) { + OPENSSL_cleanse(export_key, sizeof(export_key)); + OPENSSL_cleanse(export_iv, sizeof(export_iv)); + } + EVP_MD_CTX_cleanup(&mac_ctx); return (1); err: |