equal
deleted
inserted
replaced
239 #include <stdio.h> |
239 #include <stdio.h> |
240 @@ -179,6 +181,7 @@ |
240 @@ -179,6 +181,7 @@ |
241 return(ret); |
241 return(ret); |
242 } |
242 } |
243 |
243 |
244 +#ifndef _BOOT |
244 +#ifndef _BOOT |
245 int RAND_write_file(const char *file) |
245 int RAND_write_file(const char *file) |
246 { |
246 { |
247 unsigned char buf[BUFSIZE]; |
247 unsigned char buf[BUFSIZE]; |
248 @@ -327,3 +330,5 @@ |
248 @@ -327,3 +330,5 @@ |
249 #endif |
249 #endif |
423 + goto err; |
423 + goto err; |
424 +#endif |
424 +#endif |
425 |
425 |
426 /* Do the message type and length last */ |
426 /* Do the message type and length last */ |
427 d=p= &(buf[4]); |
427 d=p= &(buf[4]); |
|
428 --- openssl-1.0.1f/ssl/s3_lib.c Wed Oct 15 11:18:30 2014 |
|
429 +++ openssl-1.0.1f/ssl/s3_lib.c.new Wed Oct 15 11:20:07 2014 |
|
430 @@ -3364,7 +3364,11 @@ |
|
431 return 1; |
|
432 /* Apparently we're using a version-flexible SSL_METHOD |
|
433 * (not at its highest protocol version). */ |
|
434 +#ifndef _BOOT |
|
435 if (s->ctx->method->version == SSLv23_method()->version) |
|
436 +#else |
|
437 + if (s->ctx->method->version == TLS1_2_VERSION) |
|
438 +#endif |
|
439 { |
|
440 #if TLS_MAX_VERSION != TLS1_2_VERSION |
|
441 # error Code needs update for SSLv23_method() support beyond TLS1_2_VERSION. |