diff options
author | cvs2svn <admin@example.com> | 2009-06-25 14:33:51 +0000 |
---|---|---|
committer | cvs2svn <admin@example.com> | 2009-06-25 14:33:51 +0000 |
commit | 3944e6efcea0baa7128a89353d149b37100c0ece (patch) | |
tree | 64c1ad6d7af88839fd67d630ca81c768fd1191cd /src/lib/libssl/ssl_asn1.c | |
parent | 2eabc3aa42ad7d46a1723621f8e34e533342f67a (diff) | |
download | openbsd-OPENBSD_4_6_BASE.tar.gz openbsd-OPENBSD_4_6_BASE.tar.bz2 openbsd-OPENBSD_4_6_BASE.zip |
This commit was manufactured by cvs2git to create tag 'OPENBSD_4_6_BASE'.OPENBSD_4_6_BASE
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_asn1.c | 500 |
1 files changed, 0 insertions, 500 deletions
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c deleted file mode 100644 index 0f9a3489dd..0000000000 --- a/src/lib/libssl/ssl_asn1.c +++ /dev/null | |||
@@ -1,500 +0,0 @@ | |||
1 | /* ssl/ssl_asn1.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include <stdlib.h> | ||
61 | #include "ssl_locl.h" | ||
62 | #include <openssl/asn1_mac.h> | ||
63 | #include <openssl/objects.h> | ||
64 | #include <openssl/x509.h> | ||
65 | |||
66 | typedef struct ssl_session_asn1_st | ||
67 | { | ||
68 | ASN1_INTEGER version; | ||
69 | ASN1_INTEGER ssl_version; | ||
70 | ASN1_OCTET_STRING cipher; | ||
71 | ASN1_OCTET_STRING master_key; | ||
72 | ASN1_OCTET_STRING session_id; | ||
73 | ASN1_OCTET_STRING session_id_context; | ||
74 | ASN1_OCTET_STRING key_arg; | ||
75 | #ifndef OPENSSL_NO_KRB5 | ||
76 | ASN1_OCTET_STRING krb5_princ; | ||
77 | #endif /* OPENSSL_NO_KRB5 */ | ||
78 | ASN1_INTEGER time; | ||
79 | ASN1_INTEGER timeout; | ||
80 | ASN1_INTEGER verify_result; | ||
81 | #ifndef OPENSSL_NO_TLSEXT | ||
82 | ASN1_OCTET_STRING tlsext_hostname; | ||
83 | ASN1_INTEGER tlsext_tick_lifetime; | ||
84 | ASN1_OCTET_STRING tlsext_tick; | ||
85 | #endif /* OPENSSL_NO_TLSEXT */ | ||
86 | } SSL_SESSION_ASN1; | ||
87 | |||
88 | int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) | ||
89 | { | ||
90 | #define LSIZE2 (sizeof(long)*2) | ||
91 | int v1=0,v2=0,v3=0,v4=0,v5=0; | ||
92 | unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2]; | ||
93 | unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2],ibuf5[LSIZE2]; | ||
94 | #ifndef OPENSSL_NO_TLSEXT | ||
95 | int v6=0,v9=0,v10=0; | ||
96 | unsigned char ibuf6[LSIZE2]; | ||
97 | #endif | ||
98 | long l; | ||
99 | SSL_SESSION_ASN1 a; | ||
100 | M_ASN1_I2D_vars(in); | ||
101 | |||
102 | if ((in == NULL) || ((in->cipher == NULL) && (in->cipher_id == 0))) | ||
103 | return(0); | ||
104 | |||
105 | /* Note that I cheat in the following 2 assignments. I know | ||
106 | * that if the ASN1_INTEGER passed to ASN1_INTEGER_set | ||
107 | * is > sizeof(long)+1, the buffer will not be re-OPENSSL_malloc()ed. | ||
108 | * This is a bit evil but makes things simple, no dynamic allocation | ||
109 | * to clean up :-) */ | ||
110 | a.version.length=LSIZE2; | ||
111 | a.version.type=V_ASN1_INTEGER; | ||
112 | a.version.data=ibuf1; | ||
113 | ASN1_INTEGER_set(&(a.version),SSL_SESSION_ASN1_VERSION); | ||
114 | |||
115 | a.ssl_version.length=LSIZE2; | ||
116 | a.ssl_version.type=V_ASN1_INTEGER; | ||
117 | a.ssl_version.data=ibuf2; | ||
118 | ASN1_INTEGER_set(&(a.ssl_version),in->ssl_version); | ||
119 | |||
120 | a.cipher.type=V_ASN1_OCTET_STRING; | ||
121 | a.cipher.data=buf; | ||
122 | |||
123 | if (in->cipher == NULL) | ||
124 | l=in->cipher_id; | ||
125 | else | ||
126 | l=in->cipher->id; | ||
127 | if (in->ssl_version == SSL2_VERSION) | ||
128 | { | ||
129 | a.cipher.length=3; | ||
130 | buf[0]=((unsigned char)(l>>16L))&0xff; | ||
131 | buf[1]=((unsigned char)(l>> 8L))&0xff; | ||
132 | buf[2]=((unsigned char)(l ))&0xff; | ||
133 | } | ||
134 | else | ||
135 | { | ||
136 | a.cipher.length=2; | ||
137 | buf[0]=((unsigned char)(l>>8L))&0xff; | ||
138 | buf[1]=((unsigned char)(l ))&0xff; | ||
139 | } | ||
140 | |||
141 | a.master_key.length=in->master_key_length; | ||
142 | a.master_key.type=V_ASN1_OCTET_STRING; | ||
143 | a.master_key.data=in->master_key; | ||
144 | |||
145 | a.session_id.length=in->session_id_length; | ||
146 | a.session_id.type=V_ASN1_OCTET_STRING; | ||
147 | a.session_id.data=in->session_id; | ||
148 | |||
149 | a.session_id_context.length=in->sid_ctx_length; | ||
150 | a.session_id_context.type=V_ASN1_OCTET_STRING; | ||
151 | a.session_id_context.data=in->sid_ctx; | ||
152 | |||
153 | a.key_arg.length=in->key_arg_length; | ||
154 | a.key_arg.type=V_ASN1_OCTET_STRING; | ||
155 | a.key_arg.data=in->key_arg; | ||
156 | |||
157 | #ifndef OPENSSL_NO_KRB5 | ||
158 | if (in->krb5_client_princ_len) | ||
159 | { | ||
160 | a.krb5_princ.length=in->krb5_client_princ_len; | ||
161 | a.krb5_princ.type=V_ASN1_OCTET_STRING; | ||
162 | a.krb5_princ.data=in->krb5_client_princ; | ||
163 | } | ||
164 | #endif /* OPENSSL_NO_KRB5 */ | ||
165 | |||
166 | if (in->time != 0L) | ||
167 | { | ||
168 | a.time.length=LSIZE2; | ||
169 | a.time.type=V_ASN1_INTEGER; | ||
170 | a.time.data=ibuf3; | ||
171 | ASN1_INTEGER_set(&(a.time),in->time); | ||
172 | } | ||
173 | |||
174 | if (in->timeout != 0L) | ||
175 | { | ||
176 | a.timeout.length=LSIZE2; | ||
177 | a.timeout.type=V_ASN1_INTEGER; | ||
178 | a.timeout.data=ibuf4; | ||
179 | ASN1_INTEGER_set(&(a.timeout),in->timeout); | ||
180 | } | ||
181 | |||
182 | if (in->verify_result != X509_V_OK) | ||
183 | { | ||
184 | a.verify_result.length=LSIZE2; | ||
185 | a.verify_result.type=V_ASN1_INTEGER; | ||
186 | a.verify_result.data=ibuf5; | ||
187 | ASN1_INTEGER_set(&a.verify_result,in->verify_result); | ||
188 | } | ||
189 | |||
190 | #ifndef OPENSSL_NO_TLSEXT | ||
191 | if (in->tlsext_hostname) | ||
192 | { | ||
193 | a.tlsext_hostname.length=strlen(in->tlsext_hostname); | ||
194 | a.tlsext_hostname.type=V_ASN1_OCTET_STRING; | ||
195 | a.tlsext_hostname.data=(unsigned char *)in->tlsext_hostname; | ||
196 | } | ||
197 | if (in->tlsext_tick) | ||
198 | { | ||
199 | a.tlsext_tick.length= in->tlsext_ticklen; | ||
200 | a.tlsext_tick.type=V_ASN1_OCTET_STRING; | ||
201 | a.tlsext_tick.data=(unsigned char *)in->tlsext_tick; | ||
202 | /* If we have a ticket set session ID to empty because | ||
203 | * it will be bogus. If liftime hint is -1 treat as a special | ||
204 | * case because the session is being used as a container | ||
205 | */ | ||
206 | if (in->tlsext_ticklen && (in->tlsext_tick_lifetime_hint != -1)) | ||
207 | a.session_id.length=0; | ||
208 | } | ||
209 | if (in->tlsext_tick_lifetime_hint > 0) | ||
210 | { | ||
211 | a.tlsext_tick_lifetime.length=LSIZE2; | ||
212 | a.tlsext_tick_lifetime.type=V_ASN1_INTEGER; | ||
213 | a.tlsext_tick_lifetime.data=ibuf6; | ||
214 | ASN1_INTEGER_set(&a.tlsext_tick_lifetime,in->tlsext_tick_lifetime_hint); | ||
215 | } | ||
216 | #endif /* OPENSSL_NO_TLSEXT */ | ||
217 | M_ASN1_I2D_len(&(a.version), i2d_ASN1_INTEGER); | ||
218 | M_ASN1_I2D_len(&(a.ssl_version), i2d_ASN1_INTEGER); | ||
219 | M_ASN1_I2D_len(&(a.cipher), i2d_ASN1_OCTET_STRING); | ||
220 | M_ASN1_I2D_len(&(a.session_id), i2d_ASN1_OCTET_STRING); | ||
221 | M_ASN1_I2D_len(&(a.master_key), i2d_ASN1_OCTET_STRING); | ||
222 | #ifndef OPENSSL_NO_KRB5 | ||
223 | if (in->krb5_client_princ_len) | ||
224 | M_ASN1_I2D_len(&(a.krb5_princ), i2d_ASN1_OCTET_STRING); | ||
225 | #endif /* OPENSSL_NO_KRB5 */ | ||
226 | if (in->key_arg_length > 0) | ||
227 | M_ASN1_I2D_len_IMP_opt(&(a.key_arg),i2d_ASN1_OCTET_STRING); | ||
228 | if (in->time != 0L) | ||
229 | M_ASN1_I2D_len_EXP_opt(&(a.time),i2d_ASN1_INTEGER,1,v1); | ||
230 | if (in->timeout != 0L) | ||
231 | M_ASN1_I2D_len_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2); | ||
232 | if (in->peer != NULL) | ||
233 | M_ASN1_I2D_len_EXP_opt(in->peer,i2d_X509,3,v3); | ||
234 | M_ASN1_I2D_len_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,v4); | ||
235 | if (in->verify_result != X509_V_OK) | ||
236 | M_ASN1_I2D_len_EXP_opt(&(a.verify_result),i2d_ASN1_INTEGER,5,v5); | ||
237 | |||
238 | #ifndef OPENSSL_NO_TLSEXT | ||
239 | if (in->tlsext_tick_lifetime_hint > 0) | ||
240 | M_ASN1_I2D_len_EXP_opt(&a.tlsext_tick_lifetime, i2d_ASN1_INTEGER,9,v9); | ||
241 | if (in->tlsext_tick) | ||
242 | M_ASN1_I2D_len_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10); | ||
243 | if (in->tlsext_hostname) | ||
244 | M_ASN1_I2D_len_EXP_opt(&(a.tlsext_hostname), i2d_ASN1_OCTET_STRING,6,v6); | ||
245 | #endif /* OPENSSL_NO_TLSEXT */ | ||
246 | M_ASN1_I2D_seq_total(); | ||
247 | |||
248 | M_ASN1_I2D_put(&(a.version), i2d_ASN1_INTEGER); | ||
249 | M_ASN1_I2D_put(&(a.ssl_version), i2d_ASN1_INTEGER); | ||
250 | M_ASN1_I2D_put(&(a.cipher), i2d_ASN1_OCTET_STRING); | ||
251 | M_ASN1_I2D_put(&(a.session_id), i2d_ASN1_OCTET_STRING); | ||
252 | M_ASN1_I2D_put(&(a.master_key), i2d_ASN1_OCTET_STRING); | ||
253 | #ifndef OPENSSL_NO_KRB5 | ||
254 | if (in->krb5_client_princ_len) | ||
255 | M_ASN1_I2D_put(&(a.krb5_princ), i2d_ASN1_OCTET_STRING); | ||
256 | #endif /* OPENSSL_NO_KRB5 */ | ||
257 | if (in->key_arg_length > 0) | ||
258 | M_ASN1_I2D_put_IMP_opt(&(a.key_arg),i2d_ASN1_OCTET_STRING,0); | ||
259 | if (in->time != 0L) | ||
260 | M_ASN1_I2D_put_EXP_opt(&(a.time),i2d_ASN1_INTEGER,1,v1); | ||
261 | if (in->timeout != 0L) | ||
262 | M_ASN1_I2D_put_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2); | ||
263 | if (in->peer != NULL) | ||
264 | M_ASN1_I2D_put_EXP_opt(in->peer,i2d_X509,3,v3); | ||
265 | M_ASN1_I2D_put_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4, | ||
266 | v4); | ||
267 | if (in->verify_result != X509_V_OK) | ||
268 | M_ASN1_I2D_put_EXP_opt(&a.verify_result,i2d_ASN1_INTEGER,5,v5); | ||
269 | #ifndef OPENSSL_NO_TLSEXT | ||
270 | if (in->tlsext_hostname) | ||
271 | M_ASN1_I2D_put_EXP_opt(&(a.tlsext_hostname), i2d_ASN1_OCTET_STRING,6,v6); | ||
272 | if (in->tlsext_tick_lifetime_hint > 0) | ||
273 | M_ASN1_I2D_put_EXP_opt(&a.tlsext_tick_lifetime, i2d_ASN1_INTEGER,9,v9); | ||
274 | if (in->tlsext_tick) | ||
275 | M_ASN1_I2D_put_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10); | ||
276 | #endif /* OPENSSL_NO_TLSEXT */ | ||
277 | M_ASN1_I2D_finish(); | ||
278 | } | ||
279 | |||
280 | SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, | ||
281 | long length) | ||
282 | { | ||
283 | int version,ssl_version=0,i; | ||
284 | long id; | ||
285 | ASN1_INTEGER ai,*aip; | ||
286 | ASN1_OCTET_STRING os,*osp; | ||
287 | M_ASN1_D2I_vars(a,SSL_SESSION *,SSL_SESSION_new); | ||
288 | |||
289 | aip= &ai; | ||
290 | osp= &os; | ||
291 | |||
292 | M_ASN1_D2I_Init(); | ||
293 | M_ASN1_D2I_start_sequence(); | ||
294 | |||
295 | ai.data=NULL; ai.length=0; | ||
296 | M_ASN1_D2I_get_x(ASN1_INTEGER,aip,d2i_ASN1_INTEGER); | ||
297 | version=(int)ASN1_INTEGER_get(aip); | ||
298 | if (ai.data != NULL) { OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; } | ||
299 | |||
300 | /* we don't care about the version right now :-) */ | ||
301 | M_ASN1_D2I_get_x(ASN1_INTEGER,aip,d2i_ASN1_INTEGER); | ||
302 | ssl_version=(int)ASN1_INTEGER_get(aip); | ||
303 | ret->ssl_version=ssl_version; | ||
304 | if (ai.data != NULL) { OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; } | ||
305 | |||
306 | os.data=NULL; os.length=0; | ||
307 | M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING); | ||
308 | if (ssl_version == SSL2_VERSION) | ||
309 | { | ||
310 | if (os.length != 3) | ||
311 | { | ||
312 | c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH; | ||
313 | goto err; | ||
314 | } | ||
315 | id=0x02000000L| | ||
316 | ((unsigned long)os.data[0]<<16L)| | ||
317 | ((unsigned long)os.data[1]<< 8L)| | ||
318 | (unsigned long)os.data[2]; | ||
319 | } | ||
320 | else if ((ssl_version>>8) == SSL3_VERSION_MAJOR) | ||
321 | { | ||
322 | if (os.length != 2) | ||
323 | { | ||
324 | c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH; | ||
325 | goto err; | ||
326 | } | ||
327 | id=0x03000000L| | ||
328 | ((unsigned long)os.data[0]<<8L)| | ||
329 | (unsigned long)os.data[1]; | ||
330 | } | ||
331 | else | ||
332 | { | ||
333 | SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_UNKNOWN_SSL_VERSION); | ||
334 | return(NULL); | ||
335 | } | ||
336 | |||
337 | ret->cipher=NULL; | ||
338 | ret->cipher_id=id; | ||
339 | |||
340 | M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING); | ||
341 | if ((ssl_version>>8) == SSL3_VERSION_MAJOR) | ||
342 | i=SSL3_MAX_SSL_SESSION_ID_LENGTH; | ||
343 | else /* if (ssl_version>>8 == SSL2_VERSION_MAJOR) */ | ||
344 | i=SSL2_MAX_SSL_SESSION_ID_LENGTH; | ||
345 | |||
346 | if (os.length > i) | ||
347 | os.length = i; | ||
348 | if (os.length > (int)sizeof(ret->session_id)) /* can't happen */ | ||
349 | os.length = sizeof(ret->session_id); | ||
350 | |||
351 | ret->session_id_length=os.length; | ||
352 | OPENSSL_assert(os.length <= (int)sizeof(ret->session_id)); | ||
353 | memcpy(ret->session_id,os.data,os.length); | ||
354 | |||
355 | M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING); | ||
356 | if (os.length > SSL_MAX_MASTER_KEY_LENGTH) | ||
357 | ret->master_key_length=SSL_MAX_MASTER_KEY_LENGTH; | ||
358 | else | ||
359 | ret->master_key_length=os.length; | ||
360 | memcpy(ret->master_key,os.data,ret->master_key_length); | ||
361 | |||
362 | os.length=0; | ||
363 | |||
364 | #ifndef OPENSSL_NO_KRB5 | ||
365 | os.length=0; | ||
366 | M_ASN1_D2I_get_opt(osp,d2i_ASN1_OCTET_STRING,V_ASN1_OCTET_STRING); | ||
367 | if (os.data) | ||
368 | { | ||
369 | if (os.length > SSL_MAX_KRB5_PRINCIPAL_LENGTH) | ||
370 | ret->krb5_client_princ_len=0; | ||
371 | else | ||
372 | ret->krb5_client_princ_len=os.length; | ||
373 | memcpy(ret->krb5_client_princ,os.data,ret->krb5_client_princ_len); | ||
374 | OPENSSL_free(os.data); | ||
375 | os.data = NULL; | ||
376 | os.length = 0; | ||
377 | } | ||
378 | else | ||
379 | ret->krb5_client_princ_len=0; | ||
380 | #endif /* OPENSSL_NO_KRB5 */ | ||
381 | |||
382 | M_ASN1_D2I_get_IMP_opt(osp,d2i_ASN1_OCTET_STRING,0,V_ASN1_OCTET_STRING); | ||
383 | if (os.length > SSL_MAX_KEY_ARG_LENGTH) | ||
384 | ret->key_arg_length=SSL_MAX_KEY_ARG_LENGTH; | ||
385 | else | ||
386 | ret->key_arg_length=os.length; | ||
387 | memcpy(ret->key_arg,os.data,ret->key_arg_length); | ||
388 | if (os.data != NULL) OPENSSL_free(os.data); | ||
389 | |||
390 | ai.length=0; | ||
391 | M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,1); | ||
392 | if (ai.data != NULL) | ||
393 | { | ||
394 | ret->time=ASN1_INTEGER_get(aip); | ||
395 | OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; | ||
396 | } | ||
397 | else | ||
398 | ret->time=(unsigned long)time(NULL); | ||
399 | |||
400 | ai.length=0; | ||
401 | M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,2); | ||
402 | if (ai.data != NULL) | ||
403 | { | ||
404 | ret->timeout=ASN1_INTEGER_get(aip); | ||
405 | OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; | ||
406 | } | ||
407 | else | ||
408 | ret->timeout=3; | ||
409 | |||
410 | if (ret->peer != NULL) | ||
411 | { | ||
412 | X509_free(ret->peer); | ||
413 | ret->peer=NULL; | ||
414 | } | ||
415 | M_ASN1_D2I_get_EXP_opt(ret->peer,d2i_X509,3); | ||
416 | |||
417 | os.length=0; | ||
418 | os.data=NULL; | ||
419 | M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,4); | ||
420 | |||
421 | if(os.data != NULL) | ||
422 | { | ||
423 | if (os.length > SSL_MAX_SID_CTX_LENGTH) | ||
424 | { | ||
425 | ret->sid_ctx_length=os.length; | ||
426 | SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH); | ||
427 | } | ||
428 | else | ||
429 | { | ||
430 | ret->sid_ctx_length=os.length; | ||
431 | memcpy(ret->sid_ctx,os.data,os.length); | ||
432 | } | ||
433 | OPENSSL_free(os.data); os.data=NULL; os.length=0; | ||
434 | } | ||
435 | else | ||
436 | ret->sid_ctx_length=0; | ||
437 | |||
438 | ai.length=0; | ||
439 | M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,5); | ||
440 | if (ai.data != NULL) | ||
441 | { | ||
442 | ret->verify_result=ASN1_INTEGER_get(aip); | ||
443 | OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; | ||
444 | } | ||
445 | else | ||
446 | ret->verify_result=X509_V_OK; | ||
447 | |||
448 | #ifndef OPENSSL_NO_TLSEXT | ||
449 | os.length=0; | ||
450 | os.data=NULL; | ||
451 | M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,6); | ||
452 | if (os.data) | ||
453 | { | ||
454 | ret->tlsext_hostname = BUF_strndup((char *)os.data, os.length); | ||
455 | OPENSSL_free(os.data); | ||
456 | os.data = NULL; | ||
457 | os.length = 0; | ||
458 | } | ||
459 | else | ||
460 | ret->tlsext_hostname=NULL; | ||
461 | ai.length=0; | ||
462 | M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,9); | ||
463 | if (ai.data != NULL) | ||
464 | { | ||
465 | ret->tlsext_tick_lifetime_hint=ASN1_INTEGER_get(aip); | ||
466 | OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; | ||
467 | } | ||
468 | else if (ret->tlsext_ticklen && ret->session_id_length) | ||
469 | ret->tlsext_tick_lifetime_hint = -1; | ||
470 | else | ||
471 | ret->tlsext_tick_lifetime_hint = 0; | ||
472 | os.length=0; | ||
473 | os.data=NULL; | ||
474 | M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,10); | ||
475 | if (os.data) | ||
476 | { | ||
477 | ret->tlsext_tick = os.data; | ||
478 | ret->tlsext_ticklen = os.length; | ||
479 | os.data = NULL; | ||
480 | os.length = 0; | ||
481 | #if 0 | ||
482 | /* There are two ways to detect a resumed ticket sesion. | ||
483 | * One is to set a random session ID and then the server | ||
484 | * must return a match in ServerHello. This allows the normal | ||
485 | * client session ID matching to work. | ||
486 | */ | ||
487 | if (ret->session_id_length == 0) | ||
488 | { | ||
489 | ret->session_id_length=SSL3_MAX_SSL_SESSION_ID_LENGTH; | ||
490 | RAND_pseudo_bytes(ret->session_id, | ||
491 | ret->session_id_length); | ||
492 | } | ||
493 | #endif | ||
494 | } | ||
495 | else | ||
496 | ret->tlsext_tick=NULL; | ||
497 | #endif /* OPENSSL_NO_TLSEXT */ | ||
498 | |||
499 | M_ASN1_D2I_Finish(a,SSL_SESSION_free,SSL_F_D2I_SSL_SESSION); | ||
500 | } | ||