diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2010-02-01 16:51:09 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2010-02-01 16:51:09 +0000 |
commit | 434745dc193a7bbbc31f555ae36be95d48140d6e (patch) | |
tree | 2e4b3b4e879492ff7412ba423b6c0e7eb6fb5779 /ssl/ssl_asn1.c | |
parent | b380f9b88428d78e687e1f5100a56b229f2af854 (diff) | |
download | openssl-434745dc193a7bbbc31f555ae36be95d48140d6e.tar.gz |
PR: 2160
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Make session tickets work with DTLS.
Diffstat (limited to 'ssl/ssl_asn1.c')
-rw-r--r-- | ssl/ssl_asn1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index e484a2992d..28709978b5 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -394,7 +394,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, ((unsigned long)os.data[1]<< 8L)| (unsigned long)os.data[2]; } - else if ((ssl_version>>8) == SSL3_VERSION_MAJOR) + else if ((ssl_version>>8) >= SSL3_VERSION_MAJOR) { if (os.length != 2) { @@ -415,7 +415,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, ret->cipher_id=id; M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING); - if ((ssl_version>>8) == SSL3_VERSION_MAJOR) + if ((ssl_version>>8) >= SSL3_VERSION_MAJOR) i=SSL3_MAX_SSL_SESSION_ID_LENGTH; else /* if (ssl_version>>8 == SSL2_VERSION_MAJOR) */ i=SSL2_MAX_SSL_SESSION_ID_LENGTH; |