diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2014-05-19 23:26:19 +0300 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-06-12 14:08:47 -0700 |
| commit | dd104a23adc4adb17716bed1023b9d7734aa5fbc (patch) | |
| tree | 4f2cfddb86a949d9d85f20d8a9cbc82b2d8f97fb | |
| parent | d0af3a719cfc0827fb2be79ebf7bc9649bbbb526 (diff) | |
| download | android_external_wpa_supplicant_8-dd104a23adc4adb17716bed1023b9d7734aa5fbc.tar.gz android_external_wpa_supplicant_8-dd104a23adc4adb17716bed1023b9d7734aa5fbc.tar.bz2 android_external_wpa_supplicant_8-dd104a23adc4adb17716bed1023b9d7734aa5fbc.zip | |
PKCS #1: Allow only BT=01 for signature in internal TLS
Based on PKCS #1, v1.5, 10.1.3, the block type shall be 01 for a
signature. This avoids a potential attack vector for internal TLS/X.509
implementation.
CRs-Fixed: 654804
Change-Id: I1f3b4efb636828d27c06cfcbcb22a9af989bf164
Git-commit: e6d83cc7babb978ba53ae8686159b41ab0f448cc
Git-repo : git://w1.fi/srv/git/hostap.git
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
| -rw-r--r-- | src/tls/pkcs1.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c index b6fde5ee..af58a429 100644 --- a/src/tls/pkcs1.c +++ b/src/tls/pkcs1.c @@ -142,35 +142,26 @@ int pkcs1_decrypt_public_key(struct crypto_rsa_key *key, * BT = 00 or 01 * PS = k-3-||D|| times (00 if BT=00) or (FF if BT=01) * k = length of modulus in octets + * + * Based on 10.1.3, "The block type shall be 01" for a signature. */ if (len < 3 + 8 + 16 /* min hash len */ || - plain[0] != 0x00 || (plain[1] != 0x00 && plain[1] != 0x01)) { + plain[0] != 0x00 || plain[1] != 0x01) { wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature EB " "structure"); return -1; } pos = plain + 3; - if (plain[1] == 0x00) { - /* BT = 00 */ - if (plain[2] != 0x00) { - wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature " - "PS (BT=00)"); - return -1; - } - while (pos + 1 < plain + len && *pos == 0x00 && pos[1] == 0x00) - pos++; - } else { - /* BT = 01 */ - if (plain[2] != 0xff) { - wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature " - "PS (BT=01)"); - return -1; - } - while (pos < plain + len && *pos == 0xff) - pos++; + /* BT = 01 */ + if (plain[2] != 0xff) { + wpa_printf(MSG_INFO, "LibTomCrypt: Invalid signature " + "PS (BT=01)"); + return -1; } + while (pos < plain + len && *pos == 0xff) + pos++; if (pos - plain - 2 < 8) { /* PKCS #1 v1.5, 8.1: At least eight octets long PS */ |