1 files changed, 61 insertions, 61 deletions
diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c
index 6b26d4c915..b813ac6896 100644
--- a/src/lib/libssl/ssl_stat.c
+++ b/src/lib/libssl/ssl_stat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_stat.c,v 1.14 2017/05/07 04:22:24 beck Exp $ */
+/* $OpenBSD: ssl_stat.c,v 1.15 2021/06/11 17:29:48 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -578,94 +578,94 @@ SSL_alert_desc_string(int value)
        const char *str;
        switch (value & 0xff) {
-        case SSL3_AD_CLOSE_NOTIFY:
+        case SSL_AD_CLOSE_NOTIFY:
                str = "CN";
                break;
-        case SSL3_AD_UNEXPECTED_MESSAGE:
+        case SSL_AD_UNEXPECTED_MESSAGE:
                str = "UM";
                break;
-        case SSL3_AD_BAD_RECORD_MAC:
+        case SSL_AD_BAD_RECORD_MAC:
                str = "BM";
                break;
-        case SSL3_AD_DECOMPRESSION_FAILURE:
+        case SSL_AD_DECOMPRESSION_FAILURE:
                str = "DF";
                break;
-        case SSL3_AD_HANDSHAKE_FAILURE:
+        case SSL_AD_HANDSHAKE_FAILURE:
                str = "HF";
                break;
-        case SSL3_AD_NO_CERTIFICATE:
+        case SSL_AD_NO_CERTIFICATE:
                str = "NC";
                break;
-        case SSL3_AD_BAD_CERTIFICATE:
+        case SSL_AD_BAD_CERTIFICATE:
                str = "BC";
                break;
-        case SSL3_AD_UNSUPPORTED_CERTIFICATE:
+        case SSL_AD_UNSUPPORTED_CERTIFICATE:
                str = "UC";
                break;
-        case SSL3_AD_CERTIFICATE_REVOKED:
+        case SSL_AD_CERTIFICATE_REVOKED:
                str = "CR";
                break;
-        case SSL3_AD_CERTIFICATE_EXPIRED:
+        case SSL_AD_CERTIFICATE_EXPIRED:
                str = "CE";
                break;
-        case SSL3_AD_CERTIFICATE_UNKNOWN:
+        case SSL_AD_CERTIFICATE_UNKNOWN:
                str = "CU";
                break;
-        case SSL3_AD_ILLEGAL_PARAMETER:
+        case SSL_AD_ILLEGAL_PARAMETER:
                str = "IP";
                break;
-        case TLS1_AD_DECRYPTION_FAILED:
+        case SSL_AD_DECRYPTION_FAILED:
                str = "DC";
                break;
-        case TLS1_AD_RECORD_OVERFLOW:
+        case SSL_AD_RECORD_OVERFLOW:
                str = "RO";
                break;
-        case TLS1_AD_UNKNOWN_CA:
+        case SSL_AD_UNKNOWN_CA:
                str = "CA";
                break;
-        case TLS1_AD_ACCESS_DENIED:
+        case SSL_AD_ACCESS_DENIED:
                str = "AD";
                break;
-        case TLS1_AD_DECODE_ERROR:
+        case SSL_AD_DECODE_ERROR:
                str = "DE";
                break;
-        case TLS1_AD_DECRYPT_ERROR:
+        case SSL_AD_DECRYPT_ERROR:
                str = "CY";
                break;
-        case TLS1_AD_EXPORT_RESTRICTION:
+        case SSL_AD_EXPORT_RESTRICTION:
                str = "ER";
                break;
-        case TLS1_AD_PROTOCOL_VERSION:
+        case SSL_AD_PROTOCOL_VERSION:
                str = "PV";
                break;
-        case TLS1_AD_INSUFFICIENT_SECURITY:
+        case SSL_AD_INSUFFICIENT_SECURITY:
                str = "IS";
                break;
-        case TLS1_AD_INTERNAL_ERROR:
+        case SSL_AD_INTERNAL_ERROR:
                str = "IE";
                break;
-        case TLS1_AD_USER_CANCELLED:
+        case SSL_AD_USER_CANCELLED:
                str = "US";
                break;
-        case TLS1_AD_NO_RENEGOTIATION:
+        case SSL_AD_NO_RENEGOTIATION:
                str = "NR";
                break;
-        case TLS1_AD_UNSUPPORTED_EXTENSION:
+        case SSL_AD_UNSUPPORTED_EXTENSION:
                str = "UE";
                break;
-        case TLS1_AD_CERTIFICATE_UNOBTAINABLE:
+        case SSL_AD_CERTIFICATE_UNOBTAINABLE:
                str = "CO";
                break;
-        case TLS1_AD_UNRECOGNIZED_NAME:
+        case SSL_AD_UNRECOGNIZED_NAME:
                str = "UN";
                break;
-        case TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
+        case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
                str = "BR";
                break;
-        case TLS1_AD_BAD_CERTIFICATE_HASH_VALUE:
+        case SSL_AD_BAD_CERTIFICATE_HASH_VALUE:
                str = "BH";
                break;
-        case TLS1_AD_UNKNOWN_PSK_IDENTITY:
+        case SSL_AD_UNKNOWN_PSK_IDENTITY:
                str = "UP";
                break;
        default:
@@ -681,94 +681,94 @@ SSL_alert_desc_string_long(int value)
        const char *str;
        switch (value & 0xff) {
-        case SSL3_AD_CLOSE_NOTIFY:
+        case SSL_AD_CLOSE_NOTIFY:
                str = "close notify";
                break;
-        case SSL3_AD_UNEXPECTED_MESSAGE:
+        case SSL_AD_UNEXPECTED_MESSAGE:
                str = "unexpected_message";
                break;
-        case SSL3_AD_BAD_RECORD_MAC:
+        case SSL_AD_BAD_RECORD_MAC:
                str = "bad record mac";
                break;
-        case SSL3_AD_DECOMPRESSION_FAILURE:
+        case SSL_AD_DECOMPRESSION_FAILURE:
                str = "decompression failure";
                break;
-        case SSL3_AD_HANDSHAKE_FAILURE:
+        case SSL_AD_HANDSHAKE_FAILURE:
                str = "handshake failure";
                break;
-        case SSL3_AD_NO_CERTIFICATE:
+        case SSL_AD_NO_CERTIFICATE:
                str = "no certificate";
                break;
-        case SSL3_AD_BAD_CERTIFICATE:
+        case SSL_AD_BAD_CERTIFICATE:
                str = "bad certificate";
                break;
-        case SSL3_AD_UNSUPPORTED_CERTIFICATE:
+        case SSL_AD_UNSUPPORTED_CERTIFICATE:
                str = "unsupported certificate";
                break;
-        case SSL3_AD_CERTIFICATE_REVOKED:
+        case SSL_AD_CERTIFICATE_REVOKED:
                str = "certificate revoked";
                break;
-        case SSL3_AD_CERTIFICATE_EXPIRED:
+        case SSL_AD_CERTIFICATE_EXPIRED:
                str = "certificate expired";
                break;
-        case SSL3_AD_CERTIFICATE_UNKNOWN:
+        case SSL_AD_CERTIFICATE_UNKNOWN:
                str = "certificate unknown";
                break;
-        case SSL3_AD_ILLEGAL_PARAMETER:
+        case SSL_AD_ILLEGAL_PARAMETER:
                str = "illegal parameter";
                break;
-        case TLS1_AD_DECRYPTION_FAILED:
+        case SSL_AD_DECRYPTION_FAILED:
                str = "decryption failed";
                break;
-        case TLS1_AD_RECORD_OVERFLOW:
+        case SSL_AD_RECORD_OVERFLOW:
                str = "record overflow";
                break;
-        case TLS1_AD_UNKNOWN_CA:
+        case SSL_AD_UNKNOWN_CA:
                str = "unknown CA";
                break;
-        case TLS1_AD_ACCESS_DENIED:
+        case SSL_AD_ACCESS_DENIED:
                str = "access denied";
                break;
-        case TLS1_AD_DECODE_ERROR:
+        case SSL_AD_DECODE_ERROR:
                str = "decode error";
                break;
-        case TLS1_AD_DECRYPT_ERROR:
+        case SSL_AD_DECRYPT_ERROR:
                str = "decrypt error";
                break;
-        case TLS1_AD_EXPORT_RESTRICTION:
+        case SSL_AD_EXPORT_RESTRICTION:
                str = "export restriction";
                break;
-        case TLS1_AD_PROTOCOL_VERSION:
+        case SSL_AD_PROTOCOL_VERSION:
                str = "protocol version";
                break;
-        case TLS1_AD_INSUFFICIENT_SECURITY:
+        case SSL_AD_INSUFFICIENT_SECURITY:
                str = "insufficient security";
                break;
-        case TLS1_AD_INTERNAL_ERROR:
+        case SSL_AD_INTERNAL_ERROR:
                str = "internal error";
                break;
-        case TLS1_AD_USER_CANCELLED:
+        case SSL_AD_USER_CANCELLED:
                str = "user canceled";
                break;
-        case TLS1_AD_NO_RENEGOTIATION:
+        case SSL_AD_NO_RENEGOTIATION:
                str = "no renegotiation";
                break;
-        case TLS1_AD_UNSUPPORTED_EXTENSION:
+        case SSL_AD_UNSUPPORTED_EXTENSION:
                str = "unsupported extension";
                break;
-        case TLS1_AD_CERTIFICATE_UNOBTAINABLE:
+        case SSL_AD_CERTIFICATE_UNOBTAINABLE:
                str = "certificate unobtainable";
                break;
-        case TLS1_AD_UNRECOGNIZED_NAME:
+        case SSL_AD_UNRECOGNIZED_NAME:
                str = "unrecognized name";
                break;
-        case TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
+        case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
                str = "bad certificate status response";
                break;
-        case TLS1_AD_BAD_CERTIFICATE_HASH_VALUE:
+        case SSL_AD_BAD_CERTIFICATE_HASH_VALUE:
                str = "bad certificate hash value";
                break;
-        case TLS1_AD_UNKNOWN_PSK_IDENTITY:
+        case SSL_AD_UNKNOWN_PSK_IDENTITY:
                str = "unknown PSK identity";
                break;
        default:

diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c index 6b26d4c915..b813ac6896 100644 --- a/src/lib/libssl/ssl_stat.c +++ b/src/lib/libssl/ssl_stat.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: ssl_stat.c,v 1.14 2017/05/07 04:22:24 beck Exp $ */	1	/* $OpenBSD: ssl_stat.c,v 1.15 2021/06/11 17:29:48 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	*
@@ -578,94 +578,94 @@ SSL_alert_desc_string(int value)
578	const char *str;	578	const char *str;
579		579
580	switch (value & 0xff) {	580	switch (value & 0xff) {
581	case SSL3_AD_CLOSE_NOTIFY:	581	case SSL_AD_CLOSE_NOTIFY:
582	str = "CN";	582	str = "CN";
583	break;	583	break;
584	case SSL3_AD_UNEXPECTED_MESSAGE:	584	case SSL_AD_UNEXPECTED_MESSAGE:
585	str = "UM";	585	str = "UM";
586	break;	586	break;
587	case SSL3_AD_BAD_RECORD_MAC:	587	case SSL_AD_BAD_RECORD_MAC:
588	str = "BM";	588	str = "BM";
589	break;	589	break;
590	case SSL3_AD_DECOMPRESSION_FAILURE:	590	case SSL_AD_DECOMPRESSION_FAILURE:
591	str = "DF";	591	str = "DF";
592	break;	592	break;
593	case SSL3_AD_HANDSHAKE_FAILURE:	593	case SSL_AD_HANDSHAKE_FAILURE:
594	str = "HF";	594	str = "HF";
595	break;	595	break;
596	case SSL3_AD_NO_CERTIFICATE:	596	case SSL_AD_NO_CERTIFICATE:
597	str = "NC";	597	str = "NC";
598	break;	598	break;
599	case SSL3_AD_BAD_CERTIFICATE:	599	case SSL_AD_BAD_CERTIFICATE:
600	str = "BC";	600	str = "BC";
601	break;	601	break;
602	case SSL3_AD_UNSUPPORTED_CERTIFICATE:	602	case SSL_AD_UNSUPPORTED_CERTIFICATE:
603	str = "UC";	603	str = "UC";
604	break;	604	break;
605	case SSL3_AD_CERTIFICATE_REVOKED:	605	case SSL_AD_CERTIFICATE_REVOKED:
606	str = "CR";	606	str = "CR";
607	break;	607	break;
608	case SSL3_AD_CERTIFICATE_EXPIRED:	608	case SSL_AD_CERTIFICATE_EXPIRED:
609	str = "CE";	609	str = "CE";
610	break;	610	break;
611	case SSL3_AD_CERTIFICATE_UNKNOWN:	611	case SSL_AD_CERTIFICATE_UNKNOWN:
612	str = "CU";	612	str = "CU";
613	break;	613	break;
614	case SSL3_AD_ILLEGAL_PARAMETER:	614	case SSL_AD_ILLEGAL_PARAMETER:
615	str = "IP";	615	str = "IP";
616	break;	616	break;
617	case TLS1_AD_DECRYPTION_FAILED:	617	case SSL_AD_DECRYPTION_FAILED:
618	str = "DC";	618	str = "DC";
619	break;	619	break;
620	case TLS1_AD_RECORD_OVERFLOW:	620	case SSL_AD_RECORD_OVERFLOW:
621	str = "RO";	621	str = "RO";
622	break;	622	break;
623	case TLS1_AD_UNKNOWN_CA:	623	case SSL_AD_UNKNOWN_CA:
624	str = "CA";	624	str = "CA";
625	break;	625	break;
626	case TLS1_AD_ACCESS_DENIED:	626	case SSL_AD_ACCESS_DENIED:
627	str = "AD";	627	str = "AD";
628	break;	628	break;
629	case TLS1_AD_DECODE_ERROR:	629	case SSL_AD_DECODE_ERROR:
630	str = "DE";	630	str = "DE";
631	break;	631	break;
632	case TLS1_AD_DECRYPT_ERROR:	632	case SSL_AD_DECRYPT_ERROR:
633	str = "CY";	633	str = "CY";
634	break;	634	break;
635	case TLS1_AD_EXPORT_RESTRICTION:	635	case SSL_AD_EXPORT_RESTRICTION:
636	str = "ER";	636	str = "ER";
637	break;	637	break;
638	case TLS1_AD_PROTOCOL_VERSION:	638	case SSL_AD_PROTOCOL_VERSION:
639	str = "PV";	639	str = "PV";
640	break;	640	break;
641	case TLS1_AD_INSUFFICIENT_SECURITY:	641	case SSL_AD_INSUFFICIENT_SECURITY:
642	str = "IS";	642	str = "IS";
643	break;	643	break;
644	case TLS1_AD_INTERNAL_ERROR:	644	case SSL_AD_INTERNAL_ERROR:
645	str = "IE";	645	str = "IE";
646	break;	646	break;
647	case TLS1_AD_USER_CANCELLED:	647	case SSL_AD_USER_CANCELLED:
648	str = "US";	648	str = "US";
649	break;	649	break;
650	case TLS1_AD_NO_RENEGOTIATION:	650	case SSL_AD_NO_RENEGOTIATION:
651	str = "NR";	651	str = "NR";
652	break;	652	break;
653	case TLS1_AD_UNSUPPORTED_EXTENSION:	653	case SSL_AD_UNSUPPORTED_EXTENSION:
654	str = "UE";	654	str = "UE";
655	break;	655	break;
656	case TLS1_AD_CERTIFICATE_UNOBTAINABLE:	656	case SSL_AD_CERTIFICATE_UNOBTAINABLE:
657	str = "CO";	657	str = "CO";
658	break;	658	break;
659	case TLS1_AD_UNRECOGNIZED_NAME:	659	case SSL_AD_UNRECOGNIZED_NAME:
660	str = "UN";	660	str = "UN";
661	break;	661	break;
662	case TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE:	662	case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
663	str = "BR";	663	str = "BR";
664	break;	664	break;
665	case TLS1_AD_BAD_CERTIFICATE_HASH_VALUE:	665	case SSL_AD_BAD_CERTIFICATE_HASH_VALUE:
666	str = "BH";	666	str = "BH";
667	break;	667	break;
668	case TLS1_AD_UNKNOWN_PSK_IDENTITY:	668	case SSL_AD_UNKNOWN_PSK_IDENTITY:
669	str = "UP";	669	str = "UP";
670	break;	670	break;
671	default:	671	default:
@@ -681,94 +681,94 @@ SSL_alert_desc_string_long(int value)
681	const char *str;	681	const char *str;
682		682
683	switch (value & 0xff) {	683	switch (value & 0xff) {
684	case SSL3_AD_CLOSE_NOTIFY:	684	case SSL_AD_CLOSE_NOTIFY:
685	str = "close notify";	685	str = "close notify";
686	break;	686	break;
687	case SSL3_AD_UNEXPECTED_MESSAGE:	687	case SSL_AD_UNEXPECTED_MESSAGE:
688	str = "unexpected_message";	688	str = "unexpected_message";
689	break;	689	break;
690	case SSL3_AD_BAD_RECORD_MAC:	690	case SSL_AD_BAD_RECORD_MAC:
691	str = "bad record mac";	691	str = "bad record mac";
692	break;	692	break;
693	case SSL3_AD_DECOMPRESSION_FAILURE:	693	case SSL_AD_DECOMPRESSION_FAILURE:
694	str = "decompression failure";	694	str = "decompression failure";
695	break;	695	break;
696	case SSL3_AD_HANDSHAKE_FAILURE:	696	case SSL_AD_HANDSHAKE_FAILURE:
697	str = "handshake failure";	697	str = "handshake failure";
698	break;	698	break;
699	case SSL3_AD_NO_CERTIFICATE:	699	case SSL_AD_NO_CERTIFICATE:
700	str = "no certificate";	700	str = "no certificate";
701	break;	701	break;
702	case SSL3_AD_BAD_CERTIFICATE:	702	case SSL_AD_BAD_CERTIFICATE:
703	str = "bad certificate";	703	str = "bad certificate";
704	break;	704	break;
705	case SSL3_AD_UNSUPPORTED_CERTIFICATE:	705	case SSL_AD_UNSUPPORTED_CERTIFICATE:
706	str = "unsupported certificate";	706	str = "unsupported certificate";
707	break;	707	break;
708	case SSL3_AD_CERTIFICATE_REVOKED:	708	case SSL_AD_CERTIFICATE_REVOKED:
709	str = "certificate revoked";	709	str = "certificate revoked";
710	break;	710	break;
711	case SSL3_AD_CERTIFICATE_EXPIRED:	711	case SSL_AD_CERTIFICATE_EXPIRED:
712	str = "certificate expired";	712	str = "certificate expired";
713	break;	713	break;
714	case SSL3_AD_CERTIFICATE_UNKNOWN:	714	case SSL_AD_CERTIFICATE_UNKNOWN:
715	str = "certificate unknown";	715	str = "certificate unknown";
716	break;	716	break;
717	case SSL3_AD_ILLEGAL_PARAMETER:	717	case SSL_AD_ILLEGAL_PARAMETER:
718	str = "illegal parameter";	718	str = "illegal parameter";
719	break;	719	break;
720	case TLS1_AD_DECRYPTION_FAILED:	720	case SSL_AD_DECRYPTION_FAILED:
721	str = "decryption failed";	721	str = "decryption failed";
722	break;	722	break;
723	case TLS1_AD_RECORD_OVERFLOW:	723	case SSL_AD_RECORD_OVERFLOW:
724	str = "record overflow";	724	str = "record overflow";
725	break;	725	break;
726	case TLS1_AD_UNKNOWN_CA:	726	case SSL_AD_UNKNOWN_CA:
727	str = "unknown CA";	727	str = "unknown CA";
728	break;	728	break;
729	case TLS1_AD_ACCESS_DENIED:	729	case SSL_AD_ACCESS_DENIED:
730	str = "access denied";	730	str = "access denied";
731	break;	731	break;
732	case TLS1_AD_DECODE_ERROR:	732	case SSL_AD_DECODE_ERROR:
733	str = "decode error";	733	str = "decode error";
734	break;	734	break;
735	case TLS1_AD_DECRYPT_ERROR:	735	case SSL_AD_DECRYPT_ERROR:
736	str = "decrypt error";	736	str = "decrypt error";
737	break;	737	break;
738	case TLS1_AD_EXPORT_RESTRICTION:	738	case SSL_AD_EXPORT_RESTRICTION:
739	str = "export restriction";	739	str = "export restriction";
740	break;	740	break;
741	case TLS1_AD_PROTOCOL_VERSION:	741	case SSL_AD_PROTOCOL_VERSION:
742	str = "protocol version";	742	str = "protocol version";
743	break;	743	break;
744	case TLS1_AD_INSUFFICIENT_SECURITY:	744	case SSL_AD_INSUFFICIENT_SECURITY:
745	str = "insufficient security";	745	str = "insufficient security";
746	break;	746	break;
747	case TLS1_AD_INTERNAL_ERROR:	747	case SSL_AD_INTERNAL_ERROR:
748	str = "internal error";	748	str = "internal error";
749	break;	749	break;
750	case TLS1_AD_USER_CANCELLED:	750	case SSL_AD_USER_CANCELLED:
751	str = "user canceled";	751	str = "user canceled";
752	break;	752	break;
753	case TLS1_AD_NO_RENEGOTIATION:	753	case SSL_AD_NO_RENEGOTIATION:
754	str = "no renegotiation";	754	str = "no renegotiation";
755	break;	755	break;
756	case TLS1_AD_UNSUPPORTED_EXTENSION:	756	case SSL_AD_UNSUPPORTED_EXTENSION:
757	str = "unsupported extension";	757	str = "unsupported extension";
758	break;	758	break;
759	case TLS1_AD_CERTIFICATE_UNOBTAINABLE:	759	case SSL_AD_CERTIFICATE_UNOBTAINABLE:
760	str = "certificate unobtainable";	760	str = "certificate unobtainable";
761	break;	761	break;
762	case TLS1_AD_UNRECOGNIZED_NAME:	762	case SSL_AD_UNRECOGNIZED_NAME:
763	str = "unrecognized name";	763	str = "unrecognized name";
764	break;	764	break;
765	case TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE:	765	case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
766	str = "bad certificate status response";	766	str = "bad certificate status response";
767	break;	767	break;
768	case TLS1_AD_BAD_CERTIFICATE_HASH_VALUE:	768	case SSL_AD_BAD_CERTIFICATE_HASH_VALUE:
769	str = "bad certificate hash value";	769	str = "bad certificate hash value";
770	break;	770	break;
771	case TLS1_AD_UNKNOWN_PSK_IDENTITY:	771	case SSL_AD_UNKNOWN_PSK_IDENTITY:
772	str = "unknown PSK identity";	772	str = "unknown PSK identity";
773	break;	773	break;
774	default:	774	default: