Set error code, no fprintf stderr, on errors.

[openssl.git] / crypto / ts / ts_conf.c

diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 1e511bee75061c58cfe031ea48bacdb8a4faa4b8..27b3df26091b2852d80f8886d910ed3b07b81421 100644 (file)
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.c
@@ -102,7 +102,7 @@ X509 *TS_CONF_load_cert(const char *file)
     x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
  end:
     if (x == NULL)
     x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
  end:
     if (x == NULL)

-        fprintf(stderr, "unable to load certificate: %s\n", file);
+        TSerr(TS_F_TS_CONF_LOAD_CERT, TS_R_CANNOT_LOAD_CERT);

     BIO_free(cert);
     return x;
 }
     BIO_free(cert);
     return x;
 }


@@ -129,7 +129,7 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file)
     }
  end:
     if (othercerts == NULL)
     }
  end:
     if (othercerts == NULL)

-        fprintf(stderr, "unable to load certificates: %s\n", file);
+        TSerr(TS_F_TS_CONF_LOAD_CERTS, TS_R_CANNOT_LOAD_CERT);

     sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
     BIO_free(certs);
     return othercerts;
     sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
     BIO_free(certs);
     return othercerts;


@@ -145,21 +145,23 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)
     pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);
  end:
     if (pkey == NULL)
     pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);
  end:
     if (pkey == NULL)

-        fprintf(stderr, "unable to load private key: %s\n", file);
+        TSerr(TS_F_TS_CONF_LOAD_KEY, TS_R_CANNOT_LOAD_KEY);

     BIO_free(key);
     return pkey;
 }
 
 /* Function definitions for handling configuration options. */
 
     BIO_free(key);
     return pkey;
 }
 
 /* Function definitions for handling configuration options. */
 

-static void TS_CONF_lookup_fail(const char *name, const char *tag)
+static void ts_CONF_lookup_fail(const char *name, const char *tag)

 {
 {

-    fprintf(stderr, "variable lookup failed for %s::%s\n", name, tag);
+    TSerr(TS_F_TS_CONF_LOOKUP_FAIL, TS_R_VAR_LOOKUP_FAILURE);
+    ERR_add_error_data(3, name, "::", tag);

 }
 
 }
 

-static void TS_CONF_invalid(const char *name, const char *tag)
+static void ts_CONF_invalid(const char *name, const char *tag)

 {
 {

-    fprintf(stderr, "invalid variable value for %s::%s\n", name, tag);
+    TSerr(TS_F_TS_CONF_INVALID, TS_R_VAR_BAD_VALUE);
+    ERR_add_error_data(3, name, "::", tag);

 }
 
 const char *TS_CONF_get_tsa_section(CONF *conf, const char *section)
 }
 
 const char *TS_CONF_get_tsa_section(CONF *conf, const char *section)


@@ -167,7 +169,7 @@ const char *TS_CONF_get_tsa_section(CONF *conf, const char *section)
     if (!section) {
         section = NCONF_get_string(conf, BASE_SECTION, ENV_DEFAULT_TSA);
         if (!section)
     if (!section) {
         section = NCONF_get_string(conf, BASE_SECTION, ENV_DEFAULT_TSA);
         if (!section)

-            TS_CONF_lookup_fail(BASE_SECTION, ENV_DEFAULT_TSA);
+            ts_CONF_lookup_fail(BASE_SECTION, ENV_DEFAULT_TSA);

     }
     return section;
 }
     }
     return section;
 }


@@ -178,7 +180,7 @@ int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
     int ret = 0;
     char *serial = NCONF_get_string(conf, section, ENV_SERIAL);
     if (!serial) {
     int ret = 0;
     char *serial = NCONF_get_string(conf, section, ENV_SERIAL);
     if (!serial) {

-        TS_CONF_lookup_fail(section, ENV_SERIAL);
+        ts_CONF_lookup_fail(section, ENV_SERIAL);

         goto err;
     }
     TS_RESP_CTX_set_serial_cb(ctx, cb, serial);
         goto err;
     }
     TS_RESP_CTX_set_serial_cb(ctx, cb, serial);


@@ -199,7 +201,7 @@ int TS_CONF_set_crypto_device(CONF *conf, const char *section,
         device = NCONF_get_string(conf, section, ENV_CRYPTO_DEVICE);
 
     if (device && !TS_CONF_set_default_engine(device)) {
         device = NCONF_get_string(conf, section, ENV_CRYPTO_DEVICE);
 
     if (device && !TS_CONF_set_default_engine(device)) {

-        TS_CONF_invalid(section, ENV_CRYPTO_DEVICE);
+        ts_CONF_invalid(section, ENV_CRYPTO_DEVICE);

         goto err;
     }
     ret = 1;
         goto err;
     }
     ret = 1;


@@ -246,7 +248,7 @@ int TS_CONF_set_signer_cert(CONF *conf, const char *section,
     if (cert == NULL) {
         cert = NCONF_get_string(conf, section, ENV_SIGNER_CERT);
         if (cert == NULL) {
     if (cert == NULL) {
         cert = NCONF_get_string(conf, section, ENV_SIGNER_CERT);
         if (cert == NULL) {

-            TS_CONF_lookup_fail(section, ENV_SIGNER_CERT);
+            ts_CONF_lookup_fail(section, ENV_SIGNER_CERT);

             goto err;
         }
     }
             goto err;
         }
     }


@@ -292,7 +294,7 @@ int TS_CONF_set_signer_key(CONF *conf, const char *section,
     if (!key)
         key = NCONF_get_string(conf, section, ENV_SIGNER_KEY);
     if (!key) {
     if (!key)
         key = NCONF_get_string(conf, section, ENV_SIGNER_KEY);
     if (!key) {

-        TS_CONF_lookup_fail(section, ENV_SIGNER_KEY);
+        ts_CONF_lookup_fail(section, ENV_SIGNER_KEY);

         goto err;
     }
     if ((key_obj = TS_CONF_load_key(key, pass)) == NULL)
         goto err;
     }
     if ((key_obj = TS_CONF_load_key(key, pass)) == NULL)


@@ -314,11 +316,11 @@ int TS_CONF_set_def_policy(CONF *conf, const char *section,
     if (!policy)
         policy = NCONF_get_string(conf, section, ENV_DEFAULT_POLICY);
     if (!policy) {
     if (!policy)
         policy = NCONF_get_string(conf, section, ENV_DEFAULT_POLICY);
     if (!policy) {

-        TS_CONF_lookup_fail(section, ENV_DEFAULT_POLICY);
+        ts_CONF_lookup_fail(section, ENV_DEFAULT_POLICY);

         goto err;
     }
     if ((policy_obj = OBJ_txt2obj(policy, 0)) == NULL) {
         goto err;
     }
     if ((policy_obj = OBJ_txt2obj(policy, 0)) == NULL) {

-        TS_CONF_invalid(section, ENV_DEFAULT_POLICY);
+        ts_CONF_invalid(section, ENV_DEFAULT_POLICY);

         goto err;
     }
     if (!TS_RESP_CTX_set_def_policy(ctx, policy_obj))
         goto err;
     }
     if (!TS_RESP_CTX_set_def_policy(ctx, policy_obj))


@@ -339,7 +341,7 @@ int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx)
 
     /* If no other policy is specified, that's fine. */
     if (policies && (list = X509V3_parse_list(policies)) == NULL) {
 
     /* If no other policy is specified, that's fine. */
     if (policies && (list = X509V3_parse_list(policies)) == NULL) {

-        TS_CONF_invalid(section, ENV_OTHER_POLICIES);
+        ts_CONF_invalid(section, ENV_OTHER_POLICIES);

         goto err;
     }
     for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {
         goto err;
     }
     for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {


@@ -348,7 +350,7 @@ int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx)
         ASN1_OBJECT *objtmp;
 
         if ((objtmp = OBJ_txt2obj(extval, 0)) == NULL) {
         ASN1_OBJECT *objtmp;
 
         if ((objtmp = OBJ_txt2obj(extval, 0)) == NULL) {

-            TS_CONF_invalid(section, ENV_OTHER_POLICIES);
+            ts_CONF_invalid(section, ENV_OTHER_POLICIES);

             goto err;
         }
         if (!TS_RESP_CTX_add_policy(ctx, objtmp))
             goto err;
         }
         if (!TS_RESP_CTX_add_policy(ctx, objtmp))


@@ -370,15 +372,15 @@ int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx)
     char *digests = NCONF_get_string(conf, section, ENV_DIGESTS);
 
     if (digests == NULL) {
     char *digests = NCONF_get_string(conf, section, ENV_DIGESTS);
 
     if (digests == NULL) {

-        TS_CONF_lookup_fail(section, ENV_DIGESTS);
+        ts_CONF_lookup_fail(section, ENV_DIGESTS);

         goto err;
     }
     if ((list = X509V3_parse_list(digests)) == NULL) {
         goto err;
     }
     if ((list = X509V3_parse_list(digests)) == NULL) {

-        TS_CONF_invalid(section, ENV_DIGESTS);
+        ts_CONF_invalid(section, ENV_DIGESTS);

         goto err;
     }
     if (sk_CONF_VALUE_num(list) == 0) {
         goto err;
     }
     if (sk_CONF_VALUE_num(list) == 0) {

-        TS_CONF_invalid(section, ENV_DIGESTS);
+        ts_CONF_invalid(section, ENV_DIGESTS);

         goto err;
     }
     for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {
         goto err;
     }
     for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {


@@ -387,7 +389,7 @@ int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx)
         const EVP_MD *md;
 
         if ((md = EVP_get_digestbyname(extval)) == NULL) {
         const EVP_MD *md;
 
         if ((md = EVP_get_digestbyname(extval)) == NULL) {

-            TS_CONF_invalid(section, ENV_DIGESTS);
+            ts_CONF_invalid(section, ENV_DIGESTS);

             goto err;
         }
         if (!TS_RESP_CTX_add_md(ctx, md))
             goto err;
         }
         if (!TS_RESP_CTX_add_md(ctx, md))


@@ -409,7 +411,7 @@ int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx)
     char *accuracy = NCONF_get_string(conf, section, ENV_ACCURACY);
 
     if (accuracy && (list = X509V3_parse_list(accuracy)) == NULL) {
     char *accuracy = NCONF_get_string(conf, section, ENV_ACCURACY);
 
     if (accuracy && (list = X509V3_parse_list(accuracy)) == NULL) {

-        TS_CONF_invalid(section, ENV_ACCURACY);
+        ts_CONF_invalid(section, ENV_ACCURACY);

         goto err;
     }
     for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {
         goto err;
     }
     for (i = 0; i < sk_CONF_VALUE_num(list); ++i) {


@@ -424,7 +426,7 @@ int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx)
             if (val->value)
                 micros = atoi(val->value);
         } else {
             if (val->value)
                 micros = atoi(val->value);
         } else {

-            TS_CONF_invalid(section, ENV_ACCURACY);
+            ts_CONF_invalid(section, ENV_ACCURACY);

             goto err;
         }
     }
             goto err;
         }
     }


@@ -450,7 +452,7 @@ int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
                             &digits))
         digits = 0;
     if (digits < 0 || digits > TS_MAX_CLOCK_PRECISION_DIGITS) {
                             &digits))
         digits = 0;
     if (digits < 0 || digits > TS_MAX_CLOCK_PRECISION_DIGITS) {

-        TS_CONF_invalid(section, ENV_CLOCK_PRECISION_DIGITS);
+        ts_CONF_invalid(section, ENV_CLOCK_PRECISION_DIGITS);

         goto err;
     }
 
         goto err;
     }
 


@@ -462,7 +464,7 @@ int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
     return ret;
 }
 
     return ret;
 }
 

-static int TS_CONF_add_flag(CONF *conf, const char *section,
+static int ts_CONF_add_flag(CONF *conf, const char *section,

                             const char *field, int flag, TS_RESP_CTX *ctx)
 {
     /* Default is false. */
                             const char *field, int flag, TS_RESP_CTX *ctx)
 {
     /* Default is false. */


@@ -471,7 +473,7 @@ static int TS_CONF_add_flag(CONF *conf, const char *section,
         if (strcmp(value, ENV_VALUE_YES) == 0)
             TS_RESP_CTX_add_flags(ctx, flag);
         else if (strcmp(value, ENV_VALUE_NO) != 0) {
         if (strcmp(value, ENV_VALUE_YES) == 0)
             TS_RESP_CTX_add_flags(ctx, flag);
         else if (strcmp(value, ENV_VALUE_NO) != 0) {

-            TS_CONF_invalid(section, field);
+            ts_CONF_invalid(section, field);

             return 0;
         }
     }
             return 0;
         }
     }


@@ -481,17 +483,17 @@ static int TS_CONF_add_flag(CONF *conf, const char *section,
 
 int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx)
 {
 
 int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx)
 {

-    return TS_CONF_add_flag(conf, section, ENV_ORDERING, TS_ORDERING, ctx);
+    return ts_CONF_add_flag(conf, section, ENV_ORDERING, TS_ORDERING, ctx);

 }
 
 int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx)
 {
 }
 
 int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx)
 {

-    return TS_CONF_add_flag(conf, section, ENV_TSA_NAME, TS_TSA_NAME, ctx);
+    return ts_CONF_add_flag(conf, section, ENV_TSA_NAME, TS_TSA_NAME, ctx);

 }
 
 int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
                                   TS_RESP_CTX *ctx)
 {
 }
 
 int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
                                   TS_RESP_CTX *ctx)
 {

-    return TS_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN,
+    return ts_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN,

                             TS_ESS_CERT_ID_CHAIN, ctx);
 }
                             TS_ESS_CERT_ID_CHAIN, ctx);
 }