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

Fix for padding X9.31 padding check and zero padding bytes.

parent 8fa6a40b

crypto/rsa/rsa_x931.c

+9 −7
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ int RSA_padding_check_X931(unsigned char *to, int tlen, 
		return -1;

		}



	j=flen-3;

	if (*p++ == 0x6B)

		{

		j=flen-3;

		for (i = 0; i < j; i++)

			{

			unsigned char c = *p++;
@@ -130,7 +130,6 @@ int RSA_padding_check_X931(unsigned char *to, int tlen, 
				return -1;

				}

			}

		}



		j -= i;
@@ -140,6 +139,9 @@ int RSA_padding_check_X931(unsigned char *to, int tlen, 
			return -1;

			}



		}

	else j = flen - 2;



	if (p[j] != 0xCC)

		{

		RSAerr(RSA_F_RSA_PADDING_CHECK_X931, RSA_R_INVALID_TRAILER);