Commit d45087c6 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Use 0 not -1 (since type is size_t) for finalisation argument to do_cipher: 

the NULL value for the input buffer is sufficient to notice this case.
parent 634b6618

CHANGES

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
     do_cipher is subtly changed if this flag is set: the return value

     do_cipher is subtly changed if this flag is set: the return value

     is the number of characters written to the output buffer (zero is

     is the number of characters written to the output buffer (zero is

     no longer an error code) or a negative error code. Also if the

     no longer an error code) or a negative error code. Also if the

     input buffer is NULL and length -1 finalisation should be performed.

     input buffer is NULL and length 0 finalisation should be performed.

     [Steve Henson]

     [Steve Henson]





  *) If a candidate issuer certificate is already part of the constructed

  *) If a candidate issuer certificate is already part of the constructed

crypto/evp/evp_enc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -368,7 +368,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 




	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

		{

		{

		i = ctx->cipher->do_cipher(ctx, out, NULL, -1);

		i = ctx->cipher->do_cipher(ctx, out, NULL, 0);

		if (i < 0)

		if (i < 0)

			return 0;

			return 0;

		else 

		else
@@ -483,7 +483,7 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 




	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

	if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)

		{

		{

		i = ctx->cipher->do_cipher(ctx, out, NULL, -1);

		i = ctx->cipher->do_cipher(ctx, out, NULL, 0);

		if (i < 0)

		if (i < 0)

			return 0;

			return 0;

		else

		else