generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set error code, no fprintf stderr, on errors.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2015-06-04 10:14:28 -04:00 committed by Rich Salz
parent 6c40d469b7
commit c0cf5b84dd
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/ts/ts_conf.c
View File

@ -102,7 +102,7 @@ X509 *TS_CONF_load_cert(const char *file)
x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL); x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
end: end:
if (x == NULL) 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); BIO_free(cert);
return x; return x;
} }
@ -129,7 +129,7 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file)
} }
end: end:
if (othercerts == NULL) 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); sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
BIO_free(certs); BIO_free(certs);
return othercerts; return othercerts;
@ -145,7 +145,7 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)
pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass); pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);
end: end:
if (pkey == NULL) 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); BIO_free(key);
return pkey; return pkey;
} }
@ -154,12 +154,14 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)
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)

11
crypto/ts/ts_err.c
View File

@ -1,6 +1,6 @@
/* crypto/ts/ts_err.c */ /* crypto/ts/ts_err.c */
/* ==================================================================== /* ====================================================================
* Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -87,6 +87,11 @@ static ERR_STRING_DATA TS_str_functs[] = {
{ERR_FUNC(TS_F_TS_CHECK_SIGNING_CERTS), "TS_CHECK_SIGNING_CERTS"}, {ERR_FUNC(TS_F_TS_CHECK_SIGNING_CERTS), "TS_CHECK_SIGNING_CERTS"},
{ERR_FUNC(TS_F_TS_CHECK_STATUS_INFO), "TS_CHECK_STATUS_INFO"}, {ERR_FUNC(TS_F_TS_CHECK_STATUS_INFO), "TS_CHECK_STATUS_INFO"},
{ERR_FUNC(TS_F_TS_COMPUTE_IMPRINT), "TS_COMPUTE_IMPRINT"}, {ERR_FUNC(TS_F_TS_COMPUTE_IMPRINT), "TS_COMPUTE_IMPRINT"},
{ERR_FUNC(TS_F_TS_CONF_INVALID), "ts_CONF_invalid"},
{ERR_FUNC(TS_F_TS_CONF_LOAD_CERT), "TS_CONF_load_cert"},
{ERR_FUNC(TS_F_TS_CONF_LOAD_CERTS), "TS_CONF_load_certs"},
{ERR_FUNC(TS_F_TS_CONF_LOAD_KEY), "TS_CONF_load_key"},
{ERR_FUNC(TS_F_TS_CONF_LOOKUP_FAIL), "ts_CONF_lookup_fail"},
{ERR_FUNC(TS_F_TS_CONF_SET_DEFAULT_ENGINE), "TS_CONF_set_default_engine"}, {ERR_FUNC(TS_F_TS_CONF_SET_DEFAULT_ENGINE), "TS_CONF_set_default_engine"},
{ERR_FUNC(TS_F_TS_GET_STATUS_TEXT), "TS_GET_STATUS_TEXT"}, {ERR_FUNC(TS_F_TS_GET_STATUS_TEXT), "TS_GET_STATUS_TEXT"},
{ERR_FUNC(TS_F_TS_MSG_IMPRINT_SET_ALGO), "TS_MSG_IMPRINT_set_algo"}, {ERR_FUNC(TS_F_TS_MSG_IMPRINT_SET_ALGO), "TS_MSG_IMPRINT_set_algo"},
@ -132,6 +137,8 @@ static ERR_STRING_DATA TS_str_functs[] = {
static ERR_STRING_DATA TS_str_reasons[] = { static ERR_STRING_DATA TS_str_reasons[] = {
{ERR_REASON(TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"}, {ERR_REASON(TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"},
{ERR_REASON(TS_R_BAD_TYPE), "bad type"}, {ERR_REASON(TS_R_BAD_TYPE), "bad type"},
{ERR_REASON(TS_R_CANNOT_LOAD_CERT), "cannot load certificate"},
{ERR_REASON(TS_R_CANNOT_LOAD_KEY), "cannot load private key"},
{ERR_REASON(TS_R_CERTIFICATE_VERIFY_ERROR), "certificate verify error"}, {ERR_REASON(TS_R_CERTIFICATE_VERIFY_ERROR), "certificate verify error"},
{ERR_REASON(TS_R_COULD_NOT_SET_ENGINE), "could not set engine"}, {ERR_REASON(TS_R_COULD_NOT_SET_ENGINE), "could not set engine"},
{ERR_REASON(TS_R_COULD_NOT_SET_TIME), "could not set time"}, {ERR_REASON(TS_R_COULD_NOT_SET_TIME), "could not set time"},
@ -170,6 +177,8 @@ static ERR_STRING_DATA TS_str_reasons[] = {
{ERR_REASON(TS_R_UNACCEPTABLE_POLICY), "unacceptable policy"}, {ERR_REASON(TS_R_UNACCEPTABLE_POLICY), "unacceptable policy"},
{ERR_REASON(TS_R_UNSUPPORTED_MD_ALGORITHM), "unsupported md algorithm"}, {ERR_REASON(TS_R_UNSUPPORTED_MD_ALGORITHM), "unsupported md algorithm"},
{ERR_REASON(TS_R_UNSUPPORTED_VERSION), "unsupported version"}, {ERR_REASON(TS_R_UNSUPPORTED_VERSION), "unsupported version"},
{ERR_REASON(TS_R_VAR_BAD_VALUE), "var bad value"},
{ERR_REASON(TS_R_VAR_LOOKUP_FAILURE), "cannot find config variable"},
{ERR_REASON(TS_R_WRONG_CONTENT_TYPE), "wrong content type"}, {ERR_REASON(TS_R_WRONG_CONTENT_TYPE), "wrong content type"},
{0, NULL} {0, NULL}
}; };

9
include/openssl/ts.h
View File

@ -775,6 +775,11 @@ void ERR_load_TS_strings(void);
# define TS_F_TS_CHECK_SIGNING_CERTS 103 # define TS_F_TS_CHECK_SIGNING_CERTS 103
# define TS_F_TS_CHECK_STATUS_INFO 104 # define TS_F_TS_CHECK_STATUS_INFO 104
# define TS_F_TS_COMPUTE_IMPRINT 145 # define TS_F_TS_COMPUTE_IMPRINT 145
# define TS_F_TS_CONF_INVALID 151
# define TS_F_TS_CONF_LOAD_CERT 153
# define TS_F_TS_CONF_LOAD_CERTS 154
# define TS_F_TS_CONF_LOAD_KEY 155
# define TS_F_TS_CONF_LOOKUP_FAIL 152
# define TS_F_TS_CONF_SET_DEFAULT_ENGINE 146 # define TS_F_TS_CONF_SET_DEFAULT_ENGINE 146
# define TS_F_TS_GET_STATUS_TEXT 105 # define TS_F_TS_GET_STATUS_TEXT 105
# define TS_F_TS_MSG_IMPRINT_SET_ALGO 118 # define TS_F_TS_MSG_IMPRINT_SET_ALGO 118
@ -813,6 +818,8 @@ void ERR_load_TS_strings(void);
/* Reason codes. */ /* Reason codes. */
# define TS_R_BAD_PKCS7_TYPE 132 # define TS_R_BAD_PKCS7_TYPE 132
# define TS_R_BAD_TYPE 133 # define TS_R_BAD_TYPE 133
# define TS_R_CANNOT_LOAD_CERT 137
# define TS_R_CANNOT_LOAD_KEY 138
# define TS_R_CERTIFICATE_VERIFY_ERROR 100 # define TS_R_CERTIFICATE_VERIFY_ERROR 100
# define TS_R_COULD_NOT_SET_ENGINE 127 # define TS_R_COULD_NOT_SET_ENGINE 127
# define TS_R_COULD_NOT_SET_TIME 115 # define TS_R_COULD_NOT_SET_TIME 115
@ -845,6 +852,8 @@ void ERR_load_TS_strings(void);
# define TS_R_UNACCEPTABLE_POLICY 125 # define TS_R_UNACCEPTABLE_POLICY 125
# define TS_R_UNSUPPORTED_MD_ALGORITHM 126 # define TS_R_UNSUPPORTED_MD_ALGORITHM 126
# define TS_R_UNSUPPORTED_VERSION 113 # define TS_R_UNSUPPORTED_VERSION 113
# define TS_R_VAR_BAD_VALUE 135
# define TS_R_VAR_LOOKUP_FAILURE 136
# define TS_R_WRONG_CONTENT_TYPE 114 # define TS_R_WRONG_CONTENT_TYPE 114
#ifdef __cplusplus #ifdef __cplusplus