diff options
| author | tedu <> | 2014-07-10 08:51:15 +0000 |
|---|---|---|
| committer | tedu <> | 2014-07-10 08:51:15 +0000 |
| commit | 78de0a2c32aaba2455b28e3cb034f296c59c3179 (patch) | |
| tree | 10d3c4ab8299021b37a17232dc3493cb7fc5dd87 /src/lib/libssl/d1_srvr.c | |
| parent | 026ac0f99b4505d6ca98aff637a396038bd916d3 (diff) | |
| download | openbsd-78de0a2c32aaba2455b28e3cb034f296c59c3179.tar.gz openbsd-78de0a2c32aaba2455b28e3cb034f296c59c3179.tar.bz2 openbsd-78de0a2c32aaba2455b28e3cb034f296c59c3179.zip | |
decompress libssl. ok beck jsing
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/d1_srvr.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index c01dc77254..9fdb6c290b 100644 --- a/src/lib/libssl/d1_srvr.c +++ b/src/lib/libssl/d1_srvr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_srvr.c,v 1.28 2014/07/09 11:25:42 jsing Exp $ */ | 1 | /* $OpenBSD: d1_srvr.c,v 1.29 2014/07/10 08:51:14 tedu Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -946,14 +946,7 @@ dtls1_send_server_hello(SSL *s) | |||
| 946 | p += i; | 946 | p += i; |
| 947 | 947 | ||
| 948 | /* put the compression method */ | 948 | /* put the compression method */ |
| 949 | #ifdef OPENSSL_NO_COMP | ||
| 950 | *(p++) = 0; | 949 | *(p++) = 0; |
| 951 | #else | ||
| 952 | if (s->s3->tmp.new_compression == NULL) | ||
| 953 | *(p++) = 0; | ||
| 954 | else | ||
| 955 | *(p++) = s->s3->tmp.new_compression->id; | ||
| 956 | #endif | ||
| 957 | 950 | ||
| 958 | if ((p = ssl_add_serverhello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) { | 951 | if ((p = ssl_add_serverhello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) { |
| 959 | SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR); | 952 | SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR); |
