Remove SSL_R_PAKE_AND_KEY_SHARE_NOT_ALLOWED This error is never used, and collided with alert numbers. Change-Id: I54d2348b83a154bb799a245b5a0ba1ec206ef279 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/93668 Reviewed-by: Lily Chen <chlily@google.com> Auto-Submit: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Lily Chen <chlily@google.com>
diff --git a/crypto/err/ssl.errordata b/crypto/err/ssl.errordata index a2c591f..4f1d77a 100644 --- a/crypto/err/ssl.errordata +++ b/crypto/err/ssl.errordata
@@ -144,7 +144,6 @@ SSL,268,OLD_SESSION_PRF_HASH_MISMATCH SSL,188,OLD_SESSION_VERSION_NOT_RETURNED SSL,189,OUTPUT_ALIASES_INPUT -SSL,1122,PAKE_AND_KEY_SHARE_NOT_ALLOWED SSL,325,PAKE_EXHAUSTED SSL,190,PARSE_TLSEXT SSL,191,PATH_TOO_LONG
diff --git a/gen/crypto/err_data.cc b/gen/crypto/err_data.cc index a45514d..7b4cefb 100644 --- a/gen/crypto/err_data.cc +++ b/gen/crypto/err_data.cc
@@ -205,51 +205,51 @@ 0x283500f7, 0x28358cc1, 0x2836099a, - 0x2c3234e5, + 0x2c3234c6, 0x2c32943b, - 0x2c3334f3, - 0x2c33b505, - 0x2c343519, - 0x2c34b52b, - 0x2c353546, - 0x2c35b558, - 0x2c363588, + 0x2c3334d4, + 0x2c33b4e6, + 0x2c3434fa, + 0x2c34b50c, + 0x2c353527, + 0x2c35b539, + 0x2c363569, 0x2c36833a, - 0x2c373595, - 0x2c37b5c1, - 0x2c3835ff, - 0x2c38b616, - 0x2c393634, - 0x2c39b644, - 0x2c3a3656, - 0x2c3ab66a, - 0x2c3b367b, - 0x2c3bb69a, + 0x2c373576, + 0x2c37b5a2, + 0x2c3835e0, + 0x2c38b5f7, + 0x2c393615, + 0x2c39b625, + 0x2c3a3637, + 0x2c3ab64b, + 0x2c3b365c, + 0x2c3bb67b, 0x2c3c144d, 0x2c3c9463, - 0x2c3d36df, + 0x2c3d36c0, 0x2c3d947c, - 0x2c3e3709, - 0x2c3eb717, - 0x2c3f372f, - 0x2c3fb747, - 0x2c403771, + 0x2c3e36ea, + 0x2c3eb6f8, + 0x2c3f3710, + 0x2c3fb728, + 0x2c403752, 0x2c409330, - 0x2c413782, - 0x2c41b795, + 0x2c413763, + 0x2c41b776, 0x2c4212f6, - 0x2c42b7a6, + 0x2c42b787, 0x2c43076d, - 0x2c43b68c, - 0x2c4435d4, - 0x2c44b754, - 0x2c45356b, - 0x2c45b5a7, - 0x2c463624, - 0x2c46b6ae, - 0x2c4736c3, - 0x2c47b6fc, - 0x2c4835e6, + 0x2c43b66d, + 0x2c4435b5, + 0x2c44b735, + 0x2c45354c, + 0x2c45b588, + 0x2c463605, + 0x2c46b68f, + 0x2c4736a4, + 0x2c47b6dd, + 0x2c4835c7, 0x30320000, 0x30328015, 0x3033001f, @@ -477,69 +477,69 @@ 0x405da6da, 0x405e2718, 0x405e8afe, - 0x405f2767, - 0x405fa774, - 0x40602782, - 0x4060a7a4, - 0x40612818, - 0x4061a850, - 0x40622867, - 0x4062a878, - 0x406328c5, - 0x4063a8da, - 0x406428f1, - 0x4064a91d, - 0x40652938, - 0x4065a94f, - 0x40662967, - 0x4066a991, - 0x406729bc, - 0x4067aa01, - 0x40682a49, - 0x4068aa6a, - 0x40692a9c, - 0x4069aaca, - 0x406a2aeb, - 0x406aab0b, - 0x406b2c93, - 0x406bacb6, - 0x406c2ccc, - 0x406cafd6, - 0x406d3005, - 0x406db02d, - 0x406e305b, - 0x406eb0a8, - 0x406f3101, - 0x406fb139, - 0x4070314c, - 0x4070b169, + 0x405f2748, + 0x405fa755, + 0x40602763, + 0x4060a785, + 0x406127f9, + 0x4061a831, + 0x40622848, + 0x4062a859, + 0x406328a6, + 0x4063a8bb, + 0x406428d2, + 0x4064a8fe, + 0x40652919, + 0x4065a930, + 0x40662948, + 0x4066a972, + 0x4067299d, + 0x4067a9e2, + 0x40682a2a, + 0x4068aa4b, + 0x40692a7d, + 0x4069aaab, + 0x406a2acc, + 0x406aaaec, + 0x406b2c74, + 0x406bac97, + 0x406c2cad, + 0x406cafb7, + 0x406d2fe6, + 0x406db00e, + 0x406e303c, + 0x406eb089, + 0x406f30e2, + 0x406fb11a, + 0x4070312d, + 0x4070b14a, 0x4071084d, - 0x4071b17b, - 0x4072318e, - 0x4072b1c4, - 0x407331dc, + 0x4071b15c, + 0x4072316f, + 0x4072b1a5, + 0x407331bd, 0x40739665, - 0x407431f0, - 0x4074b20a, - 0x4075321b, - 0x4075b22f, - 0x4076323d, + 0x407431d1, + 0x4074b1eb, + 0x407531fc, + 0x4075b210, + 0x4076321e, 0x407693f3, - 0x4077327a, - 0x4077b2d6, - 0x407832f1, - 0x4078b32a, - 0x40793341, - 0x4079b357, - 0x407a3383, - 0x407ab396, - 0x407b33ab, - 0x407bb3bd, - 0x407c33ee, - 0x407cb3f7, - 0x407d2a85, + 0x4077325b, + 0x4077b2b7, + 0x407832d2, + 0x4078b30b, + 0x40793322, + 0x4079b338, + 0x407a3364, + 0x407ab377, + 0x407b338c, + 0x407bb39e, + 0x407c33cf, + 0x407cb3d8, + 0x407d2a66, 0x407da2ef, - 0x407e3306, + 0x407e32e7, 0x407ea5a4, 0x407f1eca, 0x407fa0ad, @@ -547,58 +547,58 @@ 0x40809ef2, 0x40812412, 0x4081a1b4, - 0x40823046, + 0x40823027, 0x40829c45, 0x4083257f, - 0x4083a902, + 0x4083a8e3, 0x40841f16, 0x4084a5dc, 0x40852664, - 0x4085a7df, + 0x4085a7c0, 0x408626fa, 0x4086a33b, - 0x4087308c, - 0x4087a82d, + 0x4087306d, + 0x4087a80e, 0x40881c83, - 0x4088aa14, + 0x4088a9f5, 0x40891cd2, 0x40899c5f, - 0x408a2d04, + 0x408a2ce5, 0x408a9a7d, - 0x408b33d2, - 0x408bb116, + 0x408b33b3, + 0x408bb0f7, 0x408c268a, 0x408d1ffe, 0x408d9f48, 0x408e212e, 0x408ea4cf, - 0x408f2a28, - 0x408fa7fb, - 0x409029dd, + 0x408f2a09, + 0x408fa7dc, + 0x409029be, 0x4090a6cc, - 0x40912cec, + 0x40912ccd, 0x40919ab5, 0x40921d1f, - 0x4092b0c7, - 0x409331a7, + 0x4092b0a8, + 0x40933188, 0x4093a34c, 0x40941f2a, - 0x4094ad1d, - 0x40952889, - 0x4095b363, - 0x40963073, + 0x4094acfe, + 0x4095286a, + 0x4095b344, + 0x40963054, 0x4096a27a, 0x409723cc, 0x4097a17d, 0x40981d7f, - 0x4098a89d, - 0x409930e3, + 0x4098a87e, + 0x409930c4, 0x4099a4fc, 0x409a2495, 0x409a9a99, 0x409b1f84, 0x409b9faf, - 0x409c32b8, + 0x409c3299, 0x409c9fd7, 0x409d2236, 0x409da1ca, @@ -611,53 +611,52 @@ 0x40a121e5, 0x40a1a5f0, 0x40a22368, - 0x40a2a758, - 0x40a327cc, - 0x40a3b29c, + 0x40a2a739, + 0x40a327ad, + 0x40a3b27d, 0x40a423b2, 0x40a4a1fc, 0x40a51f06, 0x40a5a309, 0x40a62674, 0x40a6a21e, - 0x40a73262, + 0x40a73243, 0x40a7a406, 0x40a82324, - 0x41f42bbe, - 0x41f92c50, - 0x41fe2b43, - 0x41feadf9, - 0x41ff2f27, - 0x42032bd7, - 0x42082bf9, - 0x4208ac35, - 0x42092b27, - 0x4209ac6f, - 0x420a2b7e, - 0x420aab5e, - 0x420b2b9e, - 0x420bac17, - 0x420c2f43, - 0x420cad2d, - 0x420d2de0, - 0x420dae17, - 0x42122e4a, - 0x42172f0a, - 0x4217ae8c, - 0x421c2eae, - 0x421f2e69, - 0x42212fbb, - 0x42262eed, - 0x422b2f99, - 0x422badbb, - 0x422c2f7b, - 0x422cad6e, - 0x422d2d47, - 0x422daf5a, - 0x422e2d9a, - 0x42302ec9, - 0x4230ae31, - 0x42312739, + 0x41f42b9f, + 0x41f92c31, + 0x41fe2b24, + 0x41feadda, + 0x41ff2f08, + 0x42032bb8, + 0x42082bda, + 0x4208ac16, + 0x42092b08, + 0x4209ac50, + 0x420a2b5f, + 0x420aab3f, + 0x420b2b7f, + 0x420babf8, + 0x420c2f24, + 0x420cad0e, + 0x420d2dc1, + 0x420dadf8, + 0x42122e2b, + 0x42172eeb, + 0x4217ae6d, + 0x421c2e8f, + 0x421f2e4a, + 0x42212f9c, + 0x42262ece, + 0x422b2f7a, + 0x422bad9c, + 0x422c2f5c, + 0x422cad4f, + 0x422d2d28, + 0x422daf3b, + 0x422e2d7b, + 0x42302eaa, + 0x4230ae12, 0x44320778, 0x44328787, 0x44330793, @@ -713,71 +712,71 @@ 0x4c419545, 0x4c4216ae, 0x4c42948d, - 0x503237b8, - 0x5032b7c7, - 0x503337d2, - 0x5033b7e2, - 0x503437fb, - 0x5034b815, - 0x50353823, - 0x5035b839, - 0x5036384b, - 0x5036b861, - 0x5037387a, - 0x5037b88d, - 0x503838a5, - 0x5038b8b6, - 0x503938cb, - 0x5039b8df, - 0x503a38ff, - 0x503ab915, - 0x503b392d, - 0x503bb93f, - 0x503c395b, - 0x503cb972, - 0x503d398b, - 0x503db9a1, - 0x503e39ae, - 0x503eb9c4, - 0x503f39d6, + 0x50323799, + 0x5032b7a8, + 0x503337b3, + 0x5033b7c3, + 0x503437dc, + 0x5034b7f6, + 0x50353804, + 0x5035b81a, + 0x5036382c, + 0x5036b842, + 0x5037385b, + 0x5037b86e, + 0x50383886, + 0x5038b897, + 0x503938ac, + 0x5039b8c0, + 0x503a38e0, + 0x503ab8f6, + 0x503b390e, + 0x503bb920, + 0x503c393c, + 0x503cb953, + 0x503d396c, + 0x503db982, + 0x503e398f, + 0x503eb9a5, + 0x503f39b7, 0x503f83b3, - 0x504039e9, - 0x5040b9f9, - 0x50413a13, - 0x5041ba22, - 0x50423a3c, - 0x5042ba59, - 0x50433a69, - 0x5043ba79, - 0x50443a96, + 0x504039ca, + 0x5040b9da, + 0x504139f4, + 0x5041ba03, + 0x50423a1d, + 0x5042ba3a, + 0x50433a4a, + 0x5043ba5a, + 0x50443a77, 0x50448469, - 0x50453aaa, - 0x5045bac8, - 0x50463adb, - 0x5046baf1, - 0x50473b03, - 0x5047bb18, - 0x50483b3e, - 0x5048bb4c, - 0x50493b5f, - 0x5049bb74, - 0x504a3b8a, - 0x504abb9a, - 0x504b3bba, - 0x504bbbcd, - 0x504c3bf0, - 0x504cbc1e, - 0x504d3c4b, - 0x504dbc68, - 0x504e3c83, - 0x504ebc9f, - 0x504f3cb1, - 0x504fbcc8, - 0x50503cd7, + 0x50453a8b, + 0x5045baa9, + 0x50463abc, + 0x5046bad2, + 0x50473ae4, + 0x5047baf9, + 0x50483b1f, + 0x5048bb2d, + 0x50493b40, + 0x5049bb55, + 0x504a3b6b, + 0x504abb7b, + 0x504b3b9b, + 0x504bbbae, + 0x504c3bd1, + 0x504cbbff, + 0x504d3c2c, + 0x504dbc49, + 0x504e3c64, + 0x504ebc80, + 0x504f3c92, + 0x504fbca9, + 0x50503cb8, 0x50508729, - 0x50513cea, - 0x5051ba88, - 0x50523c30, + 0x50513ccb, + 0x5051ba69, + 0x50523c11, 0x58321011, 0x68320fd3, 0x68328d2b, @@ -822,19 +821,19 @@ 0x7c32130c, 0x80321558, 0x80328090, - 0x803334b4, + 0x80333495, 0x803380b9, - 0x803434c3, - 0x8034b42b, - 0x80353449, - 0x8035b4d7, - 0x8036348b, - 0x8036b43a, - 0x8037347d, - 0x8037b418, - 0x8038349e, - 0x8038b45a, - 0x8039346f, + 0x803434a4, + 0x8034b40c, + 0x8035342a, + 0x8035b4b8, + 0x8036346c, + 0x8036b41b, + 0x8037345e, + 0x8037b3f9, + 0x8038347f, + 0x8038b43b, + 0x80393450, 0x84320bb0, 0x84328bc9, }; @@ -1327,7 +1326,6 @@ "OLD_SESSION_CIPHER_NOT_RETURNED\0" "OLD_SESSION_PRF_HASH_MISMATCH\0" "OLD_SESSION_VERSION_NOT_RETURNED\0" - "PAKE_AND_KEY_SHARE_NOT_ALLOWED\0" "PAKE_EXHAUSTED\0" "PARSE_TLSEXT\0" "PATH_TOO_LONG\0"
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index eba1bd4..182cef2 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h
@@ -7004,6 +7004,5 @@ #define SSL_R_TLSV1_ALERT_CERTIFICATE_REQUIRED 1116 #define SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL 1120 #define SSL_R_TLSV1_ALERT_ECH_REQUIRED 1121 -#define SSL_R_PAKE_AND_KEY_SHARE_NOT_ALLOWED 1122 #endif // OPENSSL_HEADER_SSL_H
diff --git a/rust/bssl-tls/src/errors.rs b/rust/bssl-tls/src/errors.rs index dec5575..66d0c0d 100644 --- a/rust/bssl-tls/src/errors.rs +++ b/rust/bssl-tls/src/errors.rs
@@ -706,8 +706,6 @@ Tlsv1AlertNoApplicationProtocol = bssl_sys::SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL as i32, /// `SSL_R_TLSV1_ALERT_ECH_REQUIRED` Tlsv1AlertEchRequired = bssl_sys::SSL_R_TLSV1_ALERT_ECH_REQUIRED as i32, - /// `SSL_R_PAKE_AND_KEY_SHARE_NOT_ALLOWED` - PakeAndKeyShareNotAllowed = bssl_sys::SSL_R_PAKE_AND_KEY_SHARE_NOT_ALLOWED as i32, } }