diff options
| author |   tedu <tedu@openbsd.org> | 2014-06-19 21:29:51 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-06-19 21:29:51 +0000 |
| commit | c00bf8c60a5d0061a6eaa71135f6fed7c074ffce (patch) | |
| tree | 1e45d15fc5a126542016b8ca16854da86d3b8d4e /lib/libssl/t1_lib.c | |
| parent | check stack push return and make some effort to clean up. ok beck miod (diff) | |
| download | wireguard-openbsd-c00bf8c60a5d0061a6eaa71135f6fed7c074ffce.tar.xz wireguard-openbsd-c00bf8c60a5d0061a6eaa71135f6fed7c074ffce.zip | |
convert CRYPTO_memcmp to timingsafe_memcmp based on current policy favoring
libc interfaces over libcrypto interfaces. for now we also prefer
timingsafe_memcmp over timingsafe_bcmp, even when the latter is acceptable.
ok beck deraadt matthew miod
Diffstat (limited to 'lib/libssl/t1_lib.c')
| -rw-r--r-- | lib/libssl/t1_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c index 054de0ceef1..7b3393820bc 100644 --- a/lib/libssl/t1_lib.c +++ b/lib/libssl/t1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_lib.c,v 1.47 2014/06/18 04:49:40 miod Exp $ */ +/* $OpenBSD: t1_lib.c,v 1.48 2014/06/19 21:29:51 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1879,7 +1879,7 @@ tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, renew_ticket = 1; } else { /* Check key name matches */ - if (CRYPTO_memcmp(etick, tctx->tlsext_tick_key_name, 16)) + if (timingsafe_memcmp(etick, tctx->tlsext_tick_key_name, 16)) return 2; HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16, tlsext_tick_md(), NULL); @@ -1899,7 +1899,7 @@ tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, HMAC_Update(&hctx, etick, eticklen); HMAC_Final(&hctx, tick_hmac, NULL); HMAC_CTX_cleanup(&hctx); - if (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen)) { + if (timingsafe_memcmp(tick_hmac, etick + eticklen, mlen)) { EVP_CIPHER_CTX_cleanup(&ctx); return 2; } |