diff --git a/crypto/err/evp.errordata b/crypto/err/evp.errordata
index f65b7b0..42bdc54 100644
--- a/crypto/err/evp.errordata
+++ b/crypto/err/evp.errordata
@@ -5,10 +5,10 @@
 EVP,104,DIFFERENT_PARAMETERS
 EVP,136,EMPTY_PSK
 EVP,105,ENCODE_ERROR
-EVP,106,EXPECTING_AN_EC_KEY_KEY
 EVP,107,EXPECTING_AN_RSA_KEY
 EVP,138,EXPECTING_A_DH_KEY
 EVP,108,EXPECTING_A_DSA_KEY
+EVP,106,EXPECTING_A_EC_KEY
 EVP,109,ILLEGAL_OR_UNSUPPORTED_PADDING_MODE
 EVP,137,INVALID_BUFFER_SIZE
 EVP,110,INVALID_DIGEST_LENGTH
diff --git a/crypto/evp/p_ec_asn1.cc b/crypto/evp/p_ec_asn1.cc
index 0bd7623..c8047db 100644
--- a/crypto/evp/p_ec_asn1.cc
+++ b/crypto/evp/p_ec_asn1.cc
@@ -272,7 +272,7 @@
 
 EC_KEY *EVP_PKEY_get0_EC_KEY(const EVP_PKEY *pkey) {
   if (EVP_PKEY_id(pkey) != EVP_PKEY_EC) {
-    OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_AN_EC_KEY_KEY);
+    OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_A_EC_KEY);
     return NULL;
   }
   return reinterpret_cast<EC_KEY *>(pkey->pkey);
diff --git a/gen/crypto/err_data.cc b/gen/crypto/err_data.cc
index f3d8f7c..00b3216 100644
--- a/gen/crypto/err_data.cc
+++ b/gen/crypto/err_data.cc
@@ -78,54 +78,54 @@
     0xc3b00f7,
     0xc3b8921,
     0x10320892,
-    0x103296b2,
-    0x103316be,
-    0x103396d7,
-    0x103416ea,
+    0x103296ad,
+    0x103316b9,
+    0x103396d2,
+    0x103416e5,
     0x10348fd3,
     0x10350d1f,
-    0x103596fd,
-    0x10361727,
-    0x1036973a,
-    0x10371759,
-    0x10379772,
-    0x10381787,
-    0x103897a5,
-    0x103917b4,
-    0x103997d0,
-    0x103a17eb,
-    0x103a97fa,
-    0x103b1816,
-    0x103b9831,
-    0x103c1857,
+    0x103596f8,
+    0x10361722,
+    0x10369735,
+    0x10371754,
+    0x1037976d,
+    0x10381782,
+    0x103897a0,
+    0x103917af,
+    0x103997cb,
+    0x103a17e6,
+    0x103a97f5,
+    0x103b1811,
+    0x103b982c,
+    0x103c1852,
     0x103c80f7,
-    0x103d1868,
-    0x103d987c,
-    0x103e189b,
-    0x103e98aa,
-    0x103f18c1,
-    0x103f98d4,
+    0x103d1863,
+    0x103d9877,
+    0x103e1896,
+    0x103e98a5,
+    0x103f18bc,
+    0x103f98cf,
     0x10400ce3,
-    0x104098e7,
-    0x10411905,
-    0x10419918,
-    0x10421932,
-    0x10429942,
-    0x10431956,
-    0x1043996c,
-    0x10441984,
-    0x10449999,
-    0x104519ad,
-    0x104599bf,
+    0x104098e2,
+    0x10411900,
+    0x10419913,
+    0x1042192d,
+    0x1042993d,
+    0x10431951,
+    0x10439967,
+    0x1044197f,
+    0x10449994,
+    0x104519a8,
+    0x104599ba,
     0x10460635,
     0x1046899a,
-    0x104719d4,
-    0x104799eb,
-    0x10481a00,
-    0x10489a0e,
+    0x104719cf,
+    0x104799e6,
+    0x104819fb,
+    0x10489a09,
     0x10490f1f,
-    0x10499848,
-    0x104a1712,
+    0x10499843,
+    0x104a170d,
     0x14320cb3,
     0x14328cd4,
     0x14330ce3,
@@ -139,57 +139,57 @@
     0x1833903f,
     0x18341053,
     0x183480f7,
-    0x18351072,
-    0x1835908a,
-    0x183610b2,
-    0x183690c6,
-    0x183710fe,
-    0x18379114,
-    0x18381128,
-    0x18389138,
+    0x183510ae,
+    0x18359072,
+    0x1836109a,
+    0x183690c1,
+    0x183710f9,
+    0x1837910f,
+    0x18381123,
+    0x18389133,
     0x18390ac0,
-    0x18399148,
-    0x183a116e,
-    0x183a9194,
+    0x18399143,
+    0x183a1169,
+    0x183a918f,
     0x183b0d2b,
-    0x183b91e3,
-    0x183c11f5,
-    0x183c9200,
-    0x183d1210,
-    0x183d9221,
-    0x183e1232,
-    0x183e9244,
-    0x183f126d,
-    0x183f9286,
-    0x1840129e,
+    0x183b91de,
+    0x183c11f0,
+    0x183c91fb,
+    0x183d120b,
+    0x183d921c,
+    0x183e122d,
+    0x183e923f,
+    0x183f1268,
+    0x183f9281,
+    0x18401299,
     0x1840870d,
-    0x184111b7,
-    0x18419182,
-    0x184211a1,
+    0x184111b2,
+    0x1841917d,
+    0x1842119c,
     0x18428cc1,
-    0x1843115d,
-    0x184391c9,
+    0x18431158,
+    0x184391c4,
     0x18441068,
-    0x184490ea,
-    0x1845109f,
-    0x203212d8,
-    0x203292c5,
-    0x243212e4,
+    0x184490e5,
+    0x18451087,
+    0x203212d3,
+    0x203292c0,
+    0x243212df,
     0x243289e0,
-    0x243312f6,
-    0x24339303,
-    0x24341310,
-    0x24349322,
-    0x24351331,
-    0x2435934e,
-    0x2436135b,
-    0x24369369,
-    0x24371377,
-    0x24379385,
-    0x2438138e,
-    0x2438939b,
-    0x243913ae,
-    0x243993c5,
+    0x243312f1,
+    0x243392fe,
+    0x2434130b,
+    0x2434931d,
+    0x2435132c,
+    0x24359349,
+    0x24361356,
+    0x24369364,
+    0x24371372,
+    0x24379380,
+    0x24381389,
+    0x24389396,
+    0x243913a9,
+    0x243993c0,
     0x28320d13,
     0x28328d2b,
     0x28330ce3,
@@ -199,51 +199,51 @@
     0x283500f7,
     0x28358cc1,
     0x2836099a,
-    0x2c3233f9,
-    0x2c3293e3,
-    0x2c333407,
-    0x2c33b419,
-    0x2c34342d,
-    0x2c34b43f,
-    0x2c35345a,
-    0x2c35b46c,
-    0x2c36349c,
+    0x2c3233f4,
+    0x2c3293de,
+    0x2c333402,
+    0x2c33b414,
+    0x2c343428,
+    0x2c34b43a,
+    0x2c353455,
+    0x2c35b467,
+    0x2c363497,
     0x2c36833a,
-    0x2c3734a9,
-    0x2c37b4d5,
-    0x2c383513,
-    0x2c38b52a,
-    0x2c393548,
-    0x2c39b558,
-    0x2c3a356a,
-    0x2c3ab57e,
-    0x2c3b358f,
-    0x2c3bb5ae,
-    0x2c3c13f5,
-    0x2c3c940b,
-    0x2c3d35f3,
-    0x2c3d9424,
-    0x2c3e361d,
-    0x2c3eb62b,
-    0x2c3f3643,
-    0x2c3fb65b,
-    0x2c403685,
-    0x2c4092d8,
-    0x2c413696,
-    0x2c41b6a9,
-    0x2c42129e,
-    0x2c42b6ba,
+    0x2c3734a4,
+    0x2c37b4d0,
+    0x2c38350e,
+    0x2c38b525,
+    0x2c393543,
+    0x2c39b553,
+    0x2c3a3565,
+    0x2c3ab579,
+    0x2c3b358a,
+    0x2c3bb5a9,
+    0x2c3c13f0,
+    0x2c3c9406,
+    0x2c3d35ee,
+    0x2c3d941f,
+    0x2c3e3618,
+    0x2c3eb626,
+    0x2c3f363e,
+    0x2c3fb656,
+    0x2c403680,
+    0x2c4092d3,
+    0x2c413691,
+    0x2c41b6a4,
+    0x2c421299,
+    0x2c42b6b5,
     0x2c43076d,
-    0x2c43b5a0,
-    0x2c4434e8,
-    0x2c44b668,
-    0x2c45347f,
-    0x2c45b4bb,
-    0x2c463538,
-    0x2c46b5c2,
-    0x2c4735d7,
-    0x2c47b610,
-    0x2c4834fa,
+    0x2c43b59b,
+    0x2c4434e3,
+    0x2c44b663,
+    0x2c45347a,
+    0x2c45b4b6,
+    0x2c463533,
+    0x2c46b5bd,
+    0x2c4735d2,
+    0x2c47b60b,
+    0x2c4834f5,
     0x30320000,
     0x30328015,
     0x3033001f,
@@ -383,268 +383,268 @@
     0x3c418e13,
     0x3c420f1f,
     0x3c428ea9,
-    0x40321a7a,
-    0x40329a90,
-    0x40331abe,
-    0x40339ac8,
-    0x40341adf,
-    0x40349afd,
-    0x40351b0d,
-    0x40359b1f,
-    0x40361b2c,
-    0x40369b38,
-    0x40371b4d,
-    0x40379b5f,
-    0x40381b6a,
-    0x40389b7c,
+    0x40321a75,
+    0x40329a8b,
+    0x40331ab9,
+    0x40339ac3,
+    0x40341ada,
+    0x40349af8,
+    0x40351b08,
+    0x40359b1a,
+    0x40361b27,
+    0x40369b33,
+    0x40371b48,
+    0x40379b5a,
+    0x40381b65,
+    0x40389b77,
     0x40390fd3,
-    0x40399b8c,
-    0x403a1b9f,
-    0x403a9bc0,
-    0x403b1bd1,
-    0x403b9be1,
+    0x40399b87,
+    0x403a1b9a,
+    0x403a9bbb,
+    0x403b1bcc,
+    0x403b9bdc,
     0x403c0071,
     0x403c8090,
-    0x403d1c42,
-    0x403d9c58,
-    0x403e1c67,
-    0x403e9c9f,
-    0x403f1cb9,
-    0x403f9ce1,
-    0x40401cf6,
-    0x40409d0a,
-    0x40411d45,
-    0x40419d60,
-    0x40421d79,
-    0x40429d8c,
-    0x40431da0,
-    0x40439dce,
-    0x40441de5,
+    0x403d1c3d,
+    0x403d9c53,
+    0x403e1c62,
+    0x403e9c9a,
+    0x403f1cb4,
+    0x403f9cdc,
+    0x40401cf1,
+    0x40409d05,
+    0x40411d40,
+    0x40419d5b,
+    0x40421d74,
+    0x40429d87,
+    0x40431d9b,
+    0x40439dc9,
+    0x40441de0,
     0x404480b9,
-    0x40451dfa,
-    0x40459e0c,
-    0x40461e30,
-    0x40469e50,
-    0x40471e5e,
-    0x40479e85,
-    0x40481ef6,
-    0x40489fb0,
-    0x40491fc7,
-    0x40499fe1,
-    0x404a1ff8,
-    0x404aa016,
-    0x404b202e,
-    0x404ba05b,
-    0x404c2071,
-    0x404ca083,
-    0x404d20a4,
-    0x404da0dd,
-    0x404e20f1,
-    0x404ea0fe,
-    0x404f21af,
-    0x404fa225,
-    0x405022af,
-    0x4050a2c3,
-    0x405122f6,
-    0x40522306,
-    0x4052a32a,
-    0x40532342,
-    0x4053a355,
-    0x4054236a,
-    0x4054a38d,
-    0x405523b8,
-    0x4055a3f5,
-    0x4056241a,
-    0x4056a433,
-    0x4057244b,
-    0x4057a45e,
-    0x40582473,
-    0x4058a49a,
-    0x405924c9,
-    0x4059a509,
-    0x405aa51d,
-    0x405b2535,
-    0x405ba546,
-    0x405c2559,
-    0x405ca598,
-    0x405d25a5,
-    0x405da5ca,
-    0x405e2608,
+    0x40451df5,
+    0x40459e07,
+    0x40461e2b,
+    0x40469e4b,
+    0x40471e59,
+    0x40479e80,
+    0x40481ef1,
+    0x40489fab,
+    0x40491fc2,
+    0x40499fdc,
+    0x404a1ff3,
+    0x404aa011,
+    0x404b2029,
+    0x404ba056,
+    0x404c206c,
+    0x404ca07e,
+    0x404d209f,
+    0x404da0d8,
+    0x404e20ec,
+    0x404ea0f9,
+    0x404f21aa,
+    0x404fa220,
+    0x405022aa,
+    0x4050a2be,
+    0x405122f1,
+    0x40522301,
+    0x4052a325,
+    0x4053233d,
+    0x4053a350,
+    0x40542365,
+    0x4054a388,
+    0x405523b3,
+    0x4055a3f0,
+    0x40562415,
+    0x4056a42e,
+    0x40572446,
+    0x4057a459,
+    0x4058246e,
+    0x4058a495,
+    0x405924c4,
+    0x4059a504,
+    0x405aa518,
+    0x405b2530,
+    0x405ba541,
+    0x405c2554,
+    0x405ca593,
+    0x405d25a0,
+    0x405da5c5,
+    0x405e2603,
     0x405e8afe,
-    0x405f2657,
-    0x405fa664,
-    0x40602672,
-    0x4060a694,
-    0x40612708,
-    0x4061a740,
-    0x40622757,
-    0x4062a768,
-    0x406327b5,
-    0x4063a7ca,
-    0x406427e1,
-    0x4064a80d,
-    0x40652828,
-    0x4065a83f,
-    0x40662857,
-    0x4066a881,
-    0x406728ac,
-    0x4067a8f1,
-    0x40682939,
-    0x4068a95a,
-    0x4069298c,
-    0x4069a9ba,
-    0x406a29db,
-    0x406aa9fb,
-    0x406b2b83,
-    0x406baba6,
-    0x406c2bbc,
-    0x406caec6,
-    0x406d2ef5,
-    0x406daf1d,
-    0x406e2f4b,
-    0x406eaf98,
-    0x406f2ff1,
-    0x406fb029,
-    0x4070303c,
-    0x4070b059,
+    0x405f2652,
+    0x405fa65f,
+    0x4060266d,
+    0x4060a68f,
+    0x40612703,
+    0x4061a73b,
+    0x40622752,
+    0x4062a763,
+    0x406327b0,
+    0x4063a7c5,
+    0x406427dc,
+    0x4064a808,
+    0x40652823,
+    0x4065a83a,
+    0x40662852,
+    0x4066a87c,
+    0x406728a7,
+    0x4067a8ec,
+    0x40682934,
+    0x4068a955,
+    0x40692987,
+    0x4069a9b5,
+    0x406a29d6,
+    0x406aa9f6,
+    0x406b2b7e,
+    0x406baba1,
+    0x406c2bb7,
+    0x406caec1,
+    0x406d2ef0,
+    0x406daf18,
+    0x406e2f46,
+    0x406eaf93,
+    0x406f2fec,
+    0x406fb024,
+    0x40703037,
+    0x4070b054,
     0x4071084d,
-    0x4071b06b,
-    0x4072307e,
-    0x4072b0b4,
-    0x407330cc,
-    0x4073960d,
-    0x407430e0,
-    0x4074b0fa,
-    0x4075310b,
-    0x4075b11f,
-    0x4076312d,
-    0x4076939b,
-    0x40773152,
-    0x4077b1ea,
-    0x40783205,
-    0x4078b23e,
-    0x40793255,
-    0x4079b26b,
-    0x407a3297,
-    0x407ab2aa,
-    0x407b32bf,
-    0x407bb2d1,
-    0x407c3302,
-    0x407cb30b,
-    0x407d2975,
-    0x407da24d,
-    0x407e321a,
-    0x407ea4aa,
-    0x407f1e72,
-    0x407fa045,
-    0x408021bf,
-    0x40809e9a,
-    0x40812318,
-    0x4081a14c,
-    0x40822f36,
-    0x40829bed,
-    0x40832485,
-    0x4083a7f2,
-    0x40841eae,
-    0x4084a4e2,
-    0x4085256a,
-    0x4085a6cf,
-    0x408625ea,
-    0x4086a267,
-    0x40872f7c,
-    0x4087a71d,
-    0x40881c2b,
-    0x4088a904,
-    0x40891c7a,
-    0x40899c07,
-    0x408a2bf4,
-    0x408a9a25,
-    0x408b32e6,
-    0x408bb006,
-    0x408c257a,
-    0x408d1f96,
-    0x408d9ee0,
-    0x408e20c6,
-    0x408ea3d5,
-    0x408f2918,
-    0x408fa6eb,
-    0x409028cd,
-    0x4090a5bc,
-    0x40912bdc,
-    0x40919a5d,
-    0x40921cc7,
-    0x4092afb7,
-    0x40933097,
-    0x4093a278,
-    0x40941ec2,
-    0x4094ac0d,
-    0x40952779,
-    0x4095b277,
-    0x40962f63,
-    0x4096a1d8,
-    0x409722de,
-    0x4097a115,
-    0x40981d27,
-    0x4098a78d,
-    0x40992fd3,
-    0x4099a402,
-    0x409a239b,
-    0x409a9a41,
-    0x409b1f1c,
-    0x409b9f47,
-    0x409c31cc,
-    0x409c9f6f,
-    0x409d2194,
-    0x409da162,
-    0x409e1db8,
-    0x409ea20d,
-    0x409f21f5,
-    0x409f9f0f,
-    0x40a02235,
-    0x40a0a12f,
-    0x40a1217d,
-    0x40a1a4f6,
-    0x40a22294,
-    0x40a2a648,
-    0x40a326bc,
-    0x40a3b174,
-    0x40a43190,
-    0x40a4b1aa,
-    0x41f42aae,
-    0x41f92b40,
-    0x41fe2a33,
-    0x41feace9,
-    0x41ff2e17,
-    0x42032ac7,
-    0x42082ae9,
-    0x4208ab25,
-    0x42092a17,
-    0x4209ab5f,
-    0x420a2a6e,
-    0x420aaa4e,
-    0x420b2a8e,
-    0x420bab07,
-    0x420c2e33,
-    0x420cac1d,
-    0x420d2cd0,
-    0x420dad07,
-    0x42122d3a,
-    0x42172dfa,
-    0x4217ad7c,
-    0x421c2d9e,
-    0x421f2d59,
-    0x42212eab,
-    0x42262ddd,
-    0x422b2e89,
-    0x422bacab,
-    0x422c2e6b,
-    0x422cac5e,
-    0x422d2c37,
-    0x422dae4a,
-    0x422e2c8a,
-    0x42302db9,
-    0x4230ad21,
-    0x42312629,
+    0x4071b066,
+    0x40723079,
+    0x4072b0af,
+    0x407330c7,
+    0x40739608,
+    0x407430db,
+    0x4074b0f5,
+    0x40753106,
+    0x4075b11a,
+    0x40763128,
+    0x40769396,
+    0x4077314d,
+    0x4077b1e5,
+    0x40783200,
+    0x4078b239,
+    0x40793250,
+    0x4079b266,
+    0x407a3292,
+    0x407ab2a5,
+    0x407b32ba,
+    0x407bb2cc,
+    0x407c32fd,
+    0x407cb306,
+    0x407d2970,
+    0x407da248,
+    0x407e3215,
+    0x407ea4a5,
+    0x407f1e6d,
+    0x407fa040,
+    0x408021ba,
+    0x40809e95,
+    0x40812313,
+    0x4081a147,
+    0x40822f31,
+    0x40829be8,
+    0x40832480,
+    0x4083a7ed,
+    0x40841ea9,
+    0x4084a4dd,
+    0x40852565,
+    0x4085a6ca,
+    0x408625e5,
+    0x4086a262,
+    0x40872f77,
+    0x4087a718,
+    0x40881c26,
+    0x4088a8ff,
+    0x40891c75,
+    0x40899c02,
+    0x408a2bef,
+    0x408a9a20,
+    0x408b32e1,
+    0x408bb001,
+    0x408c2575,
+    0x408d1f91,
+    0x408d9edb,
+    0x408e20c1,
+    0x408ea3d0,
+    0x408f2913,
+    0x408fa6e6,
+    0x409028c8,
+    0x4090a5b7,
+    0x40912bd7,
+    0x40919a58,
+    0x40921cc2,
+    0x4092afb2,
+    0x40933092,
+    0x4093a273,
+    0x40941ebd,
+    0x4094ac08,
+    0x40952774,
+    0x4095b272,
+    0x40962f5e,
+    0x4096a1d3,
+    0x409722d9,
+    0x4097a110,
+    0x40981d22,
+    0x4098a788,
+    0x40992fce,
+    0x4099a3fd,
+    0x409a2396,
+    0x409a9a3c,
+    0x409b1f17,
+    0x409b9f42,
+    0x409c31c7,
+    0x409c9f6a,
+    0x409d218f,
+    0x409da15d,
+    0x409e1db3,
+    0x409ea208,
+    0x409f21f0,
+    0x409f9f0a,
+    0x40a02230,
+    0x40a0a12a,
+    0x40a12178,
+    0x40a1a4f1,
+    0x40a2228f,
+    0x40a2a643,
+    0x40a326b7,
+    0x40a3b16f,
+    0x40a4318b,
+    0x40a4b1a5,
+    0x41f42aa9,
+    0x41f92b3b,
+    0x41fe2a2e,
+    0x41feace4,
+    0x41ff2e12,
+    0x42032ac2,
+    0x42082ae4,
+    0x4208ab20,
+    0x42092a12,
+    0x4209ab5a,
+    0x420a2a69,
+    0x420aaa49,
+    0x420b2a89,
+    0x420bab02,
+    0x420c2e2e,
+    0x420cac18,
+    0x420d2ccb,
+    0x420dad02,
+    0x42122d35,
+    0x42172df5,
+    0x4217ad77,
+    0x421c2d99,
+    0x421f2d54,
+    0x42212ea6,
+    0x42262dd8,
+    0x422b2e84,
+    0x422baca6,
+    0x422c2e66,
+    0x422cac59,
+    0x422d2c32,
+    0x422dae45,
+    0x422e2c85,
+    0x42302db4,
+    0x4230ad1c,
+    0x42312624,
     0x44320778,
     0x44328787,
     0x44330793,
@@ -662,109 +662,109 @@
     0x4439084d,
     0x4439885b,
     0x443a086e,
-    0x483213e3,
-    0x483293f5,
-    0x4833140b,
-    0x48339424,
-    0x4c321461,
-    0x4c329471,
-    0x4c331484,
-    0x4c3394a4,
+    0x483213de,
+    0x483293f0,
+    0x48331406,
+    0x4833941f,
+    0x4c32145c,
+    0x4c32946c,
+    0x4c33147f,
+    0x4c33949f,
     0x4c3400b9,
     0x4c3480f7,
-    0x4c3514b0,
-    0x4c3594be,
-    0x4c3614da,
-    0x4c369500,
-    0x4c37150f,
-    0x4c37951d,
-    0x4c381532,
-    0x4c38953e,
-    0x4c39155e,
-    0x4c399588,
-    0x4c3a15a1,
-    0x4c3a95ba,
+    0x4c3514ab,
+    0x4c3594b9,
+    0x4c3614d5,
+    0x4c3694fb,
+    0x4c37150a,
+    0x4c379518,
+    0x4c38152d,
+    0x4c389539,
+    0x4c391559,
+    0x4c399583,
+    0x4c3a159c,
+    0x4c3a95b5,
     0x4c3b0635,
-    0x4c3b95d3,
-    0x4c3c15e5,
-    0x4c3c95f4,
-    0x4c3d160d,
+    0x4c3b95ce,
+    0x4c3c15e0,
+    0x4c3c95ef,
+    0x4c3d1608,
     0x4c3d8d06,
-    0x4c3e167a,
-    0x4c3e961c,
-    0x4c3f169c,
-    0x4c3f939b,
-    0x4c401632,
-    0x4c40944d,
-    0x4c41166a,
-    0x4c4194ed,
-    0x4c421656,
-    0x4c429435,
-    0x503236cc,
-    0x5032b6db,
-    0x503336e6,
-    0x5033b6f6,
-    0x5034370f,
-    0x5034b729,
-    0x50353737,
-    0x5035b74d,
-    0x5036375f,
-    0x5036b775,
-    0x5037378e,
-    0x5037b7a1,
-    0x503837b9,
-    0x5038b7ca,
-    0x503937df,
-    0x5039b7f3,
-    0x503a3813,
-    0x503ab829,
-    0x503b3841,
-    0x503bb853,
-    0x503c386f,
-    0x503cb886,
-    0x503d389f,
-    0x503db8b5,
-    0x503e38c2,
-    0x503eb8d8,
-    0x503f38ea,
+    0x4c3e1675,
+    0x4c3e9617,
+    0x4c3f1697,
+    0x4c3f9396,
+    0x4c40162d,
+    0x4c409448,
+    0x4c411665,
+    0x4c4194e8,
+    0x4c421651,
+    0x4c429430,
+    0x503236c7,
+    0x5032b6d6,
+    0x503336e1,
+    0x5033b6f1,
+    0x5034370a,
+    0x5034b724,
+    0x50353732,
+    0x5035b748,
+    0x5036375a,
+    0x5036b770,
+    0x50373789,
+    0x5037b79c,
+    0x503837b4,
+    0x5038b7c5,
+    0x503937da,
+    0x5039b7ee,
+    0x503a380e,
+    0x503ab824,
+    0x503b383c,
+    0x503bb84e,
+    0x503c386a,
+    0x503cb881,
+    0x503d389a,
+    0x503db8b0,
+    0x503e38bd,
+    0x503eb8d3,
+    0x503f38e5,
     0x503f83b3,
-    0x504038fd,
-    0x5040b90d,
-    0x50413927,
-    0x5041b936,
-    0x50423950,
-    0x5042b96d,
-    0x5043397d,
-    0x5043b98d,
-    0x504439aa,
+    0x504038f8,
+    0x5040b908,
+    0x50413922,
+    0x5041b931,
+    0x5042394b,
+    0x5042b968,
+    0x50433978,
+    0x5043b988,
+    0x504439a5,
     0x50448469,
-    0x504539be,
-    0x5045b9dc,
-    0x504639ef,
-    0x5046ba05,
-    0x50473a17,
-    0x5047ba2c,
-    0x50483a52,
-    0x5048ba60,
-    0x50493a73,
-    0x5049ba88,
-    0x504a3a9e,
-    0x504abaae,
-    0x504b3ace,
-    0x504bbae1,
-    0x504c3b04,
-    0x504cbb32,
-    0x504d3b5f,
-    0x504dbb7c,
-    0x504e3b97,
-    0x504ebbb3,
-    0x504f3bc5,
-    0x504fbbdc,
-    0x50503beb,
+    0x504539b9,
+    0x5045b9d7,
+    0x504639ea,
+    0x5046ba00,
+    0x50473a12,
+    0x5047ba27,
+    0x50483a4d,
+    0x5048ba5b,
+    0x50493a6e,
+    0x5049ba83,
+    0x504a3a99,
+    0x504abaa9,
+    0x504b3ac9,
+    0x504bbadc,
+    0x504c3aff,
+    0x504cbb2d,
+    0x504d3b5a,
+    0x504dbb77,
+    0x504e3b92,
+    0x504ebbae,
+    0x504f3bc0,
+    0x504fbbd7,
+    0x50503be6,
     0x50508729,
-    0x50513bfe,
-    0x5051b99c,
-    0x50523b44,
+    0x50513bf9,
+    0x5051b997,
+    0x50523b3f,
     0x58321011,
     0x68320fd3,
     0x68328d2b,
@@ -806,22 +806,22 @@
     0x783d8b97,
     0x783e0aed,
     0x783e8a9f,
-    0x7c3212b4,
-    0x80321500,
+    0x7c3212af,
+    0x803214fb,
     0x80328090,
-    0x803333c8,
+    0x803333c3,
     0x803380b9,
-    0x803433d7,
-    0x8034b33f,
-    0x8035335d,
-    0x8035b3eb,
-    0x8036339f,
-    0x8036b34e,
-    0x80373391,
-    0x8037b32c,
-    0x803833b2,
-    0x8038b36e,
-    0x80393383,
+    0x803433d2,
+    0x8034b33a,
+    0x80353358,
+    0x8035b3e6,
+    0x8036339a,
+    0x8036b349,
+    0x8037338c,
+    0x8037b327,
+    0x803833ad,
+    0x8038b369,
+    0x8039337e,
     0x84320bb0,
     0x84328bc9,
 };
@@ -1049,10 +1049,10 @@
     "DIFFERENT_KEY_TYPES\0"
     "DIFFERENT_PARAMETERS\0"
     "EMPTY_PSK\0"
-    "EXPECTING_AN_EC_KEY_KEY\0"
     "EXPECTING_AN_RSA_KEY\0"
     "EXPECTING_A_DH_KEY\0"
     "EXPECTING_A_DSA_KEY\0"
+    "EXPECTING_A_EC_KEY\0"
     "ILLEGAL_OR_UNSUPPORTED_PADDING_MODE\0"
     "INVALID_BUFFER_SIZE\0"
     "INVALID_DIGEST_LENGTH\0"
diff --git a/include/openssl/evp_errors.h b/include/openssl/evp_errors.h
index c7fa180..9626caf 100644
--- a/include/openssl/evp_errors.h
+++ b/include/openssl/evp_errors.h
@@ -21,7 +21,7 @@
 #define EVP_R_DIFFERENT_KEY_TYPES 103
 #define EVP_R_DIFFERENT_PARAMETERS 104
 #define EVP_R_ENCODE_ERROR 105
-#define EVP_R_EXPECTING_AN_EC_KEY_KEY 106
+#define EVP_R_EXPECTING_A_EC_KEY 106
 #define EVP_R_EXPECTING_AN_RSA_KEY 107
 #define EVP_R_EXPECTING_A_DSA_KEY 108
 #define EVP_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE 109