[ipfire-3.x.git] / openssl / patches / openssl-1.0.1g-3des-strength.patch

diff -up openssl-1.0.1g/ssl/s2_lib.c.3des-strength openssl-1.0.1g/ssl/s2_lib.c
--- openssl-1.0.1g/ssl/s2_lib.c.3des-strength	2014-03-17 17:14:20.000000000 +0100
+++ openssl-1.0.1g/ssl/s2_lib.c	2014-05-06 16:33:45.646358418 +0200
@@ -250,7 +250,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_cip
 	SSL_SSLV2,
 	SSL_NOT_EXP|SSL_HIGH,
 	0,
-	168,
+	128,
 	168,
 	},
 
diff -up openssl-1.0.1g/ssl/s3_lib.c.3des-strength openssl-1.0.1g/ssl/s3_lib.c
--- openssl-1.0.1g/ssl/s3_lib.c.3des-strength	2014-03-17 17:14:20.000000000 +0100
+++ openssl-1.0.1g/ssl/s3_lib.c	2014-05-06 16:38:05.887374872 +0200
@@ -328,7 +328,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -377,7 +377,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -425,7 +425,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -474,7 +474,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -522,7 +522,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -602,7 +602,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -687,7 +687,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -751,7 +751,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -1685,7 +1685,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2062,7 +2062,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2142,7 +2142,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2222,7 +2222,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2302,7 +2302,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2382,7 +2382,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2432,7 +2432,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2448,7 +2448,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
 
@@ -2464,7 +2464,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	128,
 	168,
 	},
Commit	Line	Data
3c4cf2d0 MT	1	diff -up openssl-1.0.1g/ssl/s2_lib.c.3des-strength openssl-1.0.1g/ssl/s2_lib.c
	2	--- openssl-1.0.1g/ssl/s2_lib.c.3des-strength 2014-03-17 17:14:20.000000000 +0100
	3	+++ openssl-1.0.1g/ssl/s2_lib.c 2014-05-06 16:33:45.646358418 +0200
	4	@@ -250,7 +250,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_cip
	5	SSL_SSLV2,
	6	SSL_NOT_EXP\|SSL_HIGH,
	7	0,
	8	- 168,
	9	+ 128,
	10	168,
	11	},
	12
	13	diff -up openssl-1.0.1g/ssl/s3_lib.c.3des-strength openssl-1.0.1g/ssl/s3_lib.c
	14	--- openssl-1.0.1g/ssl/s3_lib.c.3des-strength 2014-03-17 17:14:20.000000000 +0100
	15	+++ openssl-1.0.1g/ssl/s3_lib.c 2014-05-06 16:38:05.887374872 +0200
	16	@@ -328,7 +328,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
	17	SSL_SSLV3,
	18	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
	19	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
	20	- 168,
	21	+ 128,
	22	168,
	23	},
	24
	25	@@ -377,7 +377,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
	26	SSL_SSLV3,
	27	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
	28	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
	29	- 168,
	30	+ 128,
	31	168,
	32	},
	33
	34	@@ -425,7 +425,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
	35	SSL_SSLV3,
	36	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
	37	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
	38	- 168,
	39	+ 128,
	40	168,
	41	},
	42
	43	@@ -474,7 +474,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
	44	SSL_SSLV3,
	45	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
	46	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
	47	- 168,
	48	+ 128,
	49	168,
	50	},
	51
	52	@@ -522,7 +522,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
	53	SSL_SSLV3,
	54	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
	55	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
	56	- 168,
	57	+ 128,
	58	168,
	59	},
	60
	61	@@ -602,7 +602,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
	62	SSL_SSLV3,
	63	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
	64	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
65	- 168,
66	+ 128,
67	168,
68	},
69
70	@@ -687,7 +687,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
71	SSL_SSLV3,
72	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
73	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
74	- 168,
75	+ 128,
76	168,
77	},
78
79	@@ -751,7 +751,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
80	SSL_SSLV3,
81	SSL_NOT_EXP\|SSL_HIGH,
82	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
83	- 168,
84	+ 128,
85	168,
86	},
87
88	@@ -1685,7 +1685,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
89	SSL_TLSV1,
90	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
91	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
92	- 168,
93	+ 128,
94	168,
95	},
96
97	@@ -2062,7 +2062,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
98	SSL_TLSV1,
99	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
100	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
101	- 168,
102	+ 128,
103	168,
104	},
105
106	@@ -2142,7 +2142,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
107	SSL_TLSV1,
108	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
109	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
110	- 168,
111	+ 128,
112	168,
113	},
114
115	@@ -2222,7 +2222,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
116	SSL_TLSV1,
117	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
118	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
119	- 168,
120	+ 128,
121	168,
122	},
123
124	@@ -2302,7 +2302,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
125	SSL_TLSV1,
126	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
127	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
128	- 168,
129	+ 128,
130	168,
131	},
132
133	@@ -2382,7 +2382,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
134	SSL_TLSV1,
135	SSL_NOT_EXP\|SSL_HIGH\|SSL_FIPS,
136	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
137	- 168,
138	+ 128,
139	168,
140	},
141
142	@@ -2432,7 +2432,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
143	SSL_TLSV1,
144	SSL_NOT_EXP\|SSL_HIGH,
145	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
146	- 168,
147	+ 128,
148	168,
149	},
150
151	@@ -2448,7 +2448,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
152	SSL_TLSV1,
153	SSL_NOT_EXP\|SSL_HIGH,
154	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
155	- 168,
156	+ 128,
157	168,
158	},
159
160	@@ -2464,7 +2464,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
161	SSL_TLSV1,
162	SSL_NOT_EXP\|SSL_HIGH,
163	SSL_HANDSHAKE_MAC_DEFAULT\|TLS1_PRF,
164	- 168,
165	+ 128,
166	168,
167	},
168