diff --git a/crypto/obj/obj_dat.h b/crypto/obj/obj_dat.h
index 5f36d40..b3da0e8 100644
--- a/crypto/obj/obj_dat.h
+++ b/crypto/obj/obj_dat.h
@@ -56,6 +56,7 @@
 
 /* This file is generated by crypto/obj/objects.go. */
 
+
 #define NUM_NID 950
 
 static const uint8_t kObjectData[] = {
@@ -1811,7 +1812,7 @@
     0x2b, 0x81, 0x04, 0x01, 0x0e, 0x02,
     /* NID_dhSinglePass_cofactorDH_sha512kdf_scheme */
     0x2b, 0x81, 0x04, 0x01, 0x0e, 0x03,
-    /* NID_Ed25519 */
+    /* NID_ED25519 */
     0x2b, 0x65, 0x70,
 };
 
@@ -3442,7 +3443,7 @@
     {"dh-std-kdf", "dh-std-kdf", NID_dh_std_kdf, 0, NULL, 0},
     {"dh-cofactor-kdf", "dh-cofactor-kdf", NID_dh_cofactor_kdf, 0, NULL, 0},
     {"X25519", "X25519", NID_X25519, 0, NULL, 0},
-    {"Ed25519", "Ed25519", NID_Ed25519, 3, &kObjectData[6175], 0},
+    {"ED25519", "ED25519", NID_ED25519, 3, &kObjectData[6175], 0},
 };
 
 static const unsigned kNIDsInShortNameOrder[] = {
@@ -3531,7 +3532,7 @@
     70 /* DSA-SHA1-old */,
     67 /* DSA-old */,
     297 /* DVCS */,
-    949 /* Ed25519 */,
+    949 /* ED25519 */,
     99 /* GN */,
     855 /* HMAC */,
     780 /* HMAC-MD5 */,
@@ -4404,7 +4405,7 @@
     382 /* Directory */,
     392 /* Domain */,
     132 /* E-mail Protection */,
-    949 /* Ed25519 */,
+    949 /* ED25519 */,
     389 /* Enterprises */,
     384 /* Experimental */,
     372 /* Extended OCSP Status */,
@@ -5332,27 +5333,39 @@
 };
 
 static const unsigned kNIDsInOIDOrder[] = {
-    434 /* 0.9 (OBJ_data) */, 182 /* 1.2 (OBJ_member_body) */,
-    379 /* 1.3 (OBJ_org) */, 676 /* 1.3 (OBJ_identified_organization) */,
-    11 /* 2.5 (OBJ_X500) */, 647 /* 2.23 (OBJ_international_organizations) */,
-    380 /* 1.3.6 (OBJ_dod) */, 12 /* 2.5.4 (OBJ_X509) */,
-    378 /* 2.5.8 (OBJ_X500algorithms) */, 81 /* 2.5.29 (OBJ_id_ce) */,
-    512 /* 2.23.42 (OBJ_id_set) */, 678 /* 2.23.43 (OBJ_wap) */,
-    435 /* 0.9.2342 (OBJ_pss) */, 183 /* 1.2.840 (OBJ_ISO_US) */,
-    381 /* 1.3.6.1 (OBJ_iana) */, 949 /* 1.3.101.112 (OBJ_Ed25519) */,
+    434 /* 0.9 (OBJ_data) */,
+    182 /* 1.2 (OBJ_member_body) */,
+    379 /* 1.3 (OBJ_org) */,
+    676 /* 1.3 (OBJ_identified_organization) */,
+    11 /* 2.5 (OBJ_X500) */,
+    647 /* 2.23 (OBJ_international_organizations) */,
+    380 /* 1.3.6 (OBJ_dod) */,
+    12 /* 2.5.4 (OBJ_X509) */,
+    378 /* 2.5.8 (OBJ_X500algorithms) */,
+    81 /* 2.5.29 (OBJ_id_ce) */,
+    512 /* 2.23.42 (OBJ_id_set) */,
+    678 /* 2.23.43 (OBJ_wap) */,
+    435 /* 0.9.2342 (OBJ_pss) */,
+    183 /* 1.2.840 (OBJ_ISO_US) */,
+    381 /* 1.3.6.1 (OBJ_iana) */,
+    949 /* 1.3.101.112 (OBJ_ED25519) */,
     677 /* 1.3.132 (OBJ_certicom_arc) */,
     394 /* 2.5.1.5 (OBJ_selected_attribute_types) */,
-    13 /* 2.5.4.3 (OBJ_commonName) */, 100 /* 2.5.4.4 (OBJ_surname) */,
-    105 /* 2.5.4.5 (OBJ_serialNumber) */, 14 /* 2.5.4.6 (OBJ_countryName) */,
+    13 /* 2.5.4.3 (OBJ_commonName) */,
+    100 /* 2.5.4.4 (OBJ_surname) */,
+    105 /* 2.5.4.5 (OBJ_serialNumber) */,
+    14 /* 2.5.4.6 (OBJ_countryName) */,
     15 /* 2.5.4.7 (OBJ_localityName) */,
     16 /* 2.5.4.8 (OBJ_stateOrProvinceName) */,
     660 /* 2.5.4.9 (OBJ_streetAddress) */,
     17 /* 2.5.4.10 (OBJ_organizationName) */,
     18 /* 2.5.4.11 (OBJ_organizationalUnitName) */,
-    106 /* 2.5.4.12 (OBJ_title) */, 107 /* 2.5.4.13 (OBJ_description) */,
+    106 /* 2.5.4.12 (OBJ_title) */,
+    107 /* 2.5.4.13 (OBJ_description) */,
     859 /* 2.5.4.14 (OBJ_searchGuide) */,
     860 /* 2.5.4.15 (OBJ_businessCategory) */,
-    861 /* 2.5.4.16 (OBJ_postalAddress) */, 661 /* 2.5.4.17 (OBJ_postalCode) */,
+    861 /* 2.5.4.16 (OBJ_postalAddress) */,
+    661 /* 2.5.4.17 (OBJ_postalCode) */,
     862 /* 2.5.4.18 (OBJ_postOfficeBox) */,
     863 /* 2.5.4.19 (OBJ_physicalDeliveryOfficeName) */,
     864 /* 2.5.4.20 (OBJ_telephoneNumber) */,
@@ -5366,15 +5379,18 @@
     872 /* 2.5.4.28 (OBJ_preferredDeliveryMethod) */,
     873 /* 2.5.4.29 (OBJ_presentationAddress) */,
     874 /* 2.5.4.30 (OBJ_supportedApplicationContext) */,
-    875 /* 2.5.4.31 (OBJ_member) */, 876 /* 2.5.4.32 (OBJ_owner) */,
-    877 /* 2.5.4.33 (OBJ_roleOccupant) */, 878 /* 2.5.4.34 (OBJ_seeAlso) */,
+    875 /* 2.5.4.31 (OBJ_member) */,
+    876 /* 2.5.4.32 (OBJ_owner) */,
+    877 /* 2.5.4.33 (OBJ_roleOccupant) */,
+    878 /* 2.5.4.34 (OBJ_seeAlso) */,
     879 /* 2.5.4.35 (OBJ_userPassword) */,
     880 /* 2.5.4.36 (OBJ_userCertificate) */,
     881 /* 2.5.4.37 (OBJ_cACertificate) */,
     882 /* 2.5.4.38 (OBJ_authorityRevocationList) */,
     883 /* 2.5.4.39 (OBJ_certificateRevocationList) */,
     884 /* 2.5.4.40 (OBJ_crossCertificatePair) */,
-    173 /* 2.5.4.41 (OBJ_name) */, 99 /* 2.5.4.42 (OBJ_givenName) */,
+    173 /* 2.5.4.41 (OBJ_name) */,
+    99 /* 2.5.4.42 (OBJ_givenName) */,
     101 /* 2.5.4.43 (OBJ_initials) */,
     509 /* 2.5.4.44 (OBJ_generationQualifier) */,
     503 /* 2.5.4.45 (OBJ_x500UniqueIdentifier) */,
@@ -5386,7 +5402,8 @@
     889 /* 2.5.4.51 (OBJ_houseIdentifier) */,
     890 /* 2.5.4.52 (OBJ_supportedAlgorithms) */,
     891 /* 2.5.4.53 (OBJ_deltaRevocationList) */,
-    892 /* 2.5.4.54 (OBJ_dmdName) */, 510 /* 2.5.4.65 (OBJ_pseudonym) */,
+    892 /* 2.5.4.54 (OBJ_dmdName) */,
+    510 /* 2.5.4.65 (OBJ_pseudonym) */,
     400 /* 2.5.4.72 (OBJ_role) */,
     769 /* 2.5.29.9 (OBJ_subject_directory_attributes) */,
     82 /* 2.5.29.14 (OBJ_subject_key_identifier) */,
@@ -5395,7 +5412,8 @@
     85 /* 2.5.29.17 (OBJ_subject_alt_name) */,
     86 /* 2.5.29.18 (OBJ_issuer_alt_name) */,
     87 /* 2.5.29.19 (OBJ_basic_constraints) */,
-    88 /* 2.5.29.20 (OBJ_crl_number) */, 141 /* 2.5.29.21 (OBJ_crl_reason) */,
+    88 /* 2.5.29.20 (OBJ_crl_number) */,
+    141 /* 2.5.29.21 (OBJ_crl_reason) */,
     430 /* 2.5.29.23 (OBJ_hold_instruction_code) */,
     142 /* 2.5.29.24 (OBJ_invalidity_date) */,
     140 /* 2.5.29.27 (OBJ_delta_crl) */,
@@ -5411,16 +5429,26 @@
     857 /* 2.5.29.46 (OBJ_freshest_crl) */,
     748 /* 2.5.29.54 (OBJ_inhibit_any_policy) */,
     402 /* 2.5.29.55 (OBJ_target_information) */,
-    403 /* 2.5.29.56 (OBJ_no_rev_avail) */, 513 /* 2.23.42.0 (OBJ_set_ctype) */,
-    514 /* 2.23.42.1 (OBJ_set_msgExt) */, 515 /* 2.23.42.3 (OBJ_set_attr) */,
-    516 /* 2.23.42.5 (OBJ_set_policy) */, 517 /* 2.23.42.7 (OBJ_set_certExt) */,
-    518 /* 2.23.42.8 (OBJ_set_brand) */, 679 /* 2.23.43.1 (OBJ_wap_wsg) */,
-    382 /* 1.3.6.1.1 (OBJ_Directory) */, 383 /* 1.3.6.1.2 (OBJ_Management) */,
-    384 /* 1.3.6.1.3 (OBJ_Experimental) */, 385 /* 1.3.6.1.4 (OBJ_Private) */,
-    386 /* 1.3.6.1.5 (OBJ_Security) */, 387 /* 1.3.6.1.6 (OBJ_SNMPv2) */,
-    388 /* 1.3.6.1.7 (OBJ_Mail) */, 376 /* 1.3.14.3.2 (OBJ_algorithm) */,
-    395 /* 2.5.1.5.55 (OBJ_clearance) */, 19 /* 2.5.8.1.1 (OBJ_rsa) */,
-    96 /* 2.5.8.3.100 (OBJ_mdc2WithRSA) */, 95 /* 2.5.8.3.101 (OBJ_mdc2) */,
+    403 /* 2.5.29.56 (OBJ_no_rev_avail) */,
+    513 /* 2.23.42.0 (OBJ_set_ctype) */,
+    514 /* 2.23.42.1 (OBJ_set_msgExt) */,
+    515 /* 2.23.42.3 (OBJ_set_attr) */,
+    516 /* 2.23.42.5 (OBJ_set_policy) */,
+    517 /* 2.23.42.7 (OBJ_set_certExt) */,
+    518 /* 2.23.42.8 (OBJ_set_brand) */,
+    679 /* 2.23.43.1 (OBJ_wap_wsg) */,
+    382 /* 1.3.6.1.1 (OBJ_Directory) */,
+    383 /* 1.3.6.1.2 (OBJ_Management) */,
+    384 /* 1.3.6.1.3 (OBJ_Experimental) */,
+    385 /* 1.3.6.1.4 (OBJ_Private) */,
+    386 /* 1.3.6.1.5 (OBJ_Security) */,
+    387 /* 1.3.6.1.6 (OBJ_SNMPv2) */,
+    388 /* 1.3.6.1.7 (OBJ_Mail) */,
+    376 /* 1.3.14.3.2 (OBJ_algorithm) */,
+    395 /* 2.5.1.5.55 (OBJ_clearance) */,
+    19 /* 2.5.8.1.1 (OBJ_rsa) */,
+    96 /* 2.5.8.3.100 (OBJ_mdc2WithRSA) */,
+    95 /* 2.5.8.3.101 (OBJ_mdc2) */,
     746 /* 2.5.29.32.0 (OBJ_any_policy) */,
     910 /* 2.5.29.37.0 (OBJ_anyExtendedKeyUsage) */,
     519 /* 2.23.42.0.0 (OBJ_setct_PANData) */,
@@ -5535,22 +5563,27 @@
     638 /* 2.23.42.8.34 (OBJ_set_brand_AmericanExpress) */,
     639 /* 2.23.42.8.35 (OBJ_set_brand_JCB) */,
     805 /* 1.2.643.2.2 (OBJ_cryptopro) */,
-    806 /* 1.2.643.2.9 (OBJ_cryptocom) */, 184 /* 1.2.840.10040 (OBJ_X9_57) */,
+    806 /* 1.2.643.2.9 (OBJ_cryptocom) */,
+    184 /* 1.2.840.10040 (OBJ_X9_57) */,
     405 /* 1.2.840.10045 (OBJ_ansi_X9_62) */,
     389 /* 1.3.6.1.4.1 (OBJ_Enterprises) */,
     504 /* 1.3.6.1.7.1 (OBJ_mime_mhs) */,
     104 /* 1.3.14.3.2.3 (OBJ_md5WithRSA) */,
-    29 /* 1.3.14.3.2.6 (OBJ_des_ecb) */, 31 /* 1.3.14.3.2.7 (OBJ_des_cbc) */,
+    29 /* 1.3.14.3.2.6 (OBJ_des_ecb) */,
+    31 /* 1.3.14.3.2.7 (OBJ_des_cbc) */,
     45 /* 1.3.14.3.2.8 (OBJ_des_ofb64) */,
     30 /* 1.3.14.3.2.9 (OBJ_des_cfb64) */,
     377 /* 1.3.14.3.2.11 (OBJ_rsaSignature) */,
-    67 /* 1.3.14.3.2.12 (OBJ_dsa_2) */, 66 /* 1.3.14.3.2.13 (OBJ_dsaWithSHA) */,
+    67 /* 1.3.14.3.2.12 (OBJ_dsa_2) */,
+    66 /* 1.3.14.3.2.13 (OBJ_dsaWithSHA) */,
     42 /* 1.3.14.3.2.15 (OBJ_shaWithRSAEncryption) */,
-    32 /* 1.3.14.3.2.17 (OBJ_des_ede_ecb) */, 41 /* 1.3.14.3.2.18 (OBJ_sha) */,
+    32 /* 1.3.14.3.2.17 (OBJ_des_ede_ecb) */,
+    41 /* 1.3.14.3.2.18 (OBJ_sha) */,
     64 /* 1.3.14.3.2.26 (OBJ_sha1) */,
     70 /* 1.3.14.3.2.27 (OBJ_dsaWithSHA1_2) */,
     115 /* 1.3.14.3.2.29 (OBJ_sha1WithRSA) */,
-    117 /* 1.3.36.3.2.1 (OBJ_ripemd160) */, 143 /* 1.3.101.1.4.1 (OBJ_sxnet) */,
+    117 /* 1.3.36.3.2.1 (OBJ_ripemd160) */,
+    143 /* 1.3.101.1.4.1 (OBJ_sxnet) */,
     721 /* 1.3.132.0.1 (OBJ_sect163k1) */,
     722 /* 1.3.132.0.2 (OBJ_sect163r1) */,
     728 /* 1.3.132.0.3 (OBJ_sect239k1) */,
@@ -5614,7 +5647,8 @@
     816 /* 1.2.643.2.2.23 (OBJ_id_GostR3411_94_prf) */,
     817 /* 1.2.643.2.2.98 (OBJ_id_GostR3410_2001DH) */,
     818 /* 1.2.643.2.2.99 (OBJ_id_GostR3410_94DH) */,
-    1 /* 1.2.840.113549 (OBJ_rsadsi) */, 185 /* 1.2.840.10040.4 (OBJ_X9cm) */,
+    1 /* 1.2.840.113549 (OBJ_rsadsi) */,
+    185 /* 1.2.840.10040.4 (OBJ_X9cm) */,
     127 /* 1.3.6.1.5.5.7 (OBJ_id_pkix) */,
     505 /* 1.3.6.1.7.1.1 (OBJ_mime_mhs_headings) */,
     506 /* 1.3.6.1.7.1.2 (OBJ_mime_mhs_bodies) */,