diff options
| author | Ben Laurie <ben@links.org> | 2013-09-20 14:39:33 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-09-20 14:39:33 +0100 |
| commit | 7eef2b0cd712d987b0bd556ad8ec637332ff32fb (patch) | |
| tree | 34ebabea518e14acfa409a49ae625af2c85a0122 /ssl | |
| parent | 79b9209883f1492919384b9adeb3fb6a69a47aa5 (diff) | |
| parent | deda5ea7886200a19a96b67d8ae9106273598344 (diff) | |
Merge remote-tracking branch 'trevp/pemfix' into trev-pem-fix
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_rsa.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index b6765a30e1..36d7a1a819 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -982,6 +982,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) long extension_length = 0; char* name = NULL; char* header = NULL; + char namePrefix[] = "SERVERINFO FOR "; int ret = 0; BIO *bin = NULL; size_t num_extensions = 0; @@ -1017,11 +1018,22 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) else /* End of file, we're done */ break; } + /* 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); + goto end; + } + if (strncmp(name, namePrefix, strlen(namePrefix)) != 0) + { + SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PEM_LIB); + 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); - goto end; + SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_PEM_LIB); + goto end; } /* Append the decoded extension to the serverinfo buffer */ serverinfo = OPENSSL_realloc(serverinfo, serverinfo_length + extension_length); |