diff options
author | jsing <> | 2015-01-26 13:06:39 +0000 |
---|---|---|
committer | jsing <> | 2015-01-26 13:06:39 +0000 |
commit | e23e84e71c85db5dd37817db7f71dc7a202bc74d (patch) | |
tree | 55223ef44f1c40cb3c640481670b74a12ab5802f /src/lib/libssl/ssl.h | |
parent | e7b94f3e0e803b7bea11d0c8a568dafe4a462f3b (diff) | |
download | openbsd-e23e84e71c85db5dd37817db7f71dc7a202bc74d.tar.gz openbsd-e23e84e71c85db5dd37817db7f71dc7a202bc74d.tar.bz2 openbsd-e23e84e71c85db5dd37817db7f71dc7a202bc74d.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 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 56344085ad..59ae1b5244 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.77 2015/01/22 09:12:57 reyk Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.78 2015/01/26 13:06:39 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 | * |
@@ -290,6 +290,7 @@ extern "C" { | |||
290 | #define SSL_TXT_CAMELLIA "CAMELLIA" | 290 | #define SSL_TXT_CAMELLIA "CAMELLIA" |
291 | #define SSL_TXT_CHACHA20 "CHACHA20" | 291 | #define SSL_TXT_CHACHA20 "CHACHA20" |
292 | 292 | ||
293 | #define SSL_TXT_AEAD "AEAD" | ||
293 | #define SSL_TXT_MD5 "MD5" | 294 | #define SSL_TXT_MD5 "MD5" |
294 | #define SSL_TXT_SHA1 "SHA1" | 295 | #define SSL_TXT_SHA1 "SHA1" |
295 | #define SSL_TXT_SHA "SHA" /* same as "SHA1" */ | 296 | #define SSL_TXT_SHA "SHA" /* same as "SHA1" */ |