Commit cb71f17d authored by Emilia Kasper's avatar Emilia Kasper
Browse files

base64 decode: check for high bit 



Previously, the conversion would silently coerce to ASCII. Now, we error
out.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(cherry picked from commit b785504a)
parent 37faf117

crypto/evp/encode.c

+18 −2
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ 
#include "cryptlib.h"

#include <openssl/evp.h>



static unsigned char conv_ascii2bin(unsigned char a);

#ifndef CHARSET_EBCDIC

# define conv_bin2ascii(a)       (data_bin2ascii[(a)&0x3f])

# define conv_ascii2bin(a)       (data_ascii2bin[(a)&0x7f])

#else

/*

 * We assume that PEM encoded files are EBCDIC files (i.e., printable text
@@ -71,7 +71,6 @@ 
 * as the underlying textstring data_bin2ascii[] is already EBCDIC)

 */

# define conv_bin2ascii(a)       (data_bin2ascii[(a)&0x3f])

# define conv_ascii2bin(a)       (data_ascii2bin[os_toascii[a]&0x7f])

#endif



/*-
@@ -124,6 +123,23 @@ static const unsigned char data_ascii2bin[128] = { 
    0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,

};



#ifndef CHARSET_EBCDIC

static unsigned char conv_ascii2bin(unsigned char a)

{

    if (a & 0x80)

        return B64_ERROR;

    return data_ascii2bin[a];

}

#else

static unsigned char conv_ascii2bin(unsigned char a)

{

    a = os_toascii[a];

    if (a & 0x80)

        return B64_ERROR;

    return data_ascii2bin[a];

}

#endif



void EVP_EncodeInit(EVP_ENCODE_CTX *ctx)

{

    ctx->length = 48;