Add lots of checks for memory allocation failure, error codes to indicate

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

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 302238ca1d841df1cd68b9ebf9417d5104aa0e5e..7242f76fb0f1f1f44a4c635018475ca1292798aa 100644 (file)
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -966,7 +966,10 @@
 #define        OBJ_NAME_TYPE_COMP_METH         0x04
 #define        OBJ_NAME_TYPE_NUM               0x05
 
-#define        OBJ_NAME_ALIAS          0x8000
+#define        OBJ_NAME_ALIAS                  0x8000
+
+#define OBJ_BSEARCH_VALUE_ON_NOMATCH           0x01
+#define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH       0x02
 
 
 #ifdef  __cplusplus
@@ -1010,8 +1013,8 @@ 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 );
+const char *   OBJ_bsearch_ex(const char *key,const char *base,int num,
+       int size, int (*cmp)(const void *, const void *), int flags);
 
 int            OBJ_new_nid(int num);
 int            OBJ_add_object(const ASN1_OBJECT *obj);
@@ -1028,8 +1031,10 @@ void ERR_load_OBJ_strings(void);
 /* Error codes for the OBJ functions. */
 
 /* Function codes. */
+#define OBJ_F_OBJ_ADD_OBJECT                            105
 #define OBJ_F_OBJ_CREATE                                100
 #define OBJ_F_OBJ_DUP                                   101
+#define OBJ_F_OBJ_NAME_NEW_INDEX                        106
 #define OBJ_F_OBJ_NID2LN                                102
 #define OBJ_F_OBJ_NID2OBJ                               103
 #define OBJ_F_OBJ_NID2SN                                104