diff options
author | jsing <> | 2021-06-13 15:34:41 +0000 |
---|---|---|
committer | jsing <> | 2021-06-13 15:34:41 +0000 |
commit | 83aea7ddd63a4f3e06d9e54201546df2afd0807b (patch) | |
tree | 540002287cf7fa443033106e6480fe34e7e20bd9 /src/lib/libssl/t1_enc.c | |
parent | ed0c2c6b46aab3fd3240052d8c38a31d8f3c1e54 (diff) | |
download | openbsd-83aea7ddd63a4f3e06d9e54201546df2afd0807b.tar.gz openbsd-83aea7ddd63a4f3e06d9e54201546df2afd0807b.tar.bz2 openbsd-83aea7ddd63a4f3e06d9e54201546df2afd0807b.zip |
Remove tls1_alert_code().
After running the preprocessor, this function becomes:
switch (code) {
case 0:
return (0);
case 10:
return (10);
case 20:
return (20);
...
}
Its intended purpose was to prevent SSLv3 alerts being sent from TLS code,
however now that we've removed "no_certificate" from LibreSSL's reach, it
no longer does anything useful.
ok tb@
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r-- | src/lib/libssl/t1_enc.c | 67 |
1 files changed, 1 insertions, 66 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index 87d2f9e590..15afb1bae8 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_enc.c,v 1.149 2021/06/13 15:29:19 jsing Exp $ */ | 1 | /* $OpenBSD: t1_enc.c,v 1.150 2021/06/13 15:34:41 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 | * |
@@ -494,68 +494,3 @@ tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, | |||
494 | 494 | ||
495 | return (rv); | 495 | return (rv); |
496 | } | 496 | } |
497 | |||
498 | int | ||
499 | tls1_alert_code(int code) | ||
500 | { | ||
501 | switch (code) { | ||
502 | case SSL_AD_CLOSE_NOTIFY: | ||
503 | return (SSL3_AD_CLOSE_NOTIFY); | ||
504 | case SSL_AD_UNEXPECTED_MESSAGE: | ||
505 | return (SSL3_AD_UNEXPECTED_MESSAGE); | ||
506 | case SSL_AD_BAD_RECORD_MAC: | ||
507 | return (SSL3_AD_BAD_RECORD_MAC); | ||
508 | case SSL_AD_RECORD_OVERFLOW: | ||
509 | return (TLS1_AD_RECORD_OVERFLOW); | ||
510 | case SSL_AD_DECOMPRESSION_FAILURE: | ||
511 | return (SSL3_AD_DECOMPRESSION_FAILURE); | ||
512 | case SSL_AD_HANDSHAKE_FAILURE: | ||
513 | return (SSL3_AD_HANDSHAKE_FAILURE); | ||
514 | case SSL_AD_BAD_CERTIFICATE: | ||
515 | return (SSL3_AD_BAD_CERTIFICATE); | ||
516 | case SSL_AD_UNSUPPORTED_CERTIFICATE: | ||
517 | return (SSL3_AD_UNSUPPORTED_CERTIFICATE); | ||
518 | case SSL_AD_CERTIFICATE_REVOKED: | ||
519 | return (SSL3_AD_CERTIFICATE_REVOKED); | ||
520 | case SSL_AD_CERTIFICATE_EXPIRED: | ||
521 | return (SSL3_AD_CERTIFICATE_EXPIRED); | ||
522 | case SSL_AD_CERTIFICATE_UNKNOWN: | ||
523 | return (SSL3_AD_CERTIFICATE_UNKNOWN); | ||
524 | case SSL_AD_ILLEGAL_PARAMETER: | ||
525 | return (SSL3_AD_ILLEGAL_PARAMETER); | ||
526 | case SSL_AD_UNKNOWN_CA: | ||
527 | return (TLS1_AD_UNKNOWN_CA); | ||
528 | case SSL_AD_ACCESS_DENIED: | ||
529 | return (TLS1_AD_ACCESS_DENIED); | ||
530 | case SSL_AD_DECODE_ERROR: | ||
531 | return (TLS1_AD_DECODE_ERROR); | ||
532 | case SSL_AD_DECRYPT_ERROR: | ||
533 | return (TLS1_AD_DECRYPT_ERROR); | ||
534 | case SSL_AD_PROTOCOL_VERSION: | ||
535 | return (TLS1_AD_PROTOCOL_VERSION); | ||
536 | case SSL_AD_INSUFFICIENT_SECURITY: | ||
537 | return (TLS1_AD_INSUFFICIENT_SECURITY); | ||
538 | case SSL_AD_INTERNAL_ERROR: | ||
539 | return (TLS1_AD_INTERNAL_ERROR); | ||
540 | case SSL_AD_INAPPROPRIATE_FALLBACK: | ||
541 | return(TLS1_AD_INAPPROPRIATE_FALLBACK); | ||
542 | case SSL_AD_USER_CANCELLED: | ||
543 | return (TLS1_AD_USER_CANCELLED); | ||
544 | case SSL_AD_NO_RENEGOTIATION: | ||
545 | return (TLS1_AD_NO_RENEGOTIATION); | ||
546 | case SSL_AD_UNSUPPORTED_EXTENSION: | ||
547 | return (TLS1_AD_UNSUPPORTED_EXTENSION); | ||
548 | case SSL_AD_CERTIFICATE_UNOBTAINABLE: | ||
549 | return (TLS1_AD_CERTIFICATE_UNOBTAINABLE); | ||
550 | case SSL_AD_UNRECOGNIZED_NAME: | ||
551 | return (TLS1_AD_UNRECOGNIZED_NAME); | ||
552 | case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: | ||
553 | return (TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE); | ||
554 | case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: | ||
555 | return (TLS1_AD_BAD_CERTIFICATE_HASH_VALUE); | ||
556 | case SSL_AD_UNKNOWN_PSK_IDENTITY: | ||
557 | return (TLS1_AD_UNKNOWN_PSK_IDENTITY); | ||
558 | default: | ||
559 | return (-1); | ||
560 | } | ||
561 | } | ||