X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fconf%2Fconf.h;h=724378d07a2185a5e3e48144453eee6d0fe74298;hp=0adda45dd3e044aebf28c0c5cea9b08da0ed18a7;hb=de10f6900d71a9db99d41ded7227700ac1580bdb;hpb=7edd20916a35735f809bccd6d595c209814b1c2e

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 0adda45dd3..724378d07a 100644
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -63,7 +63,7 @@
 #include <openssl/lhash.h>
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
-#include <openssl/e_os.h>
+#include <openssl/e_os2.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -77,37 +77,6 @@ typedef struct
 	} CONF_VALUE;
 
 DECLARE_STACK_OF(CONF_VALUE)
-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-	#define sk_CONF_VALUE_new(a) sk_new((int (*) \
-		(const char * const *, const char * const *))(a))
-	#define sk_CONF_VALUE_new_null() sk_new_null()
-	#define sk_CONF_VALUE_free(a) sk_free(a)
-	#define sk_CONF_VALUE_num(a) sk_num(a)
-	#define sk_CONF_VALUE_value(a,b) ((CONF_VALUE *) \
-		sk_value((a),(b)))
-	#define sk_CONF_VALUE_set(a,b,c) ((CONF_VALUE *) \
-		sk_set((a),(b),(char *)(c)))
-	#define sk_CONF_VALUE_zero(a) sk_zero(a)
-	#define sk_CONF_VALUE_push(a,b) sk_push((a),(char *)(b))
-	#define sk_CONF_VALUE_unshift(a,b) sk_unshift((a),(b))
-	#define sk_CONF_VALUE_find(a,b) sk_find((a), (char *)(b))
-	#define sk_CONF_VALUE_delete(a,b) ((CONF_VALUE *) \
-		sk_delete((a),(b)))
-	#define sk_CONF_VALUE_delete_ptr(a,b) ((CONF_VALUE *) \
-		sk_delete_ptr((a),(char *)(b)))
-	#define sk_CONF_VALUE_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-	#define sk_CONF_VALUE_set_cmp_func(a,b) ((int (*) \
-		(const CONF_VALUE * const *,const CONF_VALUE * const *)) \
-		sk_set_cmp_func((a),(int (*) \
-		(const char * const *, const char * const *))(b)))
-	#define sk_CONF_VALUE_dup(a) sk_dup(a)
-	#define sk_CONF_VALUE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-	#define sk_CONF_VALUE_shift(a) ((CONF_VALUE *)sk_shift(a))
-	#define sk_CONF_VALUE_pop(a) ((CONF_VALUE *)sk_pop(a))
-	#define sk_CONF_VALUE_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */
 
 struct conf_st;
 typedef struct conf_st CONF;
@@ -117,19 +86,20 @@ typedef struct conf_method_st CONF_METHOD;
 struct conf_method_st
 	{
 	const char *name;
-	CONF *(MS_FAR *create)(CONF_METHOD *meth);
-	int (MS_FAR *init)(CONF *conf);
-	int (MS_FAR *destroy)(CONF *conf);
-	int (MS_FAR *destroy_data)(CONF *conf);
-	int (MS_FAR *load)(CONF *conf, BIO *bp, long *eline);
-	int (MS_FAR *dump)(CONF *conf, BIO *bp);
-	int (MS_FAR *is_number)(CONF *conf, char c);
-	int (MS_FAR *to_int)(CONF *conf, char c);
+	CONF *(*create)(CONF_METHOD *meth);
+	int (*init)(CONF *conf);
+	int (*destroy)(CONF *conf);
+	int (*destroy_data)(CONF *conf);
+	int (*load_bio)(CONF *conf, BIO *bp, long *eline);
+	int (*dump)(CONF *conf, BIO *bp);
+	int (*is_number)(CONF *conf, char c);
+	int (*to_int)(CONF *conf, char c);
+	int (*load)(CONF *conf, const char *name, long *eline);
 	};
 
 int CONF_set_default_method(CONF_METHOD *meth);
 LHASH *CONF_load(LHASH *conf,const char *file,long *eline);
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline);
 #endif
 LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline);
@@ -161,16 +131,23 @@ void NCONF_free(CONF *conf);
 void NCONF_free_data(CONF *conf);
 
 int NCONF_load(CONF *conf,const char *file,long *eline);
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 int NCONF_load_fp(CONF *conf, FILE *fp,long *eline);
 #endif
 int NCONF_load_bio(CONF *conf, BIO *bp,long *eline);
 STACK_OF(CONF_VALUE) *NCONF_get_section(CONF *conf,char *section);
 char *NCONF_get_string(CONF *conf,char *group,char *name);
-long NCONF_get_number(CONF *conf,char *group,char *name);
+int NCONF_get_number_e(CONF *conf,char *group,char *name,long *result);
 int NCONF_dump_fp(CONF *conf, FILE *out);
 int NCONF_dump_bio(CONF *conf, BIO *out);
 
+#if 0 /* The following function has no error checking,
+	 and should therefore be avoided */
+long NCONF_get_number(CONF *conf,char *group,char *name);
+#else
+#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r);
+#endif
+
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
@@ -187,9 +164,12 @@ int NCONF_dump_bio(CONF *conf, BIO *out);
 #define CONF_F_NCONF_DUMP_BIO				 105
 #define CONF_F_NCONF_DUMP_FP				 106
 #define CONF_F_NCONF_GET_NUMBER				 107
+#define CONF_F_NCONF_GET_NUMBER_E			 112
 #define CONF_F_NCONF_GET_SECTION			 108
 #define CONF_F_NCONF_GET_STRING				 109
+#define CONF_F_NCONF_LOAD				 113
 #define CONF_F_NCONF_LOAD_BIO				 110
+#define CONF_F_NCONF_LOAD_FP				 114
 #define CONF_F_NCONF_NEW				 111
 #define CONF_F_STR_COPY					 101
 
@@ -198,6 +178,9 @@ int NCONF_dump_bio(CONF *conf, BIO *out);
 #define CONF_R_MISSING_EQUAL_SIGN			 101
 #define CONF_R_NO_CLOSE_BRACE				 102
 #define CONF_R_NO_CONF					 105
+#define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE		 106
+#define CONF_R_NO_SECTION				 107
+#define CONF_R_NO_VALUE					 108
 #define CONF_R_UNABLE_TO_CREATE_NEW_SECTION		 103
 #define CONF_R_VARIABLE_HAS_NO_VALUE			 104