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_locl.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_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index ea5f8c3d4e..6ce2e17a15 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.50 2014/06/13 10:52:24 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.51 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 | * |
@@ -296,6 +296,7 @@ | |||
296 | #define SSL_SEED 0x00000800L | 296 | #define SSL_SEED 0x00000800L |
297 | #define SSL_AES128GCM 0x00001000L | 297 | #define SSL_AES128GCM 0x00001000L |
298 | #define SSL_AES256GCM 0x00002000L | 298 | #define SSL_AES256GCM 0x00002000L |
299 | #define SSL_CHACHA20POLY1305 0x00004000L | ||
299 | 300 | ||
300 | #define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM) | 301 | #define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM) |
301 | #define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) | 302 | #define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) |