synchronize with engine branch (some changes were done only

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

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 302238ca1d841df1cd68b9ebf9417d5104aa0e5e..990a6b8e4db383b778c2fb7fa1a0c9e81c63d12a 100644 (file)
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -985,37 +985,29 @@ typedef struct obj_name_st
 
 
 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 *));
+int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),int (*cmp_func)(const void *, const void *),
+       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_dup(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);
+int            OBJ_obj2nid(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_obj2txt(char *buf, int buf_len, ASN1_OBJECT *a, int no_name);
+int            OBJ_txt2nid(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 *));
-
-void           ERR_load_OBJ_strings(void );
+int            OBJ_cmp(ASN1_OBJECT *a,ASN1_OBJECT *b);
+char *         OBJ_bsearch(char *key,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);
+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);