The rest of the PKCS#5, PKCS#8 patch I forgot before :-)

[openssl.git] / crypto / objects / objects.h

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 431d86e97911537da0172d45ac9acdb0cffbeb0a..fd5c02d3138309c88d718bdd48faabc7b86b03bf 100644 (file)
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -840,10 +840,55 @@ extern "C" {
 #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
 
-#include "bio.h"
-#include "asn1.h"
+#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_id_pkcs9,15L
+
+#define LN_pbeWithMD2AndRC2_CBC                "pbeWithMD2AndRC2-CBC"
+#define NID_pbeWithMD2AndRC2_CBC       168
+#define OBJ_pbeWithMD2AndRC2_CBC       OBJ_pkcs,5L,4L
+
+#define LN_pbeWithMD5AndRC2_CBC                "pbeWithMD5AndRC2-CBC"
+#define NID_pbeWithMD5AndRC2_CBC       169
+#define OBJ_pbeWithMD5AndRC2_CBC       OBJ_pkcs,5L,6L
+
+#define LN_pbeWithSHA1AndDES_CBC       "pbeWithSHA1AndDES-CBC"
+#define NID_pbeWithSHA1AndDES_CBC      170
+#define OBJ_pbeWithSHA1AndDES_CBC      OBJ_pkcs,5L,10L
+
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
 
 #define        OBJ_NAME_TYPE_UNDEF             0x00
 #define        OBJ_NAME_TYPE_MD_METH           0x01
@@ -859,31 +904,30 @@ typedef struct obj_name_st
        {
        int type;
        int alias;
-       char *name;
-       char *data;
+       const char *name;
+       const 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);
+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 */
 
 ASN1_OBJECT *  OBJ_dup(ASN1_OBJECT *o);
 ASN1_OBJECT *  OBJ_nid2obj(int n);
-char *         OBJ_nid2ln(int n);
-char *         OBJ_nid2sn(int n);
+const char *   OBJ_nid2ln(int n);
+const char *   OBJ_nid2sn(int n);
 int            OBJ_obj2nid(ASN1_OBJECT *o);
-ASN1_OBJECT *  OBJ_txt2obj(char *s, int no_name);
+ASN1_OBJECT *  OBJ_txt2obj(const char *s, int no_name);
 int            OBJ_txt2nid(char *s);
-int            OBJ_ln2nid(char *s);
-int            OBJ_sn2nid(char *s);
+int            OBJ_ln2nid(const char *s);
+int            OBJ_sn2nid(const char *s);
 int            OBJ_cmp(ASN1_OBJECT *a,ASN1_OBJECT *b);
 char *         OBJ_bsearch(char *key,char *base,int num,int size,int (*cmp)());
 
@@ -895,38 +939,11 @@ 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();
-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();
-
-#endif
-
 /* 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.
+ */
+
 /* Error codes for the OBJ functions. */
 
 /* Function codes. */
@@ -939,7 +956,7 @@ int         OBJ_create_objects();
 /* Reason codes. */
 #define OBJ_R_MALLOC_FAILURE                            100
 #define OBJ_R_UNKNOWN_NID                               101
- 
+
 #ifdef  __cplusplus
 }
 #endif