Update from head.

This commit is contained in:
Dr. Stephen Henson 2005-06-06 22:42:35 +00:00
parent 7bf79446c8
commit 5fbf6769fc

View file

@ -115,9 +115,9 @@ int RSA_padding_check_X931(unsigned char *to, int tlen,
return -1; return -1;
} }
j=flen-3;
if (*p++ == 0x6B) if (*p++ == 0x6B)
{ {
j=flen-3;
for (i = 0; i < j; i++) for (i = 0; i < j; i++)
{ {
unsigned char c = *p++; unsigned char c = *p++;
@ -130,7 +130,6 @@ int RSA_padding_check_X931(unsigned char *to, int tlen,
return -1; return -1;
} }
} }
}
j -= i; j -= i;
@ -140,6 +139,9 @@ int RSA_padding_check_X931(unsigned char *to, int tlen,
return -1; return -1;
} }
}
else j = flen - 2;
if (p[j] != 0xCC) if (p[j] != 0xCC)
{ {
RSAerr(RSA_F_RSA_PADDING_CHECK_X931, RSA_R_INVALID_TRAILER); RSAerr(RSA_F_RSA_PADDING_CHECK_X931, RSA_R_INVALID_TRAILER);