diff options
| author | jsing <> | 2017-08-28 16:37:04 +0000 |
|---|---|---|
| committer | jsing <> | 2017-08-28 16:37:04 +0000 |
| commit | 06777404d5d3c9d777364d633ff082f434d357d5 (patch) | |
| tree | 7a497786c0d665cfdd18ae5f1a51814d2866dc5d /src/lib/libssl/tls1.h | |
| parent | 25258122ceacc0befc2dd3c6150cc89fd6c00a7a (diff) | |
| download | openbsd-06777404d5d3c9d777364d633ff082f434d357d5.tar.gz openbsd-06777404d5d3c9d777364d633ff082f434d357d5.tar.bz2 openbsd-06777404d5d3c9d777364d633ff082f434d357d5.zip | |
Remove the original (pre-IETF) chacha20-poly1305 cipher suites.
Support for the IETF standardised chacha20-poly1305 cipher suites was
added 16 months ago, which means they exist in both of the currently
supported OpenBSD releases.
Also prompted by Andreas Bartelt <obsd at bartula dot de>.
ok beck@ doug@
Diffstat (limited to 'src/lib/libssl/tls1.h')
| -rw-r--r-- | src/lib/libssl/tls1.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index d06a1969b1..3cf778020b 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls1.h,v 1.29 2017/03/25 14:15:11 jsing Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.30 2017/08/28 16:37:04 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 | * |
| @@ -534,9 +534,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | |||
| 534 | #define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384 0x0300C032 | 534 | #define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384 0x0300C032 |
| 535 | 535 | ||
| 536 | /* ChaCha20-Poly1305 based ciphersuites. */ | 536 | /* ChaCha20-Poly1305 based ciphersuites. */ |
| 537 | #define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD 0x0300CC13 | ||
| 538 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD 0x0300CC14 | ||
| 539 | #define TLS1_CK_DHE_RSA_CHACHA20_POLY1305_OLD 0x0300CC15 | ||
| 540 | #define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 0x0300CCA8 | 537 | #define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 0x0300CCA8 |
| 541 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CCA9 | 538 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CCA9 |
| 542 | #define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CCAA | 539 | #define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CCAA |
| @@ -701,9 +698,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | |||
| 701 | #define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384 "ECDH-RSA-AES256-GCM-SHA384" | 698 | #define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384 "ECDH-RSA-AES256-GCM-SHA384" |
| 702 | 699 | ||
| 703 | /* ChaCha20-Poly1305 based ciphersuites. */ | 700 | /* ChaCha20-Poly1305 based ciphersuites. */ |
| 704 | #define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305_OLD "ECDHE-RSA-CHACHA20-POLY1305-OLD" | ||
| 705 | #define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_OLD "ECDHE-ECDSA-CHACHA20-POLY1305-OLD" | ||
| 706 | #define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305_OLD "DHE-RSA-CHACHA20-POLY1305-OLD" | ||
| 707 | #define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 "ECDHE-RSA-CHACHA20-POLY1305" | 701 | #define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 "ECDHE-RSA-CHACHA20-POLY1305" |
| 708 | #define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 "ECDHE-ECDSA-CHACHA20-POLY1305" | 702 | #define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 "ECDHE-ECDSA-CHACHA20-POLY1305" |
| 709 | #define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 "DHE-RSA-CHACHA20-POLY1305" | 703 | #define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 "DHE-RSA-CHACHA20-POLY1305" |