diff options
| author | Dmitry-Me <wipedout@yandex.ru> | 2016-02-10 09:37:52 +0300 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-13 08:21:09 -0500 |
| commit | 33a6d5a0e565e08758bcb6af456ec657c3a7a76a (patch) | |
| tree | 271d8f3d9cf1df8ff4270db6d32a2425723a6688 /crypto/pem | |
| parent | 5b326dc529e19194feaef9a65fa37efbe11eaa7e (diff) | |
| download | openssl-33a6d5a0e565e08758bcb6af456ec657c3a7a76a.zip openssl-33a6d5a0e565e08758bcb6af456ec657c3a7a76a.tar.gz openssl-33a6d5a0e565e08758bcb6af456ec657c3a7a76a.tar.bz2 | |
GH643: Cleanup header analysis
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem_lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index eb03acc..a75d9ac 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -488,7 +488,7 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) { const EVP_CIPHER *enc = NULL; - char *p, c; + char *dekinfostart, c; char **header_pp = &header; cipher->cipher = NULL; @@ -521,7 +521,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) } header += 10; - p = header; + dekinfostart = header; for (;;) { c = *header; #ifndef CHARSET_EBCDIC @@ -535,9 +535,8 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) header++; } *header = '\0'; - cipher->cipher = enc = EVP_get_cipherbyname(p); + cipher->cipher = enc = EVP_get_cipherbyname(dekinfostart); *header = c; - header++; if (enc == NULL) { PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_UNSUPPORTED_ENCRYPTION); |