Changeset a931b7b in mainline for uspace/lib/crypto

Timestamp:

2015-04-13T20:48:33Z (10 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cc575ef9

Parents:

053fc2b

Message:

Added TKIP support, handling old WPA in 4way handshake, some fixes in wifi_supplicant app

Location:

uspace/lib/crypto

Files:

• crypto.c (modified) (6 diffs)
• crypto.h (modified) (2 diffs)
• rc4.c (modified) (3 diffs)

uspace/lib/crypto/crypto.c

@@ -252 +252 @@
 
 /**
- * Hash-based message authentication code using SHA-1 algorithm.
+ * Hash-based message authentication code.
  * 
  * @param key Cryptographic key sequence.
@@ -308 +308 @@
  * Password-Based Key Derivation Function 2 as defined in RFC 2898,
  * using HMAC-SHA1 with 4096 iterations and 32 bytes key result used
- * for WPA2.
+ * for WPA/WPA2.
  * 
  * @param pass Password sequence.
@@ -315 +315 @@
  * @param salt_size Salt sequence length.
  * @param hash Output parameter for result hash (32 byte value).
- * @param hash_sel Hash function selector.
  * 
  * @return EINVAL when pass or salt not specified, ENOMEM when pointer for 
@@ -321 +320 @@
  */
 int pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, size_t salt_size, 
-        uint8_t *hash, hash_func_t hash_sel)
+        uint8_t *hash)
 {
         if(!pass || !salt)
@@ -331 +330 @@
         uint8_t work_salt[salt_size + sizeof(uint32_t)];
         memcpy(work_salt, salt, salt_size);
-        uint8_t work_hmac[hash_sel];
-        uint8_t temp_hmac[hash_sel];
-        uint8_t xor_hmac[hash_sel];
-        uint8_t temp_hash[hash_sel*2];
+        uint8_t work_hmac[HASH_SHA1];
+        uint8_t temp_hmac[HASH_SHA1];
+        uint8_t xor_hmac[HASH_SHA1];
+        uint8_t temp_hash[HASH_SHA1*2];
         
         for(size_t i = 0; i < 2; i++) {
@@ -340 +339 @@
                 memcpy(work_salt + salt_size, &big_i, sizeof(uint32_t));
                 hmac(pass, pass_size, work_salt, salt_size + sizeof(uint32_t),
-                        work_hmac, hash_sel);
-                memcpy(xor_hmac, work_hmac, hash_sel);
+                        work_hmac, HASH_SHA1);
+                memcpy(xor_hmac, work_hmac, HASH_SHA1);
                 for(size_t k = 1; k < 4096; k++) {
-                        memcpy(temp_hmac, work_hmac, hash_sel);
-                        hmac(pass, pass_size, temp_hmac, hash_sel, 
-                                work_hmac, hash_sel);
-                        for(size_t t = 0; t < hash_sel; t++) {
+                        memcpy(temp_hmac, work_hmac, HASH_SHA1);
+                        hmac(pass, pass_size, temp_hmac, HASH_SHA1, 
+                                work_hmac, HASH_SHA1);
+                        for(size_t t = 0; t < HASH_SHA1; t++) {
                                 xor_hmac[t] ^= work_hmac[t];
                         }
                 }
-                memcpy(temp_hash + i*hash_sel, xor_hmac, hash_sel);
+                memcpy(temp_hash + i*HASH_SHA1, xor_hmac, HASH_SHA1);
         }
         

uspace/lib/crypto/crypto.h

@@ -41 +41 @@
 } hash_func_t;
 
-extern int rc4(uint8_t *key, size_t key_size, uint8_t *input, 
-        size_t input_size, uint8_t *output);
+extern int rc4(uint8_t *key, size_t key_size, uint8_t *input, size_t input_size, 
+        size_t skip, uint8_t *output);
 extern int aes_encrypt(uint8_t *key, uint8_t *input, uint8_t *output);
 extern int aes_decrypt(uint8_t *key, uint8_t *input, uint8_t *output);
@@ -50 +50 @@
         uint8_t *hash, hash_func_t hash_sel);
 extern int pbkdf2(uint8_t *pass, size_t pass_size, uint8_t *salt, 
-        size_t salt_size, uint8_t *hash, hash_func_t hash_sel);
+        size_t salt_size, uint8_t *hash);
 
 #endif

uspace/lib/crypto/rc4.c

@@ -82 +82 @@
  * @param input Input data sequence to be processed.
  * @param input_size Size of input data sequence.
+ * @param skip Number of bytes to be skipped from the beginning of key stream.
  * @param output Result data sequence.
  * 
@@ -88 +89 @@
  */
 int rc4(uint8_t *key, size_t key_size, uint8_t *input, size_t input_size, 
-        uint8_t *output)
+        size_t skip, uint8_t *output)
 {
         if(!key || !input)
@@ -100 +101 @@
         create_sbox(key, key_size, sbox);
         
+        /* Skip first x bytes. */
+        uint8_t i = 0, j = 0;
+        for(size_t k = 0; k < skip; k++) {
+                i = i+1;
+                j = j + sbox[i];
+                swap(i, j, sbox);
+        }
+        
         /* Processing loop. */
-        uint8_t i = 0, j = 0, val;
+        uint8_t val;
         for(size_t k = 0; k < input_size; k++) {
                 i = i+1;