summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2021-08-31 13:14:43 +0000
committerjsing <>2021-08-31 13:14:43 +0000
commite6a921b7782b387c57ef5fd5205ee66276665998 (patch)
tree48e52569abc9360d728aa91253f3c56444139818 /src/lib
parentc1743878a38599e5faf4c9eb2d170a17cae4b13f (diff)
downloadopenbsd-e6a921b7782b387c57ef5fd5205ee66276665998.tar.gz
openbsd-e6a921b7782b387c57ef5fd5205ee66276665998.tar.bz2
openbsd-e6a921b7782b387c57ef5fd5205ee66276665998.zip
Remove a nonsensical s->version == TLS1_VERSION from DTLS code.
ok inoguchi@ tb@ (as part of a larger diff)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/d1_pkt.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index f99b8ff371..0b66bf7cc8 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_pkt.c,v 1.107 2021/08/30 19:25:43 jsing Exp $ */ 1/* $OpenBSD: d1_pkt.c,v 1.108 2021/08/31 13:14:43 jsing 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.
@@ -898,11 +898,6 @@ dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
898 898
899 switch (rr->type) { 899 switch (rr->type) {
900 default: 900 default:
901 /* TLS just ignores unknown message types */
902 if (s->version == TLS1_VERSION) {
903 rr->length = 0;
904 goto start;
905 }
906 al = SSL_AD_UNEXPECTED_MESSAGE; 901 al = SSL_AD_UNEXPECTED_MESSAGE;
907 SSLerror(s, SSL_R_UNEXPECTED_RECORD); 902 SSLerror(s, SSL_R_UNEXPECTED_RECORD);
908 goto fatal_err; 903 goto fatal_err;