diff options
| author | jsing <> | 2015-09-10 19:08:46 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-10 19:08:46 +0000 |
| commit | 961a7cdefef45060db31ce3a6d96357c716e4f5c (patch) | |
| tree | e943bf6066d7284e14ce33a3d239c89d80adf94f | |
| parent | 734de84f88c5e688ad39ef2675af166166109040 (diff) | |
| download | openbsd-961a7cdefef45060db31ce3a6d96357c716e4f5c.tar.gz openbsd-961a7cdefef45060db31ce3a6d96357c716e4f5c.tar.bz2 openbsd-961a7cdefef45060db31ce3a6d96357c716e4f5c.zip | |
Nuke references to DTLS1_BAD_VER and unbreak the tree.
| -rw-r--r-- | src/usr.bin/openssl/s_cb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/usr.bin/openssl/s_cb.c b/src/usr.bin/openssl/s_cb.c index 596884ff16..ac3a0076bd 100644 --- a/src/usr.bin/openssl/s_cb.c +++ b/src/usr.bin/openssl/s_cb.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_cb.c,v 1.5 2015/09/10 06:36:45 bcook Exp $ */ | 1 | /* $OpenBSD: s_cb.c,v 1.6 2015/09/10 19:08:46 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -372,9 +372,6 @@ msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, | |||
| 372 | case DTLS1_VERSION: | 372 | case DTLS1_VERSION: |
| 373 | str_version = "DTLS 1.0 "; | 373 | str_version = "DTLS 1.0 "; |
| 374 | break; | 374 | break; |
| 375 | case DTLS1_BAD_VER: | ||
| 376 | str_version = "DTLS 1.0 (bad) "; | ||
| 377 | break; | ||
| 378 | default: | 375 | default: |
| 379 | str_version = "???"; | 376 | str_version = "???"; |
| 380 | } | 377 | } |
| @@ -435,7 +432,7 @@ msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, | |||
| 435 | } | 432 | } |
| 436 | if (version == SSL3_VERSION || version == TLS1_VERSION || | 433 | if (version == SSL3_VERSION || version == TLS1_VERSION || |
| 437 | version == TLS1_1_VERSION || version == TLS1_2_VERSION || | 434 | version == TLS1_1_VERSION || version == TLS1_2_VERSION || |
| 438 | version == DTLS1_VERSION || version == DTLS1_BAD_VER) { | 435 | version == DTLS1_VERSION) { |
| 439 | switch (content_type) { | 436 | switch (content_type) { |
| 440 | case 20: | 437 | case 20: |
| 441 | str_content_type = "ChangeCipherSpec"; | 438 | str_content_type = "ChangeCipherSpec"; |
