Commit 33a6d5a0 authored by Dmitry-Me's avatar Dmitry-Me Committed by Rich Salz
Browse files

GH643: Cleanup header analysis 



Signed-off-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent 5b326dc5

crypto/pem/pem_lib.c

+3 −4
Original line number Diff line number Diff line
@@ -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);