Remove the old SSL_R_APPLICATION_DATA_INSTEAD_OF_HANDSHAKE logic
Back when we were deploying TLS 1.3, we were tracking how often some
buggy middlebox interfered with the new TLS version and prevented sites
from upgrading.
One middlebox's failure mode was that they dropped ServerHello and
passed the remaining records through. This error code was caught by
Chromium to histogram. TLS 1.3 has long since been deployed, and we've
dropped that histogramming code, so remove this special case.
See https://crbug.com/41325349 for some of the history here.
Change-Id: I70c1ada1ed3d9ba73dfe75213a0233e407599c98
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/73548
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
diff --git a/crypto/err/ssl.errordata b/crypto/err/ssl.errordata
index a8e6e08..528110c 100644
--- a/crypto/err/ssl.errordata
+++ b/crypto/err/ssl.errordata
@@ -1,6 +1,5 @@
SSL,277,ALPN_MISMATCH_ON_EARLY_DATA
SSL,309,ALPS_MISMATCH_ON_EARLY_DATA
-SSL,281,APPLICATION_DATA_INSTEAD_OF_HANDSHAKE
SSL,291,APPLICATION_DATA_ON_SHUTDOWN
SSL,100,APP_DATA_IN_HANDSHAKE
SSL,101,ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT
diff --git a/gen/crypto/err_data.c b/gen/crypto/err_data.c
index 665423b..ac2740a 100644
--- a/gen/crypto/err_data.c
+++ b/gen/crypto/err_data.c
@@ -196,51 +196,51 @@
0x283500f7,
0x28358c81,
0x2836099a,
- 0x2c3232fa,
+ 0x2c3232d4,
0x2c329385,
- 0x2c333308,
- 0x2c33b31a,
- 0x2c34332e,
- 0x2c34b340,
- 0x2c35335b,
- 0x2c35b36d,
- 0x2c36339d,
+ 0x2c3332e2,
+ 0x2c33b2f4,
+ 0x2c343308,
+ 0x2c34b31a,
+ 0x2c353335,
+ 0x2c35b347,
+ 0x2c363377,
0x2c36833a,
- 0x2c3733aa,
- 0x2c37b3d6,
- 0x2c383414,
- 0x2c38b42b,
- 0x2c393449,
- 0x2c39b459,
- 0x2c3a346b,
- 0x2c3ab47f,
- 0x2c3b3490,
- 0x2c3bb4af,
+ 0x2c373384,
+ 0x2c37b3b0,
+ 0x2c3833ee,
+ 0x2c38b405,
+ 0x2c393423,
+ 0x2c39b433,
+ 0x2c3a3445,
+ 0x2c3ab459,
+ 0x2c3b346a,
+ 0x2c3bb489,
0x2c3c1397,
0x2c3c93ad,
- 0x2c3d34f4,
+ 0x2c3d34ce,
0x2c3d93c6,
- 0x2c3e351e,
- 0x2c3eb52c,
- 0x2c3f3544,
- 0x2c3fb55c,
- 0x2c403586,
+ 0x2c3e34f8,
+ 0x2c3eb506,
+ 0x2c3f351e,
+ 0x2c3fb536,
+ 0x2c403560,
0x2c409298,
- 0x2c413597,
- 0x2c41b5aa,
+ 0x2c413571,
+ 0x2c41b584,
0x2c42125e,
- 0x2c42b5bb,
+ 0x2c42b595,
0x2c43076d,
- 0x2c43b4a1,
- 0x2c4433e9,
- 0x2c44b569,
- 0x2c453380,
- 0x2c45b3bc,
- 0x2c463439,
- 0x2c46b4c3,
- 0x2c4734d8,
- 0x2c47b511,
- 0x2c4833fb,
+ 0x2c43b47b,
+ 0x2c4433c3,
+ 0x2c44b543,
+ 0x2c45335a,
+ 0x2c45b396,
+ 0x2c463413,
+ 0x2c46b49d,
+ 0x2c4734b2,
+ 0x2c47b4eb,
+ 0x2c4833d5,
0x30320000,
0x30328015,
0x3033001f,
@@ -380,261 +380,260 @@
0x3c418dd3,
0x3c420edf,
0x3c428e69,
- 0x40321a42,
- 0x40329a58,
- 0x40331a86,
- 0x40339a90,
- 0x40341aa7,
- 0x40349ac5,
- 0x40351ad5,
- 0x40359ae7,
- 0x40361af4,
- 0x40369b00,
- 0x40371b15,
- 0x40379b27,
- 0x40381b32,
- 0x40389b44,
+ 0x40321a1c,
+ 0x40329a32,
+ 0x40331a60,
+ 0x40339a6a,
+ 0x40341a81,
+ 0x40349a9f,
+ 0x40351aaf,
+ 0x40359ac1,
+ 0x40361ace,
+ 0x40369ada,
+ 0x40371aef,
+ 0x40379b01,
+ 0x40381b0c,
+ 0x40389b1e,
0x40390f93,
- 0x40399b54,
- 0x403a1b67,
- 0x403a9b88,
- 0x403b1b99,
- 0x403b9ba9,
+ 0x40399b2e,
+ 0x403a1b41,
+ 0x403a9b62,
+ 0x403b1b73,
+ 0x403b9b83,
0x403c0071,
0x403c8090,
- 0x403d1c0a,
- 0x403d9c20,
- 0x403e1c2f,
- 0x403e9c67,
- 0x403f1c81,
- 0x403f9ca9,
- 0x40401cbe,
- 0x40409cd2,
- 0x40411d0d,
- 0x40419d28,
- 0x40421d41,
- 0x40429d54,
- 0x40431d68,
- 0x40439d96,
- 0x40441dad,
+ 0x403d1be4,
+ 0x403d9bfa,
+ 0x403e1c09,
+ 0x403e9c41,
+ 0x403f1c5b,
+ 0x403f9c83,
+ 0x40401c98,
+ 0x40409cac,
+ 0x40411ce7,
+ 0x40419d02,
+ 0x40421d1b,
+ 0x40429d2e,
+ 0x40431d42,
+ 0x40439d70,
+ 0x40441d87,
0x404480b9,
- 0x40451dc2,
- 0x40459dd4,
- 0x40461df8,
- 0x40469e18,
- 0x40471e26,
- 0x40479e4d,
- 0x40481ebe,
- 0x40489f78,
- 0x40491f8f,
- 0x40499fa9,
- 0x404a1fc0,
- 0x404a9fde,
- 0x404b1ff6,
- 0x404ba023,
- 0x404c2039,
- 0x404ca04b,
- 0x404d206c,
- 0x404da0a5,
- 0x404e20b9,
- 0x404ea0c6,
- 0x404f2177,
- 0x404fa1ed,
- 0x4050225c,
- 0x4050a270,
- 0x405122a3,
- 0x405222b3,
- 0x4052a2d7,
- 0x405322ef,
- 0x4053a302,
- 0x40542317,
- 0x4054a33a,
- 0x40552365,
- 0x4055a3a2,
- 0x405623c7,
- 0x4056a3e0,
- 0x405723f8,
- 0x4057a40b,
- 0x40582420,
- 0x4058a447,
- 0x40592476,
- 0x4059a4a3,
- 0x405aa4b7,
- 0x405b24cf,
- 0x405ba4e0,
- 0x405c24f3,
- 0x405ca532,
- 0x405d253f,
- 0x405da564,
- 0x405e25a2,
+ 0x40451d9c,
+ 0x40459dae,
+ 0x40461dd2,
+ 0x40469df2,
+ 0x40471e00,
+ 0x40479e27,
+ 0x40481e98,
+ 0x40489f52,
+ 0x40491f69,
+ 0x40499f83,
+ 0x404a1f9a,
+ 0x404a9fb8,
+ 0x404b1fd0,
+ 0x404b9ffd,
+ 0x404c2013,
+ 0x404ca025,
+ 0x404d2046,
+ 0x404da07f,
+ 0x404e2093,
+ 0x404ea0a0,
+ 0x404f2151,
+ 0x404fa1c7,
+ 0x40502236,
+ 0x4050a24a,
+ 0x4051227d,
+ 0x4052228d,
+ 0x4052a2b1,
+ 0x405322c9,
+ 0x4053a2dc,
+ 0x405422f1,
+ 0x4054a314,
+ 0x4055233f,
+ 0x4055a37c,
+ 0x405623a1,
+ 0x4056a3ba,
+ 0x405723d2,
+ 0x4057a3e5,
+ 0x405823fa,
+ 0x4058a421,
+ 0x40592450,
+ 0x4059a47d,
+ 0x405aa491,
+ 0x405b24a9,
+ 0x405ba4ba,
+ 0x405c24cd,
+ 0x405ca50c,
+ 0x405d2519,
+ 0x405da53e,
+ 0x405e257c,
0x405e8afe,
- 0x405f25c3,
- 0x405fa5d0,
- 0x406025de,
- 0x4060a600,
- 0x40612661,
- 0x4061a699,
- 0x406226b0,
- 0x4062a6c1,
- 0x4063270e,
- 0x4063a723,
- 0x4064273a,
- 0x4064a766,
- 0x40652781,
- 0x4065a798,
- 0x406627b0,
- 0x4066a7da,
- 0x40672805,
- 0x4067a84a,
- 0x40682892,
- 0x4068a8b3,
- 0x406928e5,
- 0x4069a913,
- 0x406a2934,
- 0x406aa954,
- 0x406b2adc,
- 0x406baaff,
- 0x406c2b15,
- 0x406cae1f,
- 0x406d2e4e,
- 0x406dae76,
- 0x406e2ea4,
- 0x406eaef1,
- 0x406f2f4a,
- 0x406faf82,
- 0x40702f95,
- 0x4070afb2,
+ 0x405f259d,
+ 0x405fa5aa,
+ 0x406025b8,
+ 0x4060a5da,
+ 0x4061263b,
+ 0x4061a673,
+ 0x4062268a,
+ 0x4062a69b,
+ 0x406326e8,
+ 0x4063a6fd,
+ 0x40642714,
+ 0x4064a740,
+ 0x4065275b,
+ 0x4065a772,
+ 0x4066278a,
+ 0x4066a7b4,
+ 0x406727df,
+ 0x4067a824,
+ 0x4068286c,
+ 0x4068a88d,
+ 0x406928bf,
+ 0x4069a8ed,
+ 0x406a290e,
+ 0x406aa92e,
+ 0x406b2ab6,
+ 0x406baad9,
+ 0x406c2aef,
+ 0x406cadf9,
+ 0x406d2e28,
+ 0x406dae50,
+ 0x406e2e7e,
+ 0x406eaecb,
+ 0x406f2f24,
+ 0x406faf5c,
+ 0x40702f6f,
+ 0x4070af8c,
0x4071084d,
- 0x4071afc4,
- 0x40722fd7,
- 0x4072b00d,
- 0x40733025,
+ 0x4071af9e,
+ 0x40722fb1,
+ 0x4072afe7,
+ 0x40732fff,
0x407395af,
- 0x40743039,
- 0x4074b053,
- 0x40753064,
- 0x4075b078,
- 0x40763086,
+ 0x40743013,
+ 0x4074b02d,
+ 0x4075303e,
+ 0x4075b052,
+ 0x40763060,
0x4076935b,
- 0x407730ab,
- 0x4077b0eb,
- 0x40783106,
- 0x4078b13f,
- 0x40793156,
- 0x4079b16c,
- 0x407a3198,
- 0x407ab1ab,
- 0x407b31c0,
- 0x407bb1d2,
- 0x407c3203,
- 0x407cb20c,
- 0x407d28ce,
- 0x407da215,
- 0x407e311b,
- 0x407ea457,
- 0x407f1e3a,
- 0x407fa00d,
- 0x40802187,
- 0x40809e62,
- 0x408122c5,
- 0x4081a114,
- 0x40822e8f,
- 0x40829bb5,
- 0x40832432,
- 0x4083a74b,
- 0x40841e76,
- 0x4084a48f,
- 0x40852504,
- 0x4085a628,
- 0x40862584,
- 0x4086a22f,
- 0x40872ed5,
- 0x4087a676,
- 0x40881bf3,
- 0x4088a85d,
- 0x40891c42,
- 0x40899bcf,
- 0x408a2b4d,
+ 0x40773085,
+ 0x4077b0c5,
+ 0x407830e0,
+ 0x4078b119,
+ 0x40793130,
+ 0x4079b146,
+ 0x407a3172,
+ 0x407ab185,
+ 0x407b319a,
+ 0x407bb1ac,
+ 0x407c31dd,
+ 0x407cb1e6,
+ 0x407d28a8,
+ 0x407da1ef,
+ 0x407e30f5,
+ 0x407ea431,
+ 0x407f1e14,
+ 0x407f9fe7,
+ 0x40802161,
+ 0x40809e3c,
+ 0x4081229f,
+ 0x4081a0ee,
+ 0x40822e69,
+ 0x40829b8f,
+ 0x4083240c,
+ 0x4083a725,
+ 0x40841e50,
+ 0x4084a469,
+ 0x408524de,
+ 0x4085a602,
+ 0x4086255e,
+ 0x4086a209,
+ 0x40872eaf,
+ 0x4087a650,
+ 0x40881bcd,
+ 0x4088a837,
+ 0x40891c1c,
+ 0x40899ba9,
+ 0x408a2b27,
0x408a99c7,
- 0x408b31e7,
- 0x408baf5f,
- 0x408c2514,
- 0x408c99ff,
- 0x408d1f5e,
- 0x408d9ea8,
- 0x408e208e,
- 0x408ea382,
- 0x408f2871,
- 0x408fa644,
- 0x40902826,
- 0x4090a556,
- 0x40912b35,
- 0x40919a25,
- 0x40921c8f,
- 0x4092af10,
- 0x40932ff0,
- 0x4093a240,
- 0x40941e8a,
- 0x4094ab66,
- 0x409526d2,
- 0x4095b178,
- 0x40962ebc,
- 0x4096a1a0,
- 0x4097228b,
- 0x4097a0dd,
- 0x40981cef,
- 0x4098a6e6,
- 0x40992f2c,
- 0x4099a3af,
- 0x409a2348,
+ 0x408b31c1,
+ 0x408baf39,
+ 0x408c24ee,
+ 0x408d1f38,
+ 0x408d9e82,
+ 0x408e2068,
+ 0x408ea35c,
+ 0x408f284b,
+ 0x408fa61e,
+ 0x40902800,
+ 0x4090a530,
+ 0x40912b0f,
+ 0x409199ff,
+ 0x40921c69,
+ 0x4092aeea,
+ 0x40932fca,
+ 0x4093a21a,
+ 0x40941e64,
+ 0x4094ab40,
+ 0x409526ac,
+ 0x4095b152,
+ 0x40962e96,
+ 0x4096a17a,
+ 0x40972265,
+ 0x4097a0b7,
+ 0x40981cc9,
+ 0x4098a6c0,
+ 0x40992f06,
+ 0x4099a389,
+ 0x409a2322,
0x409a99e3,
- 0x409b1ee4,
- 0x409b9f0f,
- 0x409c30cd,
- 0x409c9f37,
- 0x409d215c,
- 0x409da12a,
- 0x409e1d80,
- 0x409ea1d5,
- 0x409f21bd,
- 0x409f9ed7,
- 0x40a021fd,
- 0x40a0a0f7,
- 0x40a12145,
- 0x41f42a07,
- 0x41f92a99,
- 0x41fe298c,
- 0x41feac42,
- 0x41ff2d70,
- 0x42032a20,
- 0x42082a42,
- 0x4208aa7e,
- 0x42092970,
- 0x4209aab8,
- 0x420a29c7,
- 0x420aa9a7,
- 0x420b29e7,
- 0x420baa60,
- 0x420c2d8c,
- 0x420cab76,
- 0x420d2c29,
- 0x420dac60,
- 0x42122c93,
- 0x42172d53,
- 0x4217acd5,
- 0x421c2cf7,
- 0x421f2cb2,
- 0x42212e04,
- 0x42262d36,
- 0x422b2de2,
- 0x422bac04,
- 0x422c2dc4,
- 0x422cabb7,
- 0x422d2b90,
- 0x422dada3,
- 0x422e2be3,
- 0x42302d12,
- 0x4230ac7a,
+ 0x409b1ebe,
+ 0x409b9ee9,
+ 0x409c30a7,
+ 0x409c9f11,
+ 0x409d2136,
+ 0x409da104,
+ 0x409e1d5a,
+ 0x409ea1af,
+ 0x409f2197,
+ 0x409f9eb1,
+ 0x40a021d7,
+ 0x40a0a0d1,
+ 0x40a1211f,
+ 0x41f429e1,
+ 0x41f92a73,
+ 0x41fe2966,
+ 0x41feac1c,
+ 0x41ff2d4a,
+ 0x420329fa,
+ 0x42082a1c,
+ 0x4208aa58,
+ 0x4209294a,
+ 0x4209aa92,
+ 0x420a29a1,
+ 0x420aa981,
+ 0x420b29c1,
+ 0x420baa3a,
+ 0x420c2d66,
+ 0x420cab50,
+ 0x420d2c03,
+ 0x420dac3a,
+ 0x42122c6d,
+ 0x42172d2d,
+ 0x4217acaf,
+ 0x421c2cd1,
+ 0x421f2c8c,
+ 0x42212dde,
+ 0x42262d10,
+ 0x422b2dbc,
+ 0x422babde,
+ 0x422c2d9e,
+ 0x422cab91,
+ 0x422d2b6a,
+ 0x422dad7d,
+ 0x422e2bbd,
+ 0x42302cec,
+ 0x4230ac54,
0x44320778,
0x44328787,
0x44330793,
@@ -690,71 +689,71 @@
0x4c41948f,
0x4c4215f8,
0x4c4293d7,
- 0x503235cd,
- 0x5032b5dc,
- 0x503335e7,
- 0x5033b5f7,
- 0x50343610,
- 0x5034b62a,
- 0x50353638,
- 0x5035b64e,
- 0x50363660,
- 0x5036b676,
- 0x5037368f,
- 0x5037b6a2,
- 0x503836ba,
- 0x5038b6cb,
- 0x503936e0,
- 0x5039b6f4,
- 0x503a3714,
- 0x503ab72a,
- 0x503b3742,
- 0x503bb754,
- 0x503c3770,
- 0x503cb787,
- 0x503d37a0,
- 0x503db7b6,
- 0x503e37c3,
- 0x503eb7d9,
- 0x503f37eb,
+ 0x503235a7,
+ 0x5032b5b6,
+ 0x503335c1,
+ 0x5033b5d1,
+ 0x503435ea,
+ 0x5034b604,
+ 0x50353612,
+ 0x5035b628,
+ 0x5036363a,
+ 0x5036b650,
+ 0x50373669,
+ 0x5037b67c,
+ 0x50383694,
+ 0x5038b6a5,
+ 0x503936ba,
+ 0x5039b6ce,
+ 0x503a36ee,
+ 0x503ab704,
+ 0x503b371c,
+ 0x503bb72e,
+ 0x503c374a,
+ 0x503cb761,
+ 0x503d377a,
+ 0x503db790,
+ 0x503e379d,
+ 0x503eb7b3,
+ 0x503f37c5,
0x503f83b3,
- 0x504037fe,
- 0x5040b80e,
- 0x50413828,
- 0x5041b837,
- 0x50423851,
- 0x5042b86e,
- 0x5043387e,
- 0x5043b88e,
- 0x504438ab,
+ 0x504037d8,
+ 0x5040b7e8,
+ 0x50413802,
+ 0x5041b811,
+ 0x5042382b,
+ 0x5042b848,
+ 0x50433858,
+ 0x5043b868,
+ 0x50443885,
0x50448469,
- 0x504538bf,
- 0x5045b8dd,
- 0x504638f0,
- 0x5046b906,
- 0x50473918,
- 0x5047b92d,
- 0x50483953,
- 0x5048b961,
- 0x50493974,
- 0x5049b989,
- 0x504a399f,
- 0x504ab9af,
- 0x504b39cf,
- 0x504bb9e2,
- 0x504c3a05,
- 0x504cba33,
- 0x504d3a60,
- 0x504dba7d,
- 0x504e3a98,
- 0x504ebab4,
- 0x504f3ac6,
- 0x504fbadd,
- 0x50503aec,
+ 0x50453899,
+ 0x5045b8b7,
+ 0x504638ca,
+ 0x5046b8e0,
+ 0x504738f2,
+ 0x5047b907,
+ 0x5048392d,
+ 0x5048b93b,
+ 0x5049394e,
+ 0x5049b963,
+ 0x504a3979,
+ 0x504ab989,
+ 0x504b39a9,
+ 0x504bb9bc,
+ 0x504c39df,
+ 0x504cba0d,
+ 0x504d3a3a,
+ 0x504dba57,
+ 0x504e3a72,
+ 0x504eba8e,
+ 0x504f3aa0,
+ 0x504fbab7,
+ 0x50503ac6,
0x50508729,
- 0x50513aff,
- 0x5051b89d,
- 0x50523a45,
+ 0x50513ad9,
+ 0x5051b877,
+ 0x50523a1f,
0x58320fd1,
0x68320f93,
0x68328ceb,
@@ -799,19 +798,19 @@
0x7c321274,
0x803214a2,
0x80328090,
- 0x803332c9,
+ 0x803332a3,
0x803380b9,
- 0x803432d8,
- 0x8034b240,
- 0x8035325e,
- 0x8035b2ec,
- 0x803632a0,
- 0x8036b24f,
- 0x80373292,
- 0x8037b22d,
- 0x803832b3,
- 0x8038b26f,
- 0x80393284,
+ 0x803432b2,
+ 0x8034b21a,
+ 0x80353238,
+ 0x8035b2c6,
+ 0x8036327a,
+ 0x8036b229,
+ 0x8037326c,
+ 0x8037b207,
+ 0x8038328d,
+ 0x8038b249,
+ 0x8039325e,
};
const size_t kOpenSSLReasonValuesLen = sizeof(kOpenSSLReasonValues) / sizeof(kOpenSSLReasonValues[0]);
@@ -1154,7 +1153,6 @@
"WRONG_SIGNATURE_LENGTH\0"
"ALPN_MISMATCH_ON_EARLY_DATA\0"
"ALPS_MISMATCH_ON_EARLY_DATA\0"
- "APPLICATION_DATA_INSTEAD_OF_HANDSHAKE\0"
"APPLICATION_DATA_ON_SHUTDOWN\0"
"APP_DATA_IN_HANDSHAKE\0"
"ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT\0"
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index c463195..bb7b257 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -6144,7 +6144,6 @@
#define SSL_R_WRONG_VERSION_ON_EARLY_DATA 278
#define SSL_R_UNEXPECTED_EXTENSION_ON_EARLY_DATA 279
#define SSL_R_NO_SUPPORTED_VERSIONS_ENABLED 280
-#define SSL_R_APPLICATION_DATA_INSTEAD_OF_HANDSHAKE 281
#define SSL_R_EMPTY_HELLO_RETRY_REQUEST 282
#define SSL_R_EARLY_DATA_NOT_IN_USE 283
#define SSL_R_HANDSHAKE_NOT_COMPLETE 284
diff --git a/ssl/s3_both.cc b/ssl/s3_both.cc
index 26b28c6..0bd75f0 100644
--- a/ssl/s3_both.cc
+++ b/ssl/s3_both.cc
@@ -619,17 +619,6 @@
return ret;
}
- // WatchGuard's TLS 1.3 interference bug is very distinctive: they drop the
- // ServerHello and send the remaining encrypted application data records
- // as-is. This manifests as an application data record when we expect
- // handshake. Report a dedicated error code for this case.
- if (!ssl->server && type == SSL3_RT_APPLICATION_DATA &&
- ssl->s3->aead_read_ctx->is_null_cipher()) {
- OPENSSL_PUT_ERROR(SSL, SSL_R_APPLICATION_DATA_INSTEAD_OF_HANDSHAKE);
- *out_alert = SSL_AD_UNEXPECTED_MESSAGE;
- return ssl_open_record_error;
- }
-
if (type != SSL3_RT_HANDSHAKE) {
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_RECORD);
*out_alert = SSL_AD_UNEXPECTED_MESSAGE;
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
index b7481c1..1e9ca3c 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -2490,7 +2490,7 @@
},
},
shouldFail: true,
- expectedError: ":APPLICATION_DATA_INSTEAD_OF_HANDSHAKE:",
+ expectedError: ":UNEXPECTED_RECORD:",
},
{
name: "AppDataBeforeHandshake-Empty",
@@ -2500,7 +2500,7 @@
},
},
shouldFail: true,
- expectedError: ":APPLICATION_DATA_INSTEAD_OF_HANDSHAKE:",
+ expectedError: ":UNEXPECTED_RECORD:",
},
{
protocol: dtls,
@@ -2728,7 +2728,7 @@
},
shimWritesFirst: true,
shouldFail: true,
- expectedError: ":APPLICATION_DATA_INSTEAD_OF_HANDSHAKE:",
+ expectedError: ":UNEXPECTED_RECORD:",
},
{
name: "FalseStart-SkipServerSecondLeg-Implicit",
@@ -2749,7 +2749,7 @@
"-advertise-alpn", "\x03foo",
},
shouldFail: true,
- expectedError: ":APPLICATION_DATA_INSTEAD_OF_HANDSHAKE:",
+ expectedError: ":UNEXPECTED_RECORD:",
},
{
testType: serverTest,
