diff options
| author | jsing <> | 2014-10-31 15:50:28 +0000 |
|---|---|---|
| committer | jsing <> | 2014-10-31 15:50:28 +0000 |
| commit | fbf2d5ae478bbe5fc0e18dba9ae3d1a2496e7f14 (patch) | |
| tree | f6b25afb9a906f3d7228c2a5eb2c7107fc403ef5 /src | |
| parent | 8770b76cb61f86302f143b5be9680a006ee34f3b (diff) | |
| download | openbsd-fbf2d5ae478bbe5fc0e18dba9ae3d1a2496e7f14.tar.gz openbsd-fbf2d5ae478bbe5fc0e18dba9ae3d1a2496e7f14.tar.bz2 openbsd-fbf2d5ae478bbe5fc0e18dba9ae3d1a2496e7f14.zip | |
Remove an outdated comment re EDH vs DHE - DHE is now used consistently and
there are backwards compatible names/aliases for EDH.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/ssl/tls1.h | 9 | ||||
| -rw-r--r-- | src/lib/libssl/tls1.h | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/lib/libssl/src/ssl/tls1.h b/src/lib/libssl/src/ssl/tls1.h index 97041267e9..d2d1657edf 100644 --- a/src/lib/libssl/src/ssl/tls1.h +++ b/src/lib/libssl/src/ssl/tls1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls1.h,v 1.20 2014/10/31 15:49:18 jsing Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.21 2014/10/31 15:50:28 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 | * |
| @@ -511,13 +511,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | |||
| 511 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CC14 | 511 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CC14 |
| 512 | #define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CC15 | 512 | #define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CC15 |
| 513 | 513 | ||
| 514 | /* XXX | ||
| 515 | * Inconsistency alert: | ||
| 516 | * The OpenSSL names of ciphers with ephemeral DH here include the string | ||
| 517 | * "DHE", while elsewhere it has always been "EDH". | ||
| 518 | * (The alias for the list of all such ciphers also is "EDH".) | ||
| 519 | * The specifications speak of "EDH"; maybe we should allow both forms | ||
| 520 | * for everything. */ | ||
| 521 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5" | 514 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5" |
| 522 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5" | 515 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5" |
| 523 | #define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA" | 516 | #define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA" |
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 97041267e9..d2d1657edf 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls1.h,v 1.20 2014/10/31 15:49:18 jsing Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.21 2014/10/31 15:50:28 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 | * |
| @@ -511,13 +511,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | |||
| 511 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CC14 | 511 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CC14 |
| 512 | #define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CC15 | 512 | #define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CC15 |
| 513 | 513 | ||
| 514 | /* XXX | ||
| 515 | * Inconsistency alert: | ||
| 516 | * The OpenSSL names of ciphers with ephemeral DH here include the string | ||
| 517 | * "DHE", while elsewhere it has always been "EDH". | ||
| 518 | * (The alias for the list of all such ciphers also is "EDH".) | ||
| 519 | * The specifications speak of "EDH"; maybe we should allow both forms | ||
| 520 | * for everything. */ | ||
| 521 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5" | 514 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5" |
| 522 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5" | 515 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5" |
| 523 | #define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA" | 516 | #define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA" |