diff options
author | jsing <> | 2014-06-13 13:28:53 +0000 |
---|---|---|
committer | jsing <> | 2014-06-13 13:28:53 +0000 |
commit | 1b457449c180438027e5a01bd91548b9c39cdcb5 (patch) | |
tree | 438ba40d37fa8918a8cbfba204604048af3118cc /src/lib/libssl/ssl.h | |
parent | f783149b42dde459053d469f10461a7db0238550 (diff) | |
download | openbsd-1b457449c180438027e5a01bd91548b9c39cdcb5.tar.gz openbsd-1b457449c180438027e5a01bd91548b9c39cdcb5.tar.bz2 openbsd-1b457449c180438027e5a01bd91548b9c39cdcb5.zip |
Add ChaCha20-Poly1305 based ciphersuites.
Based on Adam Langley's chromium patches.
Tested by and ok sthen@
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 1a2bdf7628..3e09bd3521 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.55 2014/06/13 11:52:03 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.56 2014/06/13 13:28:53 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 | * |
@@ -289,6 +289,7 @@ extern "C" { | |||
289 | #define SSL_TXT_CAMELLIA128 "CAMELLIA128" | 289 | #define SSL_TXT_CAMELLIA128 "CAMELLIA128" |
290 | #define SSL_TXT_CAMELLIA256 "CAMELLIA256" | 290 | #define SSL_TXT_CAMELLIA256 "CAMELLIA256" |
291 | #define SSL_TXT_CAMELLIA "CAMELLIA" | 291 | #define SSL_TXT_CAMELLIA "CAMELLIA" |
292 | #define SSL_TXT_CHACHA20 "CHACHA20" | ||
292 | 293 | ||
293 | #define SSL_TXT_MD5 "MD5" | 294 | #define SSL_TXT_MD5 "MD5" |
294 | #define SSL_TXT_SHA1 "SHA1" | 295 | #define SSL_TXT_SHA1 "SHA1" |