diff options
| author |   jsing <jsing@openbsd.org> | 2015-01-26 13:06:39 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-01-26 13:06:39 +0000 |
| commit | 58162c983c06ccc26752ceb2f047f12ffc0d518e (patch) | |
| tree | 9481a909bfb9a64c9ffadea689df75a08a941291 /lib/libssl/src/ssl/ssl_ciph.c | |
| parent | More improvements regarding tbl(7) options. (diff) | |
| download | wireguard-openbsd-58162c983c06ccc26752ceb2f047f12ffc0d518e.tar.xz wireguard-openbsd-58162c983c06ccc26752ceb2f047f12ffc0d518e.zip | |
Add AEAD as a "MAC alias" so that it is possible to identify/select ciphers
that use AEAD instead of a MAC. This allows for TLSv1.2 AEAD ciphers
(effectively the only ciphers that are still considered to be secure) to be
selected using TLSv1.2+AEAD as a cipher string.
ok bcook@ doug@ miod@
Diffstat (limited to 'lib/libssl/src/ssl/ssl_ciph.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_ciph.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/ssl_ciph.c b/lib/libssl/src/ssl/ssl_ciph.c index afc31d78162..ce82c2705cb 100644 --- a/lib/libssl/src/ssl/ssl_ciph.c +++ b/lib/libssl/src/ssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.79 2014/12/14 15:30:50 jsing Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.80 2015/01/26 13:06:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -419,6 +419,10 @@ static const SSL_CIPHER cipher_aliases[] = { /* MAC aliases */ { + .name = SSL_TXT_AEAD, + .algorithm_mac = SSL_AEAD, + }, + { .name = SSL_TXT_MD5, .algorithm_mac = SSL_MD5, }, |