Option to disable standard block padding with EVP API. (f2e5ca84) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+7 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,13 @@

		Changes between 0.9.6 and 0.9.7 [xx XXX 2000]

		*) New function EVP_CIPHER_CTX_set_padding() this is used to
		disable standard block padding (aka PKCS#5 padding) in the EVP
		API, which was previously mandatory. This means that the data is
		not padded in any way and so the total length much be a multiple
		of the block size, otherwise an error occurs.
		[Steve Henson]

		*) Initial (incomplete) OCSP SSL support.
		[Steve Henson]

apps/enc.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ int MAIN(int argc, char **argv)
		unsigned char buff=NULL,bufsize=NULL;
		int bsize=BSIZE,verbose=0;
		int ret=1,inl;
		int nopad = 0;
		unsigned char key[EVP_MAX_KEY_LENGTH],iv[EVP_MAX_IV_LENGTH];
		unsigned char salt[PKCS5_SALT_LEN];
		char str=NULL, passarg = NULL, *pass = NULL;
		@@ -174,6 +175,8 @@ int MAIN(int argc, char **argv)
		printkey=1;
		else if (strcmp(*argv,"-v") == 0)
		verbose=1;
		else if (strcmp(*argv,"-nopad") == 0)
		nopad=1;
		else if (strcmp(*argv,"-salt") == 0)
		nosalt=0;
		else if (strcmp(*argv,"-nosalt") == 0)
		@@ -513,6 +516,12 @@ bad:
		if ((benc=BIO_new(BIO_f_cipher())) == NULL)
		goto end;
		BIO_set_cipher(benc,cipher,key,iv,enc);
		if (nopad)
		{
		EVP_CIPHER_CTX *ctx;
		BIO_get_cipher_ctx(benc, &ctx);
		EVP_CIPHER_CTX_set_padding(ctx, 0);
		}
		if (debug)
		{
		BIO_set_callback(benc,BIO_debug_callback);

crypto/evp/evp.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -373,6 +373,8 @@ struct evp_cipher_st
		#define EVP_CIPH_CTRL_INIT 0x40
		/* Don't use standard key length function */
		#define EVP_CIPH_CUSTOM_KEY_LENGTH 0x80
		/* Don't use standard block padding */
		#define EVP_CIPH_NO_PADDING 0x100

		/* ctrl() values */

		@@ -402,6 +404,7 @@ struct evp_cipher_ctx_st

		void app_data; / application stuff */
		int key_len; /* May change for variable length cipher */
		unsigned long flags; /* Various flags */
		union
		{
		#ifndef NO_RC4
		@@ -620,6 +623,7 @@ void ERR_load_EVP_strings(void );
		void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
		int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
		int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
		int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *c, int pad);
		int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX ctx, int type, int arg, void ptr);

		#ifndef NO_BIO
		@@ -807,6 +811,7 @@ void EVP_PBE_cleanup(void);
		#define EVP_F_EVP_CIPHER_CTX_CTRL 124
		#define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH 122
		#define EVP_F_EVP_DECRYPTFINAL 101
		#define EVP_F_EVP_ENCRYPTFINAL 127
		#define EVP_F_EVP_MD_CTX_COPY 110
		#define EVP_F_EVP_OPENINIT 102
		#define EVP_F_EVP_PBE_ALG_ADD 115
		@@ -838,6 +843,7 @@ void EVP_PBE_cleanup(void);
		#define EVP_R_CIPHER_PARAMETER_ERROR 122
		#define EVP_R_CTRL_NOT_IMPLEMENTED 132
		#define EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED 133
		#define EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH 138
		#define EVP_R_DECODE_ERROR 114
		#define EVP_R_DIFFERENT_KEY_TYPES 101
		#define EVP_R_ENCODE_ERROR 115

crypto/evp/evp_enc.c

+31 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ int EVP_CipherInit(EVP_CIPHER_CTX ctx, const EVP_CIPHER cipher,
		if (cipher) {
		ctx->cipher=cipher;
		ctx->key_len = cipher->key_len;
		ctx->flags = 0;
		if(ctx->cipher->flags & EVP_CIPH_CTRL_INIT) {
		if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_INIT, 0, NULL)) {
		EVPerr(EVP_F_EVP_CIPHERINIT, EVP_R_INITIALIZATION_ERROR);
		@@ -200,6 +201,16 @@ int EVP_EncryptFinal(EVP_CIPHER_CTX ctx, unsigned char out, int *outl)
		return 1;
		}
		bl=ctx->buf_len;
		if (ctx->flags & EVP_CIPH_NO_PADDING)
		{
		if(bl)
		{
		EVPerr(EVP_F_EVP_ENCRYPTFINAL,EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH);
		return 0;
		}
		*outl = 0;
		return 1;
		}
		n=b-bl;
		for (i=bl; i<b; i++)
		ctx->buf[i]=n;
		@@ -217,6 +228,9 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX ctx, unsigned char out, int *outl,
		*outl=0;
		if (inl == 0) return 1;

		if (ctx->flags & EVP_CIPH_NO_PADDING)
		return EVP_EncryptUpdate(ctx, out, outl, in, inl);

		b=ctx->cipher->block_size;
		if (b > 1)
		{
		@@ -261,6 +275,16 @@ int EVP_DecryptFinal(EVP_CIPHER_CTX ctx, unsigned char out, int *outl)

		*outl=0;
		b=ctx->cipher->block_size;
		if (ctx->flags & EVP_CIPH_NO_PADDING)
		{
		if(ctx->buf_len)
		{
		EVPerr(EVP_F_EVP_DECRYPTFINAL,EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH);
		return 0;
		}
		*outl = 0;
		return 1;
		}
		if (b > 1)
		{
		if (ctx->buf_len != b)
		@@ -319,6 +343,13 @@ int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen)
		return 0;
		}

		int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad)
		{
		if (pad) ctx->flags &= ~EVP_CIPH_NO_PADDING;
		else ctx->flags \|= EVP_CIPH_NO_PADDING;
		return 1;
		}

		int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX ctx, int type, int arg, void ptr)
		{
		int ret;

crypto/evp/evp_err.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ static ERR_STRING_DATA EVP_str_functs[]=
		{ERR_PACK(0,EVP_F_EVP_CIPHER_CTX_CTRL,0), "EVP_CIPHER_CTX_ctrl"},
		{ERR_PACK(0,EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH,0), "EVP_CIPHER_CTX_set_key_length"},
		{ERR_PACK(0,EVP_F_EVP_DECRYPTFINAL,0), "EVP_DecryptFinal"},
		{ERR_PACK(0,EVP_F_EVP_ENCRYPTFINAL,0), "EVP_EncryptFinal"},
		{ERR_PACK(0,EVP_F_EVP_MD_CTX_COPY,0), "EVP_MD_CTX_copy"},
		{ERR_PACK(0,EVP_F_EVP_OPENINIT,0), "EVP_OpenInit"},
		{ERR_PACK(0,EVP_F_EVP_PBE_ALG_ADD,0), "EVP_PBE_alg_add"},
		@@ -105,6 +106,7 @@ static ERR_STRING_DATA EVP_str_reasons[]=
		{EVP_R_CIPHER_PARAMETER_ERROR ,"cipher parameter error"},
		{EVP_R_CTRL_NOT_IMPLEMENTED ,"ctrl not implemented"},
		{EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED ,"ctrl operation not implemented"},
		{EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH ,"data not multiple of block length"},
		{EVP_R_DECODE_ERROR ,"decode error"},
		{EVP_R_DIFFERENT_KEY_TYPES ,"different key types"},
		{EVP_R_ENCODE_ERROR ,"encode error"},