Attachment 920943 Details for Bug 1123304 – Proposed patch

[patch] Proposed patch

EDHvsDHE.patch (text/plain), 2.05 KB, created by Radim Hatlapatka on 2014-07-25 09:51:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Hatlapatka

Created: 2014-07-25 09:51:30 UTC

Size: 2.05 KB

patch

obsolete

>Index: src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java
>===================================================================
>--- src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java	(revision 2482)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java	(working copy)
>@@ -222,7 +222,7 @@
>             168),
>     /* The Ephemeral DH ciphers */
>     // Cipher 11
>-    SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA("EXP-EDH-DSS-DES-CBC-SHA",
>+    SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA("EXP-DHE-DSS-DES-CBC-SHA",
>             KeyExchange.EDH,
>             Authentication.DSS,
>             Encryption.DES,
>@@ -234,7 +234,7 @@
>             40,
>             56),
>     // Cipher 12
>-    SSL_DHE_DSS_WITH_DES_CBC_SHA("EDH-DSS-DES-CBC-SHA",
>+    SSL_DHE_DSS_WITH_DES_CBC_SHA("DHE-DSS-DES-CBC-SHA",
>             KeyExchange.EDH,
>             Authentication.DSS,
>             Encryption.DES,
>@@ -246,7 +246,7 @@
>             56,
>             56),
>     // Cipher 13
>-    SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA("EDH-DSS-DES-CBC3-SHA",
>+    SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA("DHE-DSS-DES-CBC3-SHA",
>             KeyExchange.EDH,
>             Authentication.DSS,
>             Encryption.TRIPLE_DES,
>@@ -258,7 +258,7 @@
>             168,
>             168),
>     // Cipher 14
>-    TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA("EXP-EDH-RSA-DES-CBC-SHA",
>+    TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA("EXP-DHE-RSA-DES-CBC-SHA",
>             KeyExchange.EDH,
>             Authentication.RSA,
>             Encryption.DES,
>@@ -270,7 +270,7 @@
>             40,
>             56),
>     // Cipher 15
>-    TLS_DHE_RSA_WITH_DES_CBC_SHA("EDH-RSA-DES-CBC-SHA",
>+    TLS_DHE_RSA_WITH_DES_CBC_SHA("DHE-RSA-DES-CBC-SHA",
>             KeyExchange.EDH,
>             Authentication.RSA,
>             Encryption.DES,
>@@ -282,7 +282,7 @@
>             56,
>             56),
>     // Cipher 16
>-    TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA("EDH-RSA-DES-CBC3-SHA",
>+    TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA("DHE-RSA-DES-CBC3-SHA",
>             KeyExchange.EDH,
>             Authentication.RSA,
>             Encryption.TRIPLE_DES,

Flags:

rhatlapa: review? (ehugonne)

Actions: View | Diff

Attachments on bug 1123304: 920943