diff options
author | Ben Laurie <ben@links.org> | 2013-09-24 23:13:22 +0100 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2013-09-25 12:45:48 +0100 |
commit | 9725bda766cd3ca1fa1d4c1ec0301a5bc6037234 (patch) | |
tree | 691aef764e6c0681016bb7dd037e12d19d145d24 /ssl/ssl_rsa.c | |
parent | 3cd8547a2018ada88a4303067a2aa15eadc17f39 (diff) | |
download | openssl-9725bda766cd3ca1fa1d4c1ec0301a5bc6037234.tar.gz |
Show useful errors.
Conflicts:
apps/s_server.c
Diffstat (limited to 'ssl/ssl_rsa.c')
-rw-r--r-- | ssl/ssl_rsa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 36d7a1a819..953295518d 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -1012,7 +1012,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) /* There must be at least one extension in this file */ if (num_extensions == 0) { - SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PEM_LIB); + SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_NO_PEM_EXTENSIONS); goto end; } else /* End of file, we're done */ @@ -1021,18 +1021,18 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) /* Check that PEM name starts with "BEGIN SERVERINFO FOR " */ if (strlen(name) < strlen(namePrefix)) { - SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PEM_LIB); + SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_PEM_NAME_TOO_SHORT); goto end; } if (strncmp(name, namePrefix, strlen(namePrefix)) != 0) { - SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PEM_LIB); + SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_PEM_NAME_BAD_PREFIX); goto end; } /* Check that the decoded PEM data is plausible (valid length field) */ if (extension_length < 4 || (extension[2] << 8) + extension[3] != extension_length - 4) { - SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PEM_LIB); + SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_BAD_DATA); goto end; } /* Append the decoded extension to the serverinfo buffer */ |