Implement some standard OCSP extensions in the v3 code. These

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

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 644716b16e46932d13fb1b6d21056d2c8e7442ee..e98e92e99329cfe4bc7493f6625217389cffe840 100644 (file)
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -59,10 +59,11 @@
 #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
@@ -232,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"
@@ -502,6 +504,7 @@ extern "C" {
 #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"
@@ -630,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
@@ -738,7 +741,7 @@ extern "C" {
 #define NID_ms_efs                     138
 #define OBJ_ms_efs                     1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
 
-/* Addidional usage: Netscape */
+/* Additional usage: Netscape */
 
 #define SN_ns_sgc                      "nsSGC"
 #define LN_ns_sgc                      "Netscape Server Gated Crypto"
@@ -947,10 +950,11 @@ extern "C" {
 #define NID_ad_ca_issuers              179
 #define OBJ_ad_ca_issuers              OBJ_id_ad,2L
 
-#define SN_OSCP_sign                   "OCSPSigning"
+#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>
@@ -965,6 +969,10 @@ extern "C" {
 #define        OBJ_NAME_ALIAS          0x8000
 
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct obj_name_st
        {
        int type;
@@ -977,31 +985,37 @@ typedef struct obj_name_st
 
 
 int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func)(),int (*cmp_func)(),
-       void (*free_func)());
+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(ASN1_OBJECT *o);
+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(ASN1_OBJECT *o);
+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, ASN1_OBJECT *a, int no_name);
-int            OBJ_txt2nid(char *s);
+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(ASN1_OBJECT *a,ASN1_OBJECT *b);
-char *         OBJ_bsearch(char *key,char *base,int num,int size,int (*cmp)());
+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 *));
 
 void           ERR_load_OBJ_strings(void );
 
 int            OBJ_new_nid(int num);
-int            OBJ_add_object(ASN1_OBJECT *obj);
-int            OBJ_create(char *oid,char *sn,char *ln);
+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);