diff options
| author | jsing <> | 2014-05-30 14:01:11 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-30 14:01:11 +0000 |
| commit | d7bb67cc99974281f55641afa52a0f9e8f1ff938 (patch) | |
| tree | feaa5e2dc937f09df0609d84b0849a48c405df08 /src/lib/libssl/s3_both.c | |
| parent | 7388822d9393b64a9eb25e34c9bac56fb7f39f15 (diff) | |
| download | openbsd-d7bb67cc99974281f55641afa52a0f9e8f1ff938.tar.gz openbsd-d7bb67cc99974281f55641afa52a0f9e8f1ff938.tar.bz2 openbsd-d7bb67cc99974281f55641afa52a0f9e8f1ff938.zip | |
Make use of SSL_IS_DTLS, SSL_USE_EXPLICIT_IV, SSL_USE_SIGALGS and
SSL_USE_TLS1_2_CIPHERS.
Largely based on OpenSSL head.
Diffstat (limited to 'src/lib/libssl/s3_both.c')
| -rw-r--r-- | src/lib/libssl/s3_both.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index f1d686b56f..54b73451eb 100644 --- a/src/lib/libssl/s3_both.c +++ b/src/lib/libssl/s3_both.c | |||
| @@ -632,7 +632,7 @@ ssl3_setup_read_buffer(SSL *s) | |||
| 632 | unsigned char *p; | 632 | unsigned char *p; |
| 633 | size_t len, align = 0, headerlen; | 633 | size_t len, align = 0, headerlen; |
| 634 | 634 | ||
| 635 | if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) | 635 | if (SSL_IS_DTLS(s)) |
| 636 | headerlen = DTLS1_RT_HEADER_LENGTH; | 636 | headerlen = DTLS1_RT_HEADER_LENGTH; |
| 637 | else | 637 | else |
| 638 | headerlen = SSL3_RT_HEADER_LENGTH; | 638 | headerlen = SSL3_RT_HEADER_LENGTH; |
| @@ -672,7 +672,7 @@ ssl3_setup_write_buffer(SSL *s) | |||
| 672 | unsigned char *p; | 672 | unsigned char *p; |
| 673 | size_t len, align = 0, headerlen; | 673 | size_t len, align = 0, headerlen; |
| 674 | 674 | ||
| 675 | if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) | 675 | if (SSL_IS_DTLS(s)) |
| 676 | headerlen = DTLS1_RT_HEADER_LENGTH + 1; | 676 | headerlen = DTLS1_RT_HEADER_LENGTH + 1; |
| 677 | else | 677 | else |
| 678 | headerlen = SSL3_RT_HEADER_LENGTH; | 678 | headerlen = SSL3_RT_HEADER_LENGTH; |