1 files changed, 381 insertions, 63 deletions

diff --git a/src/lib/libssl/src/crypto/objects/objects.h b/src/lib/libssl/src/crypto/objects/objects.h
index e1d555b47c..de10532813 100644
--- a/src/lib/libssl/src/crypto/objects/objects.h
+++ b/src/lib/libssl/src/crypto/objects/objects.h
@@ -59,13 +59,15 @@
 #ifndef HEADER_OBJECTS_H
 #define HEADER_OBJECTS_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
+#define USE_OBJ_MAC
 
+#ifdef USE_OBJ_MAC
+#include <openssl/obj_mac.h>
+#else
 #define SN_undef                        "UNDEF"
 #define LN_undef                        "undefined"
 #define NID_undef                       0
+#define OBJ_undef                       0L
 
 #define SN_Algorithm                    "Algorithm"
 #define LN_algorithm                    "algorithm"
@@ -109,10 +111,12 @@ extern "C" {
 #define NID_md5WithRSAEncryption        8
 #define OBJ_md5WithRSAEncryption        OBJ_pkcs,1L,4L
 
+#define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
 #define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
 #define NID_pbeWithMD2AndDES_CBC        9
 #define OBJ_pbeWithMD2AndDES_CBC        OBJ_pkcs,5L,1L
 
+#define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
 #define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
 #define NID_pbeWithMD5AndDES_CBC        10
 #define OBJ_pbeWithMD5AndDES_CBC        OBJ_pkcs,5L,3L
@@ -229,6 +233,7 @@ extern "C" {
 #define SN_idea_cbc                     "IDEA-CBC"
 #define LN_idea_cbc                     "idea-cbc"
 #define NID_idea_cbc                    34
+#define OBJ_idea_cbc                    1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
 
 #define SN_idea_cfb64                   "IDEA-CFB"
 #define LN_idea_cfb64                   "idea-cfb"
@@ -379,17 +384,21 @@ extern "C" {
 #define OBJ_dsa_2                       OBJ_algorithm,12L
 
 /* proposed by microsoft to RSA */
+#define SN_pbeWithSHA1AndRC2_CBC        "PBE-SHA1-RC2-64"
 #define LN_pbeWithSHA1AndRC2_CBC        "pbeWithSHA1AndRC2-CBC"
 #define NID_pbeWithSHA1AndRC2_CBC       68
 #define OBJ_pbeWithSHA1AndRC2_CBC       OBJ_pkcs,5L,11L 
 
-/* proposed by microsoft to RSA */
-#define LN_pbeWithSHA1AndRC4            "pbeWithSHA1AndRC4"
-#define NID_pbeWithSHA1AndRC4           69
-#define OBJ_pbeWithSHA1AndRC4           OBJ_pkcs,5L,12L 
+/* proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now
+ * defined explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something
+ * completely different.
+ */
+#define LN_id_pbkdf2                    "PBKDF2"
+#define NID_id_pbkdf2                   69
+#define OBJ_id_pbkdf2                   OBJ_pkcs,5L,12L 
 
 #define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#define LN_dsaWithSHA1_2                "dsaWithSHA1"
+#define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
 #define NID_dsaWithSHA1_2               70
 /* Got this one from 'sdn706r20.pdf' which is actually an NSA document :-) */
 #define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
@@ -443,58 +452,59 @@ extern "C" {
 #define LN_desx_cbc                     "desx-cbc"
 #define NID_desx_cbc                    80
 
-#define SN_ld_ce                        "ld-ce"
-#define NID_ld_ce                       81
-#define OBJ_ld_ce                       2L,5L,29L
+#define SN_id_ce                        "id-ce"
+#define NID_id_ce                       81
+#define OBJ_id_ce                       2L,5L,29L
 
 #define SN_subject_key_identifier       "subjectKeyIdentifier"
 #define LN_subject_key_identifier       "X509v3 Subject Key Identifier"
 #define NID_subject_key_identifier      82
-#define OBJ_subject_key_identifier      OBJ_ld_ce,14L
+#define OBJ_subject_key_identifier      OBJ_id_ce,14L
 
 #define SN_key_usage                    "keyUsage"
 #define LN_key_usage                    "X509v3 Key Usage"
 #define NID_key_usage                   83
-#define OBJ_key_usage                   OBJ_ld_ce,15L
+#define OBJ_key_usage                   OBJ_id_ce,15L
 
 #define SN_private_key_usage_period     "privateKeyUsagePeriod"
 #define LN_private_key_usage_period     "X509v3 Private Key Usage Period"
 #define NID_private_key_usage_period    84
-#define OBJ_private_key_usage_period    OBJ_ld_ce,16L
+#define OBJ_private_key_usage_period    OBJ_id_ce,16L
 
 #define SN_subject_alt_name             "subjectAltName"
 #define LN_subject_alt_name             "X509v3 Subject Alternative Name"
 #define NID_subject_alt_name            85
-#define OBJ_subject_alt_name            OBJ_ld_ce,17L
+#define OBJ_subject_alt_name            OBJ_id_ce,17L
 
 #define SN_issuer_alt_name              "issuerAltName"
 #define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
 #define NID_issuer_alt_name             86
-#define OBJ_issuer_alt_name             OBJ_ld_ce,18L
+#define OBJ_issuer_alt_name             OBJ_id_ce,18L
 
 #define SN_basic_constraints            "basicConstraints"
 #define LN_basic_constraints            "X509v3 Basic Constraints"
 #define NID_basic_constraints           87
-#define OBJ_basic_constraints           OBJ_ld_ce,19L
+#define OBJ_basic_constraints           OBJ_id_ce,19L
 
 #define SN_crl_number                   "crlNumber"
 #define LN_crl_number                   "X509v3 CRL Number"
 #define NID_crl_number                  88
-#define OBJ_crl_number                  OBJ_ld_ce,20L
+#define OBJ_crl_number                  OBJ_id_ce,20L
 
 #define SN_certificate_policies         "certificatePolicies"
 #define LN_certificate_policies         "X509v3 Certificate Policies"
 #define NID_certificate_policies        89
-#define OBJ_certificate_policies        OBJ_ld_ce,32L
+#define OBJ_certificate_policies        OBJ_id_ce,32L
 
 #define SN_authority_key_identifier     "authorityKeyIdentifier"
 #define LN_authority_key_identifier     "X509v3 Authority Key Identifier"
 #define NID_authority_key_identifier    90
-#define OBJ_authority_key_identifier    OBJ_ld_ce,35L
+#define OBJ_authority_key_identifier    OBJ_id_ce,35L
 
 #define SN_bf_cbc                       "BF-CBC"
 #define LN_bf_cbc                       "bf-cbc"
 #define NID_bf_cbc                      91
+#define OBJ_bf_cbc                      1L,3L,6L,1L,4L,1L,3029L,1L,2L
 
 #define SN_bf_ecb                       "BF-ECB"
 #define LN_bf_ecb                       "bf-ecb"
@@ -550,7 +560,7 @@ extern "C" {
 #define SN_crl_distribution_points      "crlDistributionPoints"
 #define LN_crl_distribution_points      "X509v3 CRL Distribution Points"
 #define NID_crl_distribution_points     103
-#define OBJ_crl_distribution_points     OBJ_ld_ce,31L
+#define OBJ_crl_distribution_points     OBJ_id_ce,31L
 
 #define SN_md5WithRSA                   "RSA-NP-MD5"
 #define LN_md5WithRSA                   "md5WithRSA"
@@ -623,7 +633,7 @@ extern "C" {
 #define OBJ_ripemd160                   1L,3L,36L,3L,2L,1L
 
 /* The name should actually be rsaSignatureWithripemd160, but I'm going
- * to contiune using the convention I'm using with the other ciphers */
+ * to continue using the convention I'm using with the other ciphers */
 #define SN_ripemd160WithRSA             "RSA-RIPEMD160"
 #define LN_ripemd160WithRSA             "ripemd160WithRSA"
 #define NID_ripemd160WithRSA            119
@@ -654,56 +664,365 @@ extern "C" {
 #define LN_rc5_ofb64                    "rc5-ofb"
 #define NID_rc5_ofb64                   123
 
-#include "bio.h"
-#include "asn1.h"
+#define SN_rle_compression              "RLE"
+#define LN_rle_compression              "run length compression"
+#define NID_rle_compression             124
+#define OBJ_rle_compression             1L,1L,1L,1L,666L,1L
+
+#define SN_zlib_compression             "ZLIB"
+#define LN_zlib_compression             "zlib compression"
+#define NID_zlib_compression            125
+#define OBJ_zlib_compression            1L,1L,1L,1L,666L,2L
+
+#define SN_ext_key_usage                "extendedKeyUsage"
+#define LN_ext_key_usage                "X509v3 Extended Key Usage"
+#define NID_ext_key_usage               126
+#define OBJ_ext_key_usage               OBJ_id_ce,37
+
+#define SN_id_pkix                      "PKIX"
+#define NID_id_pkix                     127
+#define OBJ_id_pkix                     1L,3L,6L,1L,5L,5L,7L
+
+#define SN_id_kp                        "id-kp"
+#define NID_id_kp                       128
+#define OBJ_id_kp                       OBJ_id_pkix,3L
+
+/* PKIX extended key usage OIDs */
+
+#define SN_server_auth                  "serverAuth"
+#define LN_server_auth                  "TLS Web Server Authentication"
+#define NID_server_auth                 129
+#define OBJ_server_auth                 OBJ_id_kp,1L
+
+#define SN_client_auth                  "clientAuth"
+#define LN_client_auth                  "TLS Web Client Authentication"
+#define NID_client_auth                 130
+#define OBJ_client_auth                 OBJ_id_kp,2L
+
+#define SN_code_sign                    "codeSigning"
+#define LN_code_sign                    "Code Signing"
+#define NID_code_sign                   131
+#define OBJ_code_sign                   OBJ_id_kp,3L
+
+#define SN_email_protect                "emailProtection"
+#define LN_email_protect                "E-mail Protection"
+#define NID_email_protect               132
+#define OBJ_email_protect               OBJ_id_kp,4L
+
+#define SN_time_stamp                   "timeStamping"
+#define LN_time_stamp                   "Time Stamping"
+#define NID_time_stamp                  133
+#define OBJ_time_stamp                  OBJ_id_kp,8L
+
+/* Additional extended key usage OIDs: Microsoft */
+
+#define SN_ms_code_ind                  "msCodeInd"
+#define LN_ms_code_ind                  "Microsoft Individual Code Signing"
+#define NID_ms_code_ind                 134
+#define OBJ_ms_code_ind                 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
+
+#define SN_ms_code_com                  "msCodeCom"
+#define LN_ms_code_com                  "Microsoft Commercial Code Signing"
+#define NID_ms_code_com                 135
+#define OBJ_ms_code_com                 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
+
+#define SN_ms_ctl_sign                  "msCTLSign"
+#define LN_ms_ctl_sign                  "Microsoft Trust List Signing"
+#define NID_ms_ctl_sign                 136
+#define OBJ_ms_ctl_sign                 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
+
+#define SN_ms_sgc                       "msSGC"
+#define LN_ms_sgc                       "Microsoft Server Gated Crypto"
+#define NID_ms_sgc                      137
+#define OBJ_ms_sgc                      1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
+
+#define SN_ms_efs                       "msEFS"
+#define LN_ms_efs                       "Microsoft Encrypted File System"
+#define NID_ms_efs                      138
+#define OBJ_ms_efs                      1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
+
+/* Additional usage: Netscape */
+
+#define SN_ns_sgc                       "nsSGC"
+#define LN_ns_sgc                       "Netscape Server Gated Crypto"
+#define NID_ns_sgc                      139
+#define OBJ_ns_sgc                      OBJ_netscape,4L,1L
+
+#define SN_delta_crl                    "deltaCRL"
+#define LN_delta_crl                    "X509v3 Delta CRL Indicator"
+#define NID_delta_crl                   140
+#define OBJ_delta_crl                   OBJ_id_ce,27L
+
+#define SN_crl_reason                   "CRLReason"
+#define LN_crl_reason                   "CRL Reason Code"
+#define NID_crl_reason                  141
+#define OBJ_crl_reason                  OBJ_id_ce,21L
 
-#define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
+#define SN_invalidity_date              "invalidityDate"
+#define LN_invalidity_date              "Invalidity Date"
+#define NID_invalidity_date             142
+#define OBJ_invalidity_date             OBJ_id_ce,24L
+
+#define SN_sxnet                        "SXNetID"
+#define LN_sxnet                        "Strong Extranet ID"
+#define NID_sxnet                       143
+#define OBJ_sxnet                       1L,3L,101L,1L,4L,1L
+
+/* PKCS12 and related OBJECT IDENTIFIERS */
+
+#define OBJ_pkcs12                      OBJ_pkcs,12L
+#define OBJ_pkcs12_pbeids               OBJ_pkcs12, 1
 
-#ifndef NOPROTO
+#define SN_pbe_WithSHA1And128BitRC4     "PBE-SHA1-RC4-128"
+#define LN_pbe_WithSHA1And128BitRC4     "pbeWithSHA1And128BitRC4"
+#define NID_pbe_WithSHA1And128BitRC4    144
+#define OBJ_pbe_WithSHA1And128BitRC4    OBJ_pkcs12_pbeids, 1L
 
-ASN1_OBJECT *   OBJ_dup(ASN1_OBJECT *o);
-ASN1_OBJECT *   OBJ_nid2obj(int n);
-char *          OBJ_nid2ln(int n);
-char *          OBJ_nid2sn(int n);
-int             OBJ_obj2nid(ASN1_OBJECT *o);
-int             OBJ_txt2nid(char *s);
-int             OBJ_ln2nid(char *s);
-int             OBJ_sn2nid(char *s);
-int             OBJ_cmp(ASN1_OBJECT *a,ASN1_OBJECT *b);
-char *          OBJ_bsearch(char *key,char *base,int num,int size,int (*cmp)());
+#define SN_pbe_WithSHA1And40BitRC4      "PBE-SHA1-RC4-40"
+#define LN_pbe_WithSHA1And40BitRC4      "pbeWithSHA1And40BitRC4"
+#define NID_pbe_WithSHA1And40BitRC4     145
+#define OBJ_pbe_WithSHA1And40BitRC4     OBJ_pkcs12_pbeids, 2L
 
-void            ERR_load_OBJ_strings(void );
+#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC   "PBE-SHA1-3DES"
+#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC   "pbeWithSHA1And3-KeyTripleDES-CBC"
+#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC  146
+#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 3L
+
+#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC   "PBE-SHA1-2DES"
+#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC   "pbeWithSHA1And2-KeyTripleDES-CBC"
+#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC  147
+#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 4L
+
+#define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
+#define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
+#define NID_pbe_WithSHA1And128BitRC2_CBC        148
+#define OBJ_pbe_WithSHA1And128BitRC2_CBC        OBJ_pkcs12_pbeids, 5L
+
+#define SN_pbe_WithSHA1And40BitRC2_CBC  "PBE-SHA1-RC2-40"
+#define LN_pbe_WithSHA1And40BitRC2_CBC  "pbeWithSHA1And40BitRC2-CBC"
+#define NID_pbe_WithSHA1And40BitRC2_CBC 149
+#define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids, 6L
+
+#define OBJ_pkcs12_Version1     OBJ_pkcs12, 10L
+
+#define OBJ_pkcs12_BagIds       OBJ_pkcs12_Version1, 1L
 
-int             OBJ_new_nid(int num);
-int             OBJ_add_object(ASN1_OBJECT *obj);
-int             OBJ_create(char *oid,char *sn,char *ln);
-void            OBJ_cleanup(void );
-int             OBJ_create_objects(BIO *in);
+#define LN_keyBag               "keyBag"
+#define NID_keyBag              150
+#define OBJ_keyBag              OBJ_pkcs12_BagIds, 1L
+
+#define LN_pkcs8ShroudedKeyBag  "pkcs8ShroudedKeyBag"
+#define NID_pkcs8ShroudedKeyBag 151
+#define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds, 2L
+
+#define LN_certBag              "certBag"
+#define NID_certBag             152
+#define OBJ_certBag             OBJ_pkcs12_BagIds, 3L
+
+#define LN_crlBag               "crlBag"
+#define NID_crlBag              153
+#define OBJ_crlBag              OBJ_pkcs12_BagIds, 4L
+
+#define LN_secretBag            "secretBag"
+#define NID_secretBag           154
+#define OBJ_secretBag           OBJ_pkcs12_BagIds, 5L
+
+#define LN_safeContentsBag      "safeContentsBag"
+#define NID_safeContentsBag     155
+#define OBJ_safeContentsBag     OBJ_pkcs12_BagIds, 6L
 
-#else
+#define LN_friendlyName         "friendlyName"
+#define NID_friendlyName        156
+#define OBJ_friendlyName        OBJ_pkcs9, 20L
+
+#define LN_localKeyID           "localKeyID"
+#define NID_localKeyID          157
+#define OBJ_localKeyID          OBJ_pkcs9, 21L
+
+#define OBJ_certTypes           OBJ_pkcs9, 22L
+
+#define LN_x509Certificate      "x509Certificate"
+#define NID_x509Certificate     158
+#define OBJ_x509Certificate     OBJ_certTypes, 1L
+
+#define LN_sdsiCertificate      "sdsiCertificate"
+#define NID_sdsiCertificate     159
+#define OBJ_sdsiCertificate     OBJ_certTypes, 2L
+
+#define OBJ_crlTypes            OBJ_pkcs9, 23L
+
+#define LN_x509Crl              "x509Crl"
+#define NID_x509Crl             160
+#define OBJ_x509Crl             OBJ_crlTypes, 1L
+
+/* PKCS#5 v2 OIDs */
+
+#define LN_pbes2                "PBES2"
+#define NID_pbes2               161
+#define OBJ_pbes2               OBJ_pkcs,5L,13L
+
+#define LN_pbmac1               "PBMAC1"
+#define NID_pbmac1              162
+#define OBJ_pbmac1              OBJ_pkcs,5L,14L
+
+#define LN_hmacWithSHA1         "hmacWithSHA1"
+#define NID_hmacWithSHA1        163
+#define OBJ_hmacWithSHA1        OBJ_rsadsi,2L,7L
+
+/* Policy Qualifier Ids */
+
+#define LN_id_qt_cps            "Policy Qualifier CPS"
+#define SN_id_qt_cps            "id-qt-cps"
+#define NID_id_qt_cps           164
+#define OBJ_id_qt_cps           OBJ_id_pkix,2L,1L
+
+#define LN_id_qt_unotice        "Policy Qualifier User Notice"
+#define SN_id_qt_unotice        "id-qt-unotice"
+#define NID_id_qt_unotice       165
+#define OBJ_id_qt_unotice       OBJ_id_pkix,2L,2L
+
+#define SN_rc2_64_cbc                   "RC2-64-CBC"
+#define LN_rc2_64_cbc                   "rc2-64-cbc"
+#define NID_rc2_64_cbc                  166
+
+#define SN_SMIMECapabilities            "SMIME-CAPS"
+#define LN_SMIMECapabilities            "S/MIME Capabilities"
+#define NID_SMIMECapabilities           167
+#define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
+
+#define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
+#define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
+#define NID_pbeWithMD2AndRC2_CBC        168
+#define OBJ_pbeWithMD2AndRC2_CBC        OBJ_pkcs,5L,4L
+
+#define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
+#define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
+#define NID_pbeWithMD5AndRC2_CBC        169
+#define OBJ_pbeWithMD5AndRC2_CBC        OBJ_pkcs,5L,6L
+
+#define SN_pbeWithSHA1AndDES_CBC        "PBE-SHA1-DES"
+#define LN_pbeWithSHA1AndDES_CBC        "pbeWithSHA1AndDES-CBC"
+#define NID_pbeWithSHA1AndDES_CBC       170
+#define OBJ_pbeWithSHA1AndDES_CBC       OBJ_pkcs,5L,10L
+
+/* Extension request OIDs */
+
+#define LN_ms_ext_req                   "Microsoft Extension Request"
+#define SN_ms_ext_req                   "msExtReq"
+#define NID_ms_ext_req                  171
+#define OBJ_ms_ext_req                  1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
 
-ASN1_OBJECT *   OBJ_dup();
-ASN1_OBJECT *   OBJ_nid2obj();
-char *          OBJ_nid2ln();
-char *          OBJ_nid2sn();
-int             OBJ_obj2nid();
-int             OBJ_txt2nid();
-int             OBJ_ln2nid();
-int             OBJ_sn2nid();
-int             OBJ_cmp();
-char *          OBJ_bsearch();
-
-void            ERR_load_OBJ_strings();
-
-int             OBJ_new_nid();
-int             OBJ_add_object();
-int             OBJ_create();
-void            OBJ_cleanup();
-int             OBJ_create_objects();
+#define LN_ext_req                      "Extension Request"
+#define SN_ext_req                      "extReq"
+#define NID_ext_req                     172
+#define OBJ_ext_req                     OBJ_pkcs9,14L
 
+#define SN_name                         "name"
+#define LN_name                         "name"
+#define NID_name                        173
+#define OBJ_name                        OBJ_X509,41L
+
+#define SN_dnQualifier                  "dnQualifier"
+#define LN_dnQualifier                  "dnQualifier"
+#define NID_dnQualifier                 174
+#define OBJ_dnQualifier                 OBJ_X509,46L
+
+#define SN_id_pe                        "id-pe"
+#define NID_id_pe                       175
+#define OBJ_id_pe                       OBJ_id_pkix,1L
+
+#define SN_id_ad                        "id-ad"
+#define NID_id_ad                       176
+#define OBJ_id_ad                       OBJ_id_pkix,48L
+
+#define SN_info_access                  "authorityInfoAccess"
+#define LN_info_access                  "Authority Information Access"
+#define NID_info_access                 177
+#define OBJ_info_access                 OBJ_id_pe,1L
+
+#define SN_ad_OCSP                      "OCSP"
+#define LN_ad_OCSP                      "OCSP"
+#define NID_ad_OCSP                     178
+#define OBJ_ad_OCSP                     OBJ_id_ad,1L
+
+#define SN_ad_ca_issuers                "caIssuers"
+#define LN_ad_ca_issuers                "CA Issuers"
+#define NID_ad_ca_issuers               179
+#define OBJ_ad_ca_issuers               OBJ_id_ad,2L
+
+#define SN_OCSP_sign                    "OCSPSigning"
+#define LN_OCSP_sign                    "OCSP Signing"
+#define NID_OCSP_sign                   180
+#define OBJ_OCSP_sign                   OBJ_id_kp,9L
+#endif /* USE_OBJ_MAC */
+
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+
+#define OBJ_NAME_TYPE_UNDEF             0x00
+#define OBJ_NAME_TYPE_MD_METH           0x01
+#define OBJ_NAME_TYPE_CIPHER_METH       0x02
+#define OBJ_NAME_TYPE_PKEY_METH         0x03
+#define OBJ_NAME_TYPE_COMP_METH         0x04
+#define OBJ_NAME_TYPE_NUM               0x05
+
+#define OBJ_NAME_ALIAS          0x8000
+
+
+#ifdef  __cplusplus
+extern "C" {
 #endif
 
+typedef struct obj_name_st
+        {
+        int type;
+        int alias;
+        const char *name;
+        const char *data;
+        } OBJ_NAME;
+
+#define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
+
+
+int OBJ_NAME_init(void);
+int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
+                       int (*cmp_func)(const char *, const char *),
+                       void (*free_func)(const char *, int, const char *));
+const char *OBJ_NAME_get(const char *name,int type);
+int OBJ_NAME_add(const char *name,int type,const char *data);
+int OBJ_NAME_remove(const char *name,int type);
+void OBJ_NAME_cleanup(int type); /* -1 for everything */
+void OBJ_NAME_do_all(int type,void (*fn)(const OBJ_NAME *,void *arg),
+                     void *arg);
+void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
+                            void *arg);
+
+ASN1_OBJECT *   OBJ_dup(const ASN1_OBJECT *o);
+ASN1_OBJECT *   OBJ_nid2obj(int n);
+const char *    OBJ_nid2ln(int n);
+const char *    OBJ_nid2sn(int n);
+int             OBJ_obj2nid(const ASN1_OBJECT *o);
+ASN1_OBJECT *   OBJ_txt2obj(const char *s, int no_name);
+int     OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name);
+int             OBJ_txt2nid(const char *s);
+int             OBJ_ln2nid(const char *s);
+int             OBJ_sn2nid(const char *s);
+int             OBJ_cmp(const ASN1_OBJECT *a,const ASN1_OBJECT *b);
+const char *    OBJ_bsearch(const char *key,const char *base,int num,int size,
+        int (*cmp)(const void *, const void *));
+
+int             OBJ_new_nid(int num);
+int             OBJ_add_object(const ASN1_OBJECT *obj);
+int             OBJ_create(const char *oid,const char *sn,const char *ln);
+void            OBJ_cleanup(void );
+int             OBJ_create_objects(BIO *in);
+
 /* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+void ERR_load_OBJ_strings(void);
+
 /* Error codes for the OBJ functions. */
 
 /* Function codes. */
@@ -716,9 +1035,8 @@ int		OBJ_create_objects();
 /* Reason codes. */
 #define OBJ_R_MALLOC_FAILURE                             100
 #define OBJ_R_UNKNOWN_NID                                101
- 
+
 #ifdef  __cplusplus
 }
 #endif
 #endif
-