Add a few extended key usage OIDs.
[openssl.git] / crypto / objects / objects.h
index e69cb71..bfcb90a 100644 (file)
@@ -1,5 +1,5 @@
 /* crypto/objects/objects.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -66,6 +66,7 @@ extern "C" {
 #define SN_undef                       "UNDEF"
 #define LN_undef                       "undefined"
 #define NID_undef                      0
+#define OBJ_undef                      0L
 
 #define SN_Algorithm                   "Algorithm"
 #define LN_algorithm                   "algorithm"
@@ -373,10 +374,10 @@ extern "C" {
 #define NID_dsaWithSHA                 66
 #define OBJ_dsaWithSHA                 OBJ_algorithm,13L
 
-#define SN_dsa                         "DSA"
-#define LN_dsa                         "dsaEncryption"
-#define NID_dsa                                67
-#define OBJ_dsa                                OBJ_algorithm,12L
+#define SN_dsa_2                       "DSA-old"
+#define LN_dsa_2                       "dsaEncryption-old"
+#define NID_dsa_2                      67
+#define OBJ_dsa_2                      OBJ_algorithm,12L
 
 /* proposed by microsoft to RSA */
 #define LN_pbeWithSHA1AndRC2_CBC       "pbeWithSHA1AndRC2-CBC"
@@ -388,11 +389,11 @@ extern "C" {
 #define NID_pbeWithSHA1AndRC4          69
 #define OBJ_pbeWithSHA1AndRC4          OBJ_pkcs,5L,12L 
 
-#define SN_dsaWithSHA1                 "DSA-SHA1"
-#define LN_dsaWithSHA1                 "dsaWithSHA1"
-#define NID_dsaWithSHA1                        70
+#define SN_dsaWithSHA1_2               "DSA-SHA1-old"
+#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                        OBJ_algorithm,27L
+#define OBJ_dsaWithSHA1_2              OBJ_algorithm,27L
 
 #define SN_netscape_cert_type          "nsCertType"
 #define LN_netscape_cert_type          "Netscape Cert Type"
@@ -512,21 +513,271 @@ extern "C" {
 #define LN_mdc2                                "mdc2"
 #define NID_mdc2                       95
 #define OBJ_mdc2                       2L,5L,8L,3L,101L
+/* An alternative?                     1L,3L,14L,3L,2L,19L */
 
 #define SN_mdc2WithRSA                 "RSA-MDC2"
 #define LN_mdc2WithRSA                 "mdc2withRSA"
 #define NID_mdc2WithRSA                        96
 #define OBJ_mdc2WithRSA                        2L,5L,8L,3L,100L
 
+#define SN_rc4_40                      "RC4-40"
+#define LN_rc4_40                      "rc4-40"
+#define NID_rc4_40                     97
+
+#define SN_rc2_40_cbc                  "RC2-40-CBC"
+#define LN_rc2_40_cbc                  "rc2-40-cbc"
+#define NID_rc2_40_cbc                 98
+
+#define SN_givenName                   "G"
+#define LN_givenName                   "givenName"
+#define NID_givenName                  99
+#define OBJ_givenName                  OBJ_X509,42L
+
+#define SN_surname                     "S"
+#define LN_surname                     "surname"
+#define NID_surname                    100
+#define OBJ_surname                    OBJ_X509,4L
+
+#define SN_initials                    "I"
+#define LN_initials                    "initials"
+#define NID_initials                   101
+#define OBJ_initials                   OBJ_X509,43L
+
+#define SN_uniqueIdentifier            "UID"
+#define LN_uniqueIdentifier            "uniqueIdentifier"
+#define NID_uniqueIdentifier           102
+#define OBJ_uniqueIdentifier           OBJ_X509,45L
+
+#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 SN_md5WithRSA                  "RSA-NP-MD5"
+#define LN_md5WithRSA                  "md5WithRSA"
+#define NID_md5WithRSA                 104
+#define OBJ_md5WithRSA                 OBJ_algorithm,3L
+
+#define SN_serialNumber                        "SN"
+#define LN_serialNumber                        "serialNumber"
+#define NID_serialNumber               105
+#define OBJ_serialNumber               OBJ_X509,5L
+
+#define SN_title                       "T"
+#define LN_title                       "title"
+#define NID_title                      106
+#define OBJ_title                      OBJ_X509,12L
+
+#define SN_description                 "D"
+#define LN_description                 "description"
+#define NID_description                        107
+#define OBJ_description                        OBJ_X509,13L
+
+/* CAST5 is CAST-128, I'm just sticking with the documentation */
+#define SN_cast5_cbc                   "CAST5-CBC"
+#define LN_cast5_cbc                   "cast5-cbc"
+#define NID_cast5_cbc                  108
+#define OBJ_cast5_cbc                  1L,2L,840L,113533L,7L,66L,10L
+
+#define SN_cast5_ecb                   "CAST5-ECB"
+#define LN_cast5_ecb                   "cast5-ecb"
+#define NID_cast5_ecb                  109
+
+#define SN_cast5_cfb64                 "CAST5-CFB"
+#define LN_cast5_cfb64                 "cast5-cfb"
+#define NID_cast5_cfb64                        110
+
+#define SN_cast5_ofb64                 "CAST5-OFB"
+#define LN_cast5_ofb64                 "cast5-ofb"
+#define NID_cast5_ofb64                        111
+
+#define LN_pbeWithMD5AndCast5_CBC      "pbeWithMD5AndCast5CBC"
+#define NID_pbeWithMD5AndCast5_CBC     112
+#define OBJ_pbeWithMD5AndCast5_CBC     1L,2L,840L,113533L,7L,66L,12L
+
+/* This is one sun will soon be using :-(
+ * id-dsa-with-sha1 ID  ::= {
+ *   iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
+ */
+#define SN_dsaWithSHA1                 "DSA-SHA1"
+#define LN_dsaWithSHA1                 "dsaWithSHA1"
+#define NID_dsaWithSHA1                        113
+#define OBJ_dsaWithSHA1                        1L,2L,840L,10040L,4L,3L
+
+#define NID_md5_sha1                   114
+#define SN_md5_sha1                    "MD5-SHA1"
+#define LN_md5_sha1                    "md5-sha1"
+
+#define SN_sha1WithRSA                 "RSA-SHA1-2"
+#define LN_sha1WithRSA                 "sha1WithRSA"
+#define NID_sha1WithRSA                        115
+#define OBJ_sha1WithRSA                        OBJ_algorithm,29L
+
+#define SN_dsa                         "DSA"
+#define LN_dsa                         "dsaEncryption"
+#define NID_dsa                                116
+#define OBJ_dsa                                1L,2L,840L,10040L,4L,1L
+
+#define SN_ripemd160                   "RIPEMD160"
+#define LN_ripemd160                   "ripemd160"
+#define NID_ripemd160                  117
+#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 */
+#define SN_ripemd160WithRSA            "RSA-RIPEMD160"
+#define LN_ripemd160WithRSA            "ripemd160WithRSA"
+#define NID_ripemd160WithRSA           119
+#define OBJ_ripemd160WithRSA           1L,3L,36L,3L,3L,1L,2L
+
+/* Taken from rfc2040
+ *  RC5_CBC_Parameters ::= SEQUENCE {
+ *     version           INTEGER (v1_0(16)),
+ *     rounds            INTEGER (8..127),
+ *     blockSizeInBits   INTEGER (64, 128),
+ *     iv                OCTET STRING OPTIONAL
+ *     }
+ */
+#define SN_rc5_cbc                     "RC5-CBC"
+#define LN_rc5_cbc                     "rc5-cbc"
+#define NID_rc5_cbc                    120
+#define OBJ_rc5_cbc                    OBJ_rsadsi,3L,8L
+
+#define SN_rc5_ecb                     "RC5-ECB"
+#define LN_rc5_ecb                     "rc5-ecb"
+#define NID_rc5_ecb                    121
+
+#define SN_rc5_cfb64                   "RC5-CFB"
+#define LN_rc5_cfb64                   "rc5-cfb"
+#define NID_rc5_cfb64                  122
+
+#define SN_rc5_ofb64                   "RC5-OFB"
+#define LN_rc5_ofb64                   "rc5-ofb"
+#define NID_rc5_ofb64                  123
+
+#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_ld_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
+
+/* Addidional 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
+
+#include "bio.h"
 #include "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
+
+
+typedef struct obj_name_st
+       {
+       int type;
+       int alias;
+       char *name;
+       char *data;
+       } OBJ_NAME;
+
+#define                OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
+
 #ifndef NOPROTO
 
+int OBJ_NAME_init(void);
+int OBJ_NAME_new_index(unsigned long (*hash_func)(),int (*cmp_func)(),
+       void (*free_func)());
+char *OBJ_NAME_get(char *name,int type);
+int OBJ_NAME_add(char *name,int type,char *data);
+int OBJ_NAME_remove(char *name,int type);
+void OBJ_NAME_cleanup(int type); /* -1 for everything */
+
 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);
+ASN1_OBJECT *  OBJ_txt2obj(char *s, int no_name);
 int            OBJ_txt2nid(char *s);
 int            OBJ_ln2nid(char *s);
 int            OBJ_sn2nid(char *s);
@@ -537,17 +788,25 @@ void              ERR_load_OBJ_strings(void );
 
 int            OBJ_new_nid(int num);
 int            OBJ_add_object(ASN1_OBJECT *obj);
-int            OBJ_create_and_add_object(char *oid,char *sn,char *ln);
-
+int            OBJ_create(char *oid,char *sn,char *ln);
 void           OBJ_cleanup(void );
+int            OBJ_create_objects(BIO *in);
 
 #else
 
+int OBJ_NAME_init();
+int OBJ_NAME_new_index();
+char *OBJ_NAME_get();
+int OBJ_NAME_add();
+int OBJ_NAME_remove();
+void OBJ_NAME_cleanup();
+
 ASN1_OBJECT *  OBJ_dup();
 ASN1_OBJECT *  OBJ_nid2obj();
 char *         OBJ_nid2ln();
 char *         OBJ_nid2sn();
 int            OBJ_obj2nid();
+ASN1_OBJECT *  OBJ_txt2obj();
 int            OBJ_txt2nid();
 int            OBJ_ln2nid();
 int            OBJ_sn2nid();
@@ -558,8 +817,9 @@ void                ERR_load_OBJ_strings();
 
 int            OBJ_new_nid();
 int            OBJ_add_object();
-int            OBJ_create_and_add_object();
+int            OBJ_create();
 void           OBJ_cleanup();
+int            OBJ_create_objects();
 
 #endif
 
@@ -567,7 +827,7 @@ void                OBJ_cleanup();
 /* Error codes for the OBJ functions. */
 
 /* Function codes. */
-#define OBJ_F_OBJ_CREATE_AND_ADD_OBJECT                         100
+#define OBJ_F_OBJ_CREATE                                100
 #define OBJ_F_OBJ_DUP                                   101
 #define OBJ_F_OBJ_NID2LN                                102
 #define OBJ_F_OBJ_NID2OBJ                               103