diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-02-18 10:33:49 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-02-18 10:33:49 -0800 |
| commit | bd14a57187b024f49f5b9ace55ef457d8d04650a (patch) | |
| tree | c9ae1052918a2718d01efc764a9f3577d3e96079 /src/crypto | |
| parent | 96be6222df414a7dde5c5b1b72df22e67b1a77fc (diff) | |
| download | android_external_wpa_supplicant_8-bd14a57187b024f49f5b9ace55ef457d8d04650a.tar.gz android_external_wpa_supplicant_8-bd14a57187b024f49f5b9ace55ef457d8d04650a.tar.bz2 android_external_wpa_supplicant_8-bd14a57187b024f49f5b9ace55ef457d8d04650a.zip | |
Cumulative patch from commit b3253ebb73d6d52ac636c5cc6d958955a5a98fca
b3253eb wpa_supplicant: Complete radio works on disable event
38ecb06 Convert RADIUS debug dumps to use wpa_printf()
a0ac572 EAP-SIM DB: Remove client socket file on connect() error
a1dd890 RADIUS: Add minimal accounting server support
22dd2d7 Fix MSCHAP UTF-8 to UCS-2 conversion for three-byte encoding
9aab811 Fix nt_password_hash build
a9b08ad Remove unused crypto_bignum_rshift()
2dff9e8 Remove unused NFC_RX_HANDOVER_REQ
be24917 nl80211: Use nl80211_set_iface_id() to get hw features data
8a45811 hostapd: Add Operating Mode Notification support
d9dd86b Enable IEEE 802.11w in defconfig
Change-Id: I6bf13cd0b7e3cb3c3550b87a77a035340e9d0a6b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/crypto.h | 10 | ||||
| -rw-r--r-- | src/crypto/crypto_openssl.c | 7 | ||||
| -rw-r--r-- | src/crypto/ms_funcs.c | 1 |
3 files changed, 1 insertions, 17 deletions
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h index 9bccaaa8..4caa277d 100644 --- a/src/crypto/crypto.h +++ b/src/crypto/crypto.h @@ -534,16 +534,6 @@ int crypto_bignum_exptmod(const struct crypto_bignum *a, struct crypto_bignum *d); /** - * crypto_bignum_rshift - b = a >> n - * @a: Bignum - * @n: Number of bits to shift - * @b: Bignum; used to store the result of a >> n - * Returns: 0 on success, -1 on failure - */ -int crypto_bignum_rshift(const struct crypto_bignum *a, int n, - struct crypto_bignum *b); - -/** * crypto_bignum_inverse - Inverse a bignum so that a * c = 1 (mod b) * @a: Bignum * @b: Bignum diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c index 1da2b9f4..817ee2d0 100644 --- a/src/crypto/crypto_openssl.c +++ b/src/crypto/crypto_openssl.c @@ -916,13 +916,6 @@ int crypto_bignum_exptmod(const struct crypto_bignum *a, } -int crypto_bignum_rshift(const struct crypto_bignum *a, int n, - struct crypto_bignum *b) -{ - return BN_rshift((BIGNUM *) b, (const BIGNUM *) a, n) ? 0 : -1; -} - - int crypto_bignum_inverse(const struct crypto_bignum *a, const struct crypto_bignum *b, struct crypto_bignum *c) diff --git a/src/crypto/ms_funcs.c b/src/crypto/ms_funcs.c index b2bbab2b..49a5c1c2 100644 --- a/src/crypto/ms_funcs.c +++ b/src/crypto/ms_funcs.c @@ -58,6 +58,7 @@ static int utf8_to_ucs2(const u8 *utf8_string, size_t utf8_string_len, WPA_PUT_LE16(ucs2_buffer + j, ((c & 0xF) << 12) | ((c2 & 0x3F) << 6) | (c3 & 0x3F)); + j += 2; } } } |