summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_ciph.c
diff options
context:
space:
mode:
authorjsing <>2022-02-05 14:54:10 +0000
committerjsing <>2022-02-05 14:54:10 +0000
commit83e485da0e6d59ae7baf4be882b7d2a569774e84 (patch)
treeda7fe094101bf3711667cf1650e3c6f57a50e2ff /src/lib/libssl/ssl_ciph.c
parenta97d9e9ca8287d1d19559ab919f71b5c5771caeb (diff)
downloadopenbsd-83e485da0e6d59ae7baf4be882b7d2a569774e84.tar.gz
openbsd-83e485da0e6d59ae7baf4be882b7d2a569774e84.tar.bz2
openbsd-83e485da0e6d59ae7baf4be882b7d2a569774e84.zip
Bye bye S3I.
S3I has served us well, however now that libssl is fully opaque it is time to say goodbye. Aside from removing the calloc/free/memset, the rest is mechanical sed. ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r--src/lib/libssl/ssl_ciph.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 643d668d7c..13dcd90525 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.125 2021/11/23 18:26:23 tb Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.126 2022/02/05 14:54:10 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 *
@@ -564,10 +564,10 @@ ssl_get_handshake_evp_md(SSL *s, const EVP_MD **md)
564 564
565 *md = NULL; 565 *md = NULL;
566 566
567 if (S3I(s)->hs.cipher == NULL) 567 if (s->s3->hs.cipher == NULL)
568 return 0; 568 return 0;
569 569
570 handshake_mac = S3I(s)->hs.cipher->algorithm2 & 570 handshake_mac = s->s3->hs.cipher->algorithm2 &
571 SSL_HANDSHAKE_MAC_MASK; 571 SSL_HANDSHAKE_MAC_MASK;
572 572
573 /* For TLSv1.2 we upgrade the default MD5+SHA1 MAC to SHA256. */ 573 /* For TLSv1.2 we upgrade the default MD5+SHA1 MAC to SHA256. */