]>
Commit | Line | Data |
---|---|---|
fd324c6e MB |
1 | |
2 | ||
3 | ||
4 | ||
5 | diff -ruN ssldump-0.9b3.orig/ssl/ciphersuites.c ssl/ciphersuites.c | |
6 | --- ssldump-0.9b3.orig/ssl/ciphersuites.c 2002-08-16 19:33:17.000000000 -0600 | |
7 | +++ ssldump-0.9b3/ssl/ciphersuites.c 2003-04-25 11:30:44.000000000 -0600 | |
8 | @@ -78,10 +78,25 @@ | |
9 | {25,KEX_DH,SIG_NONE,ENC_DES,8,64,40,DIG_MD5,16,1}, | |
10 | {26,KEX_DH,SIG_NONE,ENC_DES,8,64,64,DIG_MD5,16,0}, | |
11 | {27,KEX_DH,SIG_NONE,ENC_3DES,8,192,192,DIG_MD5,16,0}, | |
12 | + | |
13 | + {47,KEX_RSA,SIG_RSA,ENC_AES128,16,128,128,DIG_SHA,20,0}, | |
14 | + {48,KEX_DH,SIG_DSS,ENC_AES128,16,128,128,DIG_SHA,20,0}, | |
15 | + {49,KEX_DH,SIG_RSA,ENC_AES128,16,128,128,DIG_SHA,20,0}, | |
16 | + {50,KEX_DH,SIG_DSS,ENC_AES128,16,128,128,DIG_SHA,20,0}, | |
17 | + {51,KEX_DH,SIG_RSA,ENC_AES128,16,128,128,DIG_SHA,20,0}, | |
18 | + {52,KEX_DH,SIG_NONE,ENC_AES128,16,128,128,DIG_SHA,20,0}, | |
19 | + | |
20 | + {53,KEX_RSA,SIG_RSA,ENC_AES256,16,256,256,DIG_SHA,20,0}, | |
21 | + {54,KEX_DH,SIG_DSS,ENC_AES256,16,256,256,DIG_SHA,20,0}, | |
22 | + {55,KEX_DH,SIG_RSA,ENC_AES256,16,256,256,DIG_SHA,20,0}, | |
23 | + {56,KEX_DH,SIG_DSS,ENC_AES256,16,256,256,DIG_SHA,20,0}, | |
24 | + {57,KEX_DH,SIG_RSA,ENC_AES256,16,256,256,DIG_SHA,20,0}, | |
25 | + {58,KEX_DH,SIG_NONE,ENC_AES256,16,256,256,DIG_SHA,20,0}, | |
26 | + | |
27 | {96,KEX_RSA,SIG_RSA,ENC_RC4,1,128,56,DIG_MD5,16,1}, | |
28 | {97,KEX_RSA,SIG_RSA,ENC_RC2,1,128,56,DIG_MD5,16,1}, | |
29 | {98,KEX_RSA,SIG_RSA,ENC_DES,8,64,64,DIG_SHA,20,1}, | |
30 | - {99,KEX_DH,SIG_DSS,ENC_DES,8,64,64,DIG_SHA,16,1}, | |
31 | + {99,KEX_DH,SIG_DSS,ENC_DES,8,64,64,DIG_SHA,20,1}, | |
32 | {100,KEX_RSA,SIG_RSA,ENC_RC4,1,128,56,DIG_SHA,20,1}, | |
33 | {101,KEX_DH,SIG_DSS,ENC_RC4,1,128,56,DIG_SHA,20,1}, | |
34 | {102,KEX_DH,SIG_DSS,ENC_RC4,1,128,128,DIG_SHA,20,0}, | |
35 | diff -ruN ssldump-0.9b3.orig/ssl/sslciphers.h ssldump-0.9b3/ssl/sslciphers.h | |
36 | --- ssldump-0.9b3.orig/ssl/sslciphers.h 2002-08-16 19:33:17.000000000 -0600 | |
37 | +++ ssldump-0.9b3/ssl/sslciphers.h 2003-04-25 11:30:46.000000000 -0600 | |
38 | @@ -71,7 +71,9 @@ | |
39 | #define ENC_RC4 0x32 | |
40 | #define ENC_RC2 0x33 | |
41 | #define ENC_IDEA 0x34 | |
42 | -#define ENC_NULL 0x35 | |
43 | +#define ENC_AES128 0x35 | |
44 | +#define ENC_AES256 0x36 | |
45 | +#define ENC_NULL 0x37 | |
46 | ||
47 | #define DIG_MD5 0x40 | |
48 | #define DIG_SHA 0x41 | |
49 | diff -ruN ssldump-0.9b3.orig/ssl/ssl.enums ssldump-0.9b3/ssl/ssl.enums | |
50 | --- ssldump-0.9b3.orig/ssl/ssl.enums 2001-07-20 10:44:32.000000000 -0600 | |
51 | +++ ssldump-0.9b3/ssl/ssl.enums 2003-04-25 11:30:45.000000000 -0600 | |
52 | @@ -356,6 +356,18 @@ | |
53 | CipherSuite TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA = { 0x00,0x19 }; | |
54 | CipherSuite TLS_DH_anon_WITH_DES_CBC_SHA = { 0x00,0x1A }; | |
55 | CipherSuite TLS_DH_anon_WITH_3DES_EDE_CBC_SHA = { 0x00,0x1B }; | |
56 | + CipherSuite TLS_RSA_WITH_AES_128_CBC_SHA = { 0x00,0x2F }; | |
57 | + CipherSuite TLS_DH_DSS_WITH_AES_128_CBC_SHA = { 0x00,0x30 }; | |
58 | + CipherSuite TLS_DH_RSA_WITH_AES_128_CBC_SHA = { 0x00,0x31 }; | |
59 | + CipherSuite TLS_DHE_DSS_WITH_AES_128_CBC_SHA = { 0x00,0x32 }; | |
60 | + CipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA = { 0x00,0x33 }; | |
61 | + CipherSuite TLS_DH_anon_WITH_AES_128_CBC_SHA = { 0x00,0x34 }; | |
62 | + CipherSuite TLS_RSA_WITH_AES_256_CBC_SHA = { 0x00,0x35 }; | |
63 | + CipherSuite TLS_DH_DSS_WITH_AES_256_CBC_SHA = { 0x00,0x36 }; | |
64 | + CipherSuite TLS_DH_RSA_WITH_AES_256_CBC_SHA = { 0x00,0x37 }; | |
65 | + CipherSuite TLS_DHE_DSS_WITH_AES_256_CBC_SHA = { 0x00,0x38 }; | |
66 | + CipherSuite TLS_DHE_RSA_WITH_AES_256_CBC_SHA = { 0x00,0x39 }; | |
67 | + CipherSuite TLS_DH_anon_WITH_AES_256_CBC_SHA = { 0x00,0x3A }; | |
68 | CipherSuite TLS_RSA_EXPORT1024_WITH_RC4_56_MD5 = { 0x00,0x60 }; | |
69 | CipherSuite TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 = { 0x00,0x61 }; | |
70 | CipherSuite TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA = { 0x00,0x62 }; | |
71 | diff -ruN ssldump-0.9b3.orig/ssl/ssl.enums.c ssldump-0.9b3/ssl/ssl.enums.c | |
72 | --- ssldump-0.9b3.orig/ssl/ssl.enums.c 2001-07-20 10:44:36.000000000 -0600 | |
73 | +++ ssldump-0.9b3/ssl/ssl.enums.c 2003-04-25 11:30:45.000000000 -0600 | |
74 | @@ -611,6 +611,54 @@ | |
75 | "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA", | |
76 | 0 }, | |
77 | { | |
78 | + 47, | |
79 | + "TLS_RSA_WITH_AES_128_CBC_SHA", | |
80 | + 0 }, | |
81 | + { | |
82 | + 48, | |
83 | + "TLS_DH_DSS_WITH_AES_128_CBC_SHA", | |
84 | + 0 }, | |
85 | + { | |
86 | + 49, | |
87 | + "TLS_DH_RSA_WITH_AES_128_CBC_SHA", | |
88 | + 0 }, | |
89 | + { | |
90 | + 50, | |
91 | + "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", | |
92 | + 0 }, | |
93 | + { | |
94 | + 51, | |
95 | + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", | |
96 | + 0 }, | |
97 | + { | |
98 | + 52, | |
99 | + "TLS_DH_anon_WITH_AES_128_CBC_SHA", | |
100 | + 0 }, | |
101 | + { | |
102 | + 53, | |
103 | + "TLS_RSA_WITH_AES_256_CBC_SHA", | |
104 | + 0 }, | |
105 | + { | |
106 | + 54, | |
107 | + "TLS_DH_DSS_WITH_AES_256_CBC_SHA", | |
108 | + 0 }, | |
109 | + { | |
110 | + 55, | |
111 | + "TLS_DH_RSA_WITH_AES_256_CBC_SHA", | |
112 | + 0 }, | |
113 | + { | |
114 | + 56, | |
115 | + "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", | |
116 | + 0 }, | |
117 | + { | |
118 | + 57, | |
119 | + "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", | |
120 | + 0 }, | |
121 | + { | |
122 | + 58, | |
123 | + "TLS_DH_anon_WITH_AES_256_CBC_SHA", | |
124 | + 0 }, | |
125 | + { | |
126 | 96, | |
127 | "TLS_RSA_EXPORT1024_WITH_RC4_56_MD5", | |
128 | 0 }, | |
129 | diff -ruN ssldump-0.9b3.orig/ssl/ssl_rec.c ssldump-0.9b3/ssl/ssl_rec.c | |
130 | --- ssldump-0.9b3.orig/ssl/ssl_rec.c 2000-11-02 23:38:06.000000000 -0700 | |
131 | +++ ssldump-0.9b3/ssl/ssl_rec.c 2003-04-25 11:30:46.000000000 -0600 | |
132 | @@ -78,7 +78,9 @@ | |
133 | "DES3", | |
134 | "RC4", | |
135 | "RC2", | |
136 | - "IDEA" | |
137 | + "IDEA", | |
138 | + "AES128", | |
139 | + "AES256" | |
140 | }; | |
141 | ||
142 | ||
143 | @@ -101,6 +103,11 @@ | |
144 | /* Find the SSLeay cipher */ | |
145 | if(cs->enc!=ENC_NULL){ | |
146 | ciph=(EVP_CIPHER *)EVP_get_cipherbyname(ciphers[cs->enc-0x30]); | |
147 | + if(!ciph) | |
148 | + ABORT(R_INTERNAL); | |
149 | + } | |
150 | + else { | |
151 | + ciph=EVP_enc_null(); | |
152 | } | |
153 | ||
154 | if(!(dec=(ssl_rec_decoder *)calloc(sizeof(ssl_rec_decoder),1))) | |
155 | @@ -169,7 +176,7 @@ | |
156 | *outl=inl; | |
157 | ||
158 | /* Now strip off the padding*/ | |
159 | - if(d->cs->block!=1){ | |
160 | + if(d->cs->block>1){ | |
161 | pad=out[inl-1]; | |
162 | *outl-=(pad+1); | |
163 | } |