diff options
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
| -rw-r--r-- | src/lib/libssl/s3_clnt.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index a6b3c01afa..b80d052e1f 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
| @@ -459,6 +459,7 @@ int ssl3_connect(SSL *s) | |||
| 459 | SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B); | 459 | SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B); |
| 460 | if (ret <= 0) goto end; | 460 | if (ret <= 0) goto end; |
| 461 | 461 | ||
| 462 | |||
| 462 | #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) | 463 | #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) |
| 463 | s->state=SSL3_ST_CW_FINISHED_A; | 464 | s->state=SSL3_ST_CW_FINISHED_A; |
| 464 | #else | 465 | #else |
| @@ -655,7 +656,7 @@ int ssl3_client_hello(SSL *s) | |||
| 655 | unsigned char *buf; | 656 | unsigned char *buf; |
| 656 | unsigned char *p,*d; | 657 | unsigned char *p,*d; |
| 657 | int i; | 658 | int i; |
| 658 | unsigned long l; | 659 | unsigned long Time,l; |
| 659 | #ifndef OPENSSL_NO_COMP | 660 | #ifndef OPENSSL_NO_COMP |
| 660 | int j; | 661 | int j; |
| 661 | SSL_COMP *comp; | 662 | SSL_COMP *comp; |
| @@ -680,8 +681,9 @@ int ssl3_client_hello(SSL *s) | |||
| 680 | /* else use the pre-loaded session */ | 681 | /* else use the pre-loaded session */ |
| 681 | 682 | ||
| 682 | p=s->s3->client_random; | 683 | p=s->s3->client_random; |
| 683 | 684 | Time=(unsigned long)time(NULL); /* Time */ | |
| 684 | if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0) | 685 | l2n(Time,p); |
| 686 | if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) | ||
| 685 | goto err; | 687 | goto err; |
| 686 | 688 | ||
| 687 | /* Do the message type and length last */ | 689 | /* Do the message type and length last */ |
| @@ -985,10 +987,7 @@ int ssl3_get_server_hello(SSL *s) | |||
| 985 | * client authentication. | 987 | * client authentication. |
| 986 | */ | 988 | */ |
| 987 | if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s)) | 989 | if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s)) |
| 988 | { | ||
| 989 | al = SSL_AD_INTERNAL_ERROR; | ||
| 990 | goto f_err; | 990 | goto f_err; |
| 991 | } | ||
| 992 | /* lets get the compression algorithm */ | 991 | /* lets get the compression algorithm */ |
| 993 | /* COMPRESSION */ | 992 | /* COMPRESSION */ |
| 994 | #ifdef OPENSSL_NO_COMP | 993 | #ifdef OPENSSL_NO_COMP |
