diff options
| author | Peter Wu <lekensteyn@gmail.com> | 2013-10-02 00:14:10 +0200 |
|---|---|---|
| committer | Peter Wu <lekensteyn@gmail.com> | 2013-10-02 00:14:10 +0200 |
| commit | 64df66b0f09d0f9d3a40d31bb2b4936f889c3caf (patch) | |
| tree | e8fdf430d31d56dd16724fca0c60db8c20df8997 /kex-fix | |
| parent | 1927a4fa8d871188842cddde7755f4d34f804dd2 (diff) | |
| download | wireshark-notes-64df66b0f09d0f9d3a40d31bb2b4936f889c3caf.tar.gz | |
Update notes, ssl_get_keyex_alg.txt.diff
The new ssl_get_keyex_alg.txt.diff has been generated with the
following patches applied:
- (unrelated) ssl: Support PSK larger than 16 octets
- Use correct key exchange type for ECDHE ciphers
- (unrelated) ssl: drop unused SIG_ field and constants
- Add more PSK and Camellia ciphers
- Simplify determining key exchange algorithm, more PSK support
Diffstat (limited to 'kex-fix')
| -rw-r--r-- | kex-fix/ssl_get_keyex_alg.txt.diff | 220 |
1 files changed, 122 insertions, 98 deletions
diff --git a/kex-fix/ssl_get_keyex_alg.txt.diff b/kex-fix/ssl_get_keyex_alg.txt.diff index a28b251..275f38a 100644 --- a/kex-fix/ssl_get_keyex_alg.txt.diff +++ b/kex-fix/ssl_get_keyex_alg.txt.diff @@ -25,9 +25,9 @@ 25 KEX_DH 25 KEX_DH 26 KEX_DH 26 KEX_DH 27 KEX_DH 27 KEX_DH -44 KEX_PSK < -45 KEX_DH < -46 KEX_RSA_PSK < +44 KEX_PSK 44 KEX_PSK +45 KEX_DH 45 KEX_DH +46 KEX_RSA_PSK 46 KEX_RSA_PSK 47 KEX_RSA 47 KEX_RSA 48 KEX_DH 48 KEX_DH 49 KEX_DH 49 KEX_DH @@ -72,18 +72,18 @@ 135 KEX_DH 135 KEX_DH 136 KEX_DH 136 KEX_DH 137 KEX_DH 137 KEX_DH -138 KEX_PSK < +138 KEX_PSK 138 KEX_PSK 139 KEX_PSK 139 KEX_PSK 140 KEX_PSK 140 KEX_PSK 141 KEX_PSK 141 KEX_PSK -142 KEX_DH < -143 KEX_DH < -144 KEX_DH < -145 KEX_DH < -146 KEX_RSA_PSK < -147 KEX_RSA_PSK < -148 KEX_RSA_PSK < -149 KEX_RSA_PSK < +142 KEX_DH 142 KEX_DH +143 KEX_DH 143 KEX_DH +144 KEX_DH 144 KEX_DH +145 KEX_DH 145 KEX_DH +146 KEX_RSA_PSK 146 KEX_RSA_PSK +147 KEX_RSA_PSK 147 KEX_RSA_PSK +148 KEX_RSA_PSK 148 KEX_RSA_PSK +149 KEX_RSA_PSK 149 KEX_RSA_PSK 150 KEX_RSA 150 KEX_RSA 151 KEX_DH 151 KEX_DH 152 KEX_DH 152 KEX_DH @@ -102,24 +102,24 @@ 165 KEX_DH 165 KEX_DH 166 KEX_DH 166 KEX_DH 167 KEX_DH 167 KEX_DH -168 KEX_PSK < -169 KEX_PSK < -170 KEX_DH < -171 KEX_DH < -172 KEX_RSA_PSK < -173 KEX_RSA_PSK < -174 KEX_PSK < -175 KEX_PSK < -176 KEX_PSK < -177 KEX_PSK < -178 KEX_DH < -179 KEX_DH < -180 KEX_DH < -181 KEX_DH < -182 KEX_RSA_PSK < -183 KEX_RSA_PSK < -184 KEX_RSA_PSK < -185 KEX_RSA_PSK < +168 KEX_PSK 168 KEX_PSK +169 KEX_PSK 169 KEX_PSK +170 KEX_DH 170 KEX_DH +171 KEX_DH 171 KEX_DH +172 KEX_RSA_PSK 172 KEX_RSA_PSK +173 KEX_RSA_PSK 173 KEX_RSA_PSK +174 KEX_PSK 174 KEX_PSK +175 KEX_PSK 175 KEX_PSK +176 KEX_PSK 176 KEX_PSK +177 KEX_PSK 177 KEX_PSK +178 KEX_DH 178 KEX_DH +179 KEX_DH 179 KEX_DH +180 KEX_DH 180 KEX_DH +181 KEX_DH 181 KEX_DH +182 KEX_RSA_PSK 182 KEX_RSA_PSK +183 KEX_RSA_PSK 183 KEX_RSA_PSK +184 KEX_RSA_PSK 184 KEX_RSA_PSK +185 KEX_RSA_PSK 185 KEX_RSA_PSK 186 KEX_RSA 186 KEX_RSA 187 KEX_DH 187 KEX_DH 188 KEX_DH 188 KEX_DH @@ -132,74 +132,98 @@ 195 KEX_DH 195 KEX_DH 196 KEX_DH 196 KEX_DH 197 KEX_DH 197 KEX_DH -49153 KEX_ECDH | 49153 KEX_DH -49154 KEX_ECDH | 49154 KEX_DH -49155 KEX_ECDH | 49155 KEX_DH -49156 KEX_ECDH | 49156 KEX_DH -49157 KEX_ECDH | 49157 KEX_DH -49158 KEX_ECDH | 49158 KEX_DH -49159 KEX_ECDH | 49159 KEX_DH -49160 KEX_ECDH | 49160 KEX_DH -49161 KEX_ECDH | 49161 KEX_DH -49162 KEX_ECDH | 49162 KEX_DH -49163 KEX_ECDH | 49163 KEX_DH -49164 KEX_ECDH | 49164 KEX_DH -49165 KEX_ECDH | 49165 KEX_DH -49166 KEX_ECDH | 49166 KEX_DH -49167 KEX_ECDH | 49167 KEX_DH -49168 KEX_ECDH | 49168 KEX_DH -49169 KEX_ECDH | 49169 KEX_DH -49170 KEX_ECDH | 49170 KEX_DH -49171 KEX_ECDH | 49171 KEX_DH -49172 KEX_ECDH | 49172 KEX_DH -49173 KEX_ECDH | 49173 KEX_DH -49174 KEX_ECDH | 49174 KEX_DH -49175 KEX_ECDH | 49175 KEX_DH -49176 KEX_ECDH | 49176 KEX_DH -49177 KEX_ECDH | 49177 KEX_DH -49187 KEX_ECDH | 49187 KEX_DH -49188 KEX_ECDH | 49188 KEX_DH -49189 KEX_ECDH | 49189 KEX_DH -49190 KEX_ECDH | 49190 KEX_DH -49191 KEX_ECDH | 49191 KEX_DH -49192 KEX_ECDH | 49192 KEX_DH -49193 KEX_ECDH | 49193 KEX_DH -49194 KEX_ECDH | 49194 KEX_DH -49195 KEX_ECDH | 49195 KEX_DH -49196 KEX_ECDH | 49196 KEX_DH -49197 KEX_ECDH | 49197 KEX_DH -49198 KEX_ECDH | 49198 KEX_DH -49199 KEX_ECDH | 49199 KEX_DH -49200 KEX_ECDH | 49200 KEX_DH -49201 KEX_ECDH | 49201 KEX_DH -49202 KEX_ECDH | 49202 KEX_DH -49203 KEX_ECDH < -49204 KEX_ECDH < -49205 KEX_ECDH < -49206 KEX_ECDH < -49207 KEX_ECDH < -49208 KEX_ECDH < -49209 KEX_ECDH < -49210 KEX_ECDH < -49211 KEX_ECDH < -49252 KEX_PSK < -49253 KEX_PSK < -49256 KEX_RSA_PSK < -49257 KEX_RSA_PSK < -49258 KEX_PSK < -49259 KEX_PSK < -49262 KEX_RSA_PSK < -49263 KEX_RSA_PSK < -49294 KEX_PSK < -49295 KEX_PSK < -49298 KEX_RSA_PSK < -49299 KEX_RSA_PSK < -49300 KEX_PSK < -49301 KEX_PSK < -49304 KEX_RSA_PSK < -49305 KEX_RSA_PSK < -49316 KEX_PSK < -49317 KEX_PSK < +49153 KEX_ECDH 49153 KEX_ECDH +49154 KEX_ECDH 49154 KEX_ECDH +49155 KEX_ECDH 49155 KEX_ECDH +49156 KEX_ECDH 49156 KEX_ECDH +49157 KEX_ECDH 49157 KEX_ECDH +49158 KEX_ECDH 49158 KEX_ECDH +49159 KEX_ECDH 49159 KEX_ECDH +49160 KEX_ECDH 49160 KEX_ECDH +49161 KEX_ECDH 49161 KEX_ECDH +49162 KEX_ECDH 49162 KEX_ECDH +49163 KEX_ECDH 49163 KEX_ECDH +49164 KEX_ECDH 49164 KEX_ECDH +49165 KEX_ECDH 49165 KEX_ECDH +49166 KEX_ECDH 49166 KEX_ECDH +49167 KEX_ECDH 49167 KEX_ECDH +49168 KEX_ECDH 49168 KEX_ECDH +49169 KEX_ECDH 49169 KEX_ECDH +49170 KEX_ECDH 49170 KEX_ECDH +49171 KEX_ECDH 49171 KEX_ECDH +49172 KEX_ECDH 49172 KEX_ECDH +49173 KEX_ECDH 49173 KEX_ECDH +49174 KEX_ECDH 49174 KEX_ECDH +49175 KEX_ECDH 49175 KEX_ECDH +49176 KEX_ECDH 49176 KEX_ECDH +49177 KEX_ECDH 49177 KEX_ECDH +49187 KEX_ECDH 49187 KEX_ECDH +49188 KEX_ECDH 49188 KEX_ECDH +49189 KEX_ECDH 49189 KEX_ECDH +49190 KEX_ECDH 49190 KEX_ECDH +49191 KEX_ECDH 49191 KEX_ECDH +49192 KEX_ECDH 49192 KEX_ECDH +49193 KEX_ECDH 49193 KEX_ECDH +49194 KEX_ECDH 49194 KEX_ECDH +49195 KEX_ECDH 49195 KEX_ECDH +49196 KEX_ECDH 49196 KEX_ECDH +49197 KEX_ECDH 49197 KEX_ECDH +49198 KEX_ECDH 49198 KEX_ECDH +49199 KEX_ECDH 49199 KEX_ECDH +49200 KEX_ECDH 49200 KEX_ECDH +49201 KEX_ECDH 49201 KEX_ECDH +49202 KEX_ECDH 49202 KEX_ECDH +49203 KEX_ECDH 49203 KEX_ECDH +49204 KEX_ECDH 49204 KEX_ECDH +49205 KEX_ECDH 49205 KEX_ECDH +49206 KEX_ECDH 49206 KEX_ECDH +49207 KEX_ECDH 49207 KEX_ECDH +49208 KEX_ECDH 49208 KEX_ECDH +49209 KEX_ECDH 49209 KEX_ECDH +49210 KEX_ECDH 49210 KEX_ECDH +49211 KEX_ECDH 49211 KEX_ECDH +49252 KEX_PSK | 49266 KEX_ECDH +49253 KEX_PSK | 49267 KEX_ECDH +49256 KEX_RSA_PSK | 49268 KEX_ECDH +49257 KEX_RSA_PSK | 49269 KEX_ECDH +49258 KEX_PSK | 49270 KEX_ECDH +49259 KEX_PSK | 49271 KEX_ECDH +49262 KEX_RSA_PSK | 49272 KEX_ECDH +49263 KEX_RSA_PSK | 49273 KEX_ECDH + > 49274 KEX_RSA + > 49275 KEX_RSA + > 49276 KEX_DH + > 49277 KEX_DH + > 49278 KEX_DH + > 49279 KEX_DH + > 49280 KEX_DH + > 49281 KEX_DH + > 49282 KEX_DH + > 49283 KEX_DH + > 49284 KEX_DH + > 49285 KEX_DH + > 49286 KEX_ECDH + > 49287 KEX_ECDH + > 49288 KEX_ECDH + > 49289 KEX_ECDH + > 49290 KEX_ECDH + > 49291 KEX_ECDH + > 49292 KEX_ECDH + > 49293 KEX_ECDH +49294 KEX_PSK 49294 KEX_PSK +49295 KEX_PSK 49295 KEX_PSK + > 49296 KEX_DH + > 49297 KEX_DH +49298 KEX_RSA_PSK 49298 KEX_RSA_PSK +49299 KEX_RSA_PSK 49299 KEX_RSA_PSK +49300 KEX_PSK 49300 KEX_PSK +49301 KEX_PSK 49301 KEX_PSK + > 49302 KEX_DH + > 49303 KEX_DH +49304 KEX_RSA_PSK 49304 KEX_RSA_PSK +49305 KEX_RSA_PSK 49305 KEX_RSA_PSK +49316 KEX_PSK | 49306 KEX_ECDH +49317 KEX_PSK | 49307 KEX_ECDH 49320 KEX_PSK < 49321 KEX_PSK < 49322 KEX_PSK < |