-#define ASN1_F_D2I_ASN1_VISIBLESTRING 180
-#define ASN1_F_D2I_DHPARAMS 152
-#define ASN1_F_D2I_DSAPARAMS 153
-#define ASN1_F_D2I_DSAPRIVATEKEY 154
-#define ASN1_F_D2I_DSAPUBLICKEY 155
-#define ASN1_F_D2I_NETSCAPE_RSA 156
-#define ASN1_F_D2I_NETSCAPE_RSA_2 157
-#define ASN1_F_D2I_OCSP_BASICRESP 181
-#define ASN1_F_D2I_OCSP_CERTID 182
-#define ASN1_F_D2I_OCSP_CERTSTATUS 183
-#define ASN1_F_D2I_OCSP_CRLID 184
-#define ASN1_F_D2I_OCSP_ONEREQ 185
-#define ASN1_F_D2I_OCSP_REQINFO 186
-#define ASN1_F_D2I_OCSP_REQUEST 187
-#define ASN1_F_D2I_OCSP_RESPBYTES 188
-#define ASN1_F_D2I_OCSP_RESPDATA 189
-#define ASN1_F_D2I_OCSP_RESPID 190
-#define ASN1_F_D2I_OCSP_RESPONSE 191
-#define ASN1_F_D2I_OCSP_REVOKEDINFO 192
-#define ASN1_F_D2I_OCSP_SERVICELOC 193
-#define ASN1_F_D2I_OCSP_SIGNATURE 194
-#define ASN1_F_D2I_OCSP_SINGLERESP 195
-#define ASN1_F_D2I_PKCS12 196
-#define ASN1_F_D2I_PKCS12_BAGS 197
-#define ASN1_F_D2I_PKCS12_MAC_DATA 198
-#define ASN1_F_D2I_PKCS12_SAFEBAG 199
-#define ASN1_F_D2I_PKCS7 200
-#define ASN1_F_D2I_PKCS7_DIGEST 201
-#define ASN1_F_D2I_PKCS7_ENCRYPT 202
-#define ASN1_F_D2I_PKCS7_ENC_CONTENT 203
-#define ASN1_F_D2I_PKCS7_ENVELOPE 204
-#define ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL 205
-#define ASN1_F_D2I_PKCS7_RECIP_INFO 206
-#define ASN1_F_D2I_PKCS7_SIGNED 207
-#define ASN1_F_D2I_PKCS7_SIGNER_INFO 208
-#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE 209
-#define ASN1_F_D2I_PRIVATEKEY 158
-#define ASN1_F_D2I_PUBLICKEY 159
-#define ASN1_F_D2I_RSAPRIVATEKEY 243
-#define ASN1_F_D2I_RSAPUBLICKEY 244
-#define ASN1_F_D2I_X509 210
-#define ASN1_F_D2I_X509_CINF 211
-#define ASN1_F_D2I_X509_NAME 160
-#define ASN1_F_D2I_X509_PKEY 161
-#define ASN1_F_I2D_ASN1_TIME 162
-#define ASN1_F_I2D_DHPARAMS 163
-#define ASN1_F_I2D_DSAPARAMS 164
-#define ASN1_F_I2D_DSAPRIVATEKEY 165
-#define ASN1_F_I2D_DSAPUBLICKEY 166
-#define ASN1_F_I2D_DSA_PUBKEY 167
-#define ASN1_F_I2D_NETSCAPE_RSA 168
-#define ASN1_F_I2D_PRIVATEKEY 169
-#define ASN1_F_I2D_PUBLICKEY 170
-#define ASN1_F_I2D_RSAPRIVATEKEY 245
-#define ASN1_F_I2D_RSAPUBLICKEY 246
-#define ASN1_F_I2D_RSA_PUBKEY 171
-#define ASN1_F_LONG_C2I 172
-#define ASN1_F_OCSP_BASICRESP_NEW 212
-#define ASN1_F_OCSP_CERTID_NEW 213
-#define ASN1_F_OCSP_CERTSTATUS_NEW 214
-#define ASN1_F_OCSP_CRLID_NEW 215
-#define ASN1_F_OCSP_ONEREQ_NEW 216
-#define ASN1_F_OCSP_REQINFO_NEW 217
-#define ASN1_F_OCSP_REQUEST_NEW 218
-#define ASN1_F_OCSP_RESPBYTES_NEW 219
-#define ASN1_F_OCSP_RESPDATA_NEW 220
-#define ASN1_F_OCSP_RESPID_NEW 221
-#define ASN1_F_OCSP_RESPONSE_NEW 222
-#define ASN1_F_OCSP_REVOKEDINFO_NEW 223
-#define ASN1_F_OCSP_SERVICELOC_NEW 224
-#define ASN1_F_OCSP_SIGNATURE_NEW 225
-#define ASN1_F_OCSP_SINGLERESP_NEW 226
-#define ASN1_F_PKCS12_BAGS_NEW 227
-#define ASN1_F_PKCS12_MAC_DATA_NEW 228
-#define ASN1_F_PKCS12_NEW 229
-#define ASN1_F_PKCS12_SAFEBAG_NEW 230
-#define ASN1_F_PKCS5_PBE2_SET 173
-#define ASN1_F_PKCS7_DIGEST_NEW 231
-#define ASN1_F_PKCS7_ENCRYPT_NEW 232
-#define ASN1_F_PKCS7_ENC_CONTENT_NEW 233
-#define ASN1_F_PKCS7_ENVELOPE_NEW 234
-#define ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW 235
-#define ASN1_F_PKCS7_NEW 236
-#define ASN1_F_PKCS7_RECIP_INFO_NEW 237
-#define ASN1_F_PKCS7_SIGNED_NEW 238
-#define ASN1_F_PKCS7_SIGNER_INFO_NEW 239
-#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW 240
-#define ASN1_F_X509_CINF_NEW 241
-#define ASN1_F_X509_CRL_ADD0_REVOKED 174
-#define ASN1_F_X509_INFO_NEW 175
-#define ASN1_F_X509_NAME_NEW 176
-#define ASN1_F_X509_NEW 242
-#define ASN1_F_X509_PKEY_NEW 177
+#define ASN1_F_D2I_AUTOPRIVATEKEY 207
+#define ASN1_F_D2I_NETSCAPE_RSA 152
+#define ASN1_F_D2I_NETSCAPE_RSA_2 153
+#define ASN1_F_D2I_PRIVATEKEY 154
+#define ASN1_F_D2I_PUBLICKEY 155
+#define ASN1_F_D2I_RSA_NET 200
+#define ASN1_F_D2I_RSA_NET_2 201
+#define ASN1_F_D2I_X509 156
+#define ASN1_F_D2I_X509_CINF 157
+#define ASN1_F_D2I_X509_PKEY 159
+#define ASN1_F_I2D_ASN1_BIO_STREAM 211
+#define ASN1_F_I2D_ASN1_SET 188
+#define ASN1_F_I2D_ASN1_TIME 160
+#define ASN1_F_I2D_DSA_PUBKEY 161
+#define ASN1_F_I2D_EC_PUBKEY 181
+#define ASN1_F_I2D_PRIVATEKEY 163
+#define ASN1_F_I2D_PUBLICKEY 164
+#define ASN1_F_I2D_RSA_NET 162
+#define ASN1_F_I2D_RSA_PUBKEY 165
+#define ASN1_F_LONG_C2I 166
+#define ASN1_F_OID_MODULE_INIT 174
+#define ASN1_F_PARSE_TAGGING 182
+#define ASN1_F_PKCS5_PBE2_SET_IV 167
+#define ASN1_F_PKCS5_PBE_SET 202
+#define ASN1_F_PKCS5_PBE_SET0_ALGOR 215
+#define ASN1_F_PKCS5_PBKDF2_SET 219
+#define ASN1_F_SMIME_READ_ASN1 212
+#define ASN1_F_SMIME_TEXT 213
+#define ASN1_F_X509_CINF_NEW 168
+#define ASN1_F_X509_CRL_ADD0_REVOKED 169
+#define ASN1_F_X509_INFO_NEW 170
+#define ASN1_F_X509_NAME_ENCODE 203
+#define ASN1_F_X509_NAME_EX_D2I 158
+#define ASN1_F_X509_NAME_EX_NEW 171
+#define ASN1_F_X509_NEW 172
+#define ASN1_F_X509_PKEY_NEW 173