From 33a6d5a0e565e08758bcb6af456ec657c3a7a76a Mon Sep 17 00:00:00 2001 From: Dmitry-Me Date: Wed, 10 Feb 2016 09:37:52 +0300 Subject: GH643: Cleanup header analysis Signed-off-by: Rich Salz Reviewed-by: Kurt Roeckx --- crypto/pem/pem_lib.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'crypto/pem') diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index eb03acce10..a75d9acf03 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); -- cgit v1.2.3