diff options
| author | Pauli <paul.dale@oracle.com> | 2018-07-04 09:30:43 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-07-11 09:03:22 +1000 |
| commit | c9ecb13191fe902c1e78e3bca7c36c293bba4bc6 (patch) | |
| tree | 41187ab74bc9d5c05b2a8df79d6fe2d2b44b3929 /crypto/err | |
| parent | 4431107d6c430950c2c2e19c03b8dff6355ccfdb (diff) | |
| download | openssl-c9ecb13191fe902c1e78e3bca7c36c293bba4bc6.zip openssl-c9ecb13191fe902c1e78e3bca7c36c293bba4bc6.tar.gz openssl-c9ecb13191fe902c1e78e3bca7c36c293bba4bc6.tar.bz2 | |
NCONF_get_number refix.
Fix the NULL check lack in a different way that is more compatible with
non-NULL branch. Refer #6632
Also mark and pop the error stack instead of clearing all errors when something
goes awry in CONF_get_number.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6643)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/openssl.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index ee68388..007560a 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2012,6 +2012,7 @@ CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE:106:no conf or environment variable CONF_R_NO_SECTION:107:no section CONF_R_NO_SUCH_FILE:114:no such file CONF_R_NO_VALUE:108:no value +CONF_R_NUMBER_TOO_LARGE:121:number too large CONF_R_RECURSIVE_DIRECTORY_INCLUDE:111:recursive directory include CONF_R_SSL_COMMAND_SECTION_EMPTY:117:ssl command section empty CONF_R_SSL_COMMAND_SECTION_NOT_FOUND:118:ssl command section not found |