SRP update

moflo · Jun 30, 2017 · 189078f · 189078f
1 parent 709fe34
commit 189078f
Showing 1 changed file with 6 additions and 23 deletions.
diff --git a/src/SRPClient.cpp b/src/SRPClient.cpp
@@ -88,10 +88,6 @@ int SRPClient::verifySession(uint8_t **serverKeyProof, uint16_t *proof_len, uint
     // The test vectors from
     // https://tools.ietf.org/html/rfc5054#appendix-B
 
-    static const uint8_t srp_5054_salt[] = {
-        0xBE, 0xB2, 0x53, 0x79, 0xD1, 0xA8, 0x58, 0x1E, 0xB5, 0xA7, 0x27, 0x67, 0x3A, 0x24,
-        0x41, 0xEE
-    };
 
     static const uint8_t srp_3072_salt[] = {
         0xBE, 0xB2, 0x53, 0x79, 0xD1, 0xA8, 0x58, 0x1E, 0xB5, 0xA7, 0x27, 0x67, 0x3A, 0x24,
@@ -104,12 +100,12 @@ int SRPClient::verifySession(uint8_t **serverKeyProof, uint16_t *proof_len, uint
         0xDA, 0x2D, 0x43, 0x93
     };
 
-    static const uint8_t srp_5054_b[] = {
+    static const uint8_t srp_3072_b[] = {
         0xE4, 0x87, 0xCB, 0x59, 0xD3, 0x1A, 0xC5, 0x50, 0x47, 0x1E, 0x81, 0xF0, 0x0F, 0x69,
         0x28, 0xE0, 0x1D, 0xDA, 0x08, 0xE9, 0x74, 0xA0, 0x04, 0xF4, 0x9E, 0x61, 0xF5, 0xD1,
-        0x05, 0x28, 0x4D, 0x20,
+        0x05, 0x28, 0x4D, 0x20
     };
-    
+
 
 
     unsigned char *bytes_s = 0;
@@ -126,19 +122,6 @@ int SRPClient::verifySession(uint8_t **serverKeyProof, uint16_t *proof_len, uint
     srp_user_start_authentication(usr, NULL, (unsigned char *)srp_3072_a, 32, &bytes_A, &len_A);
 
 
-    static const uint8_t srp_5054_A[] = {
-        0x61, 0xD5, 0xE4, 0x90, 0xF6, 0xF1, 0xB7, 0x95, 0x47, 0xB0, 0x70, 0x4C, 0x43, 0x6F,
-        0x52, 0x3D, 0xD0, 0xE5, 0x60, 0xF0, 0xC6, 0x41, 0x15, 0xBB, 0x72, 0x55, 0x7E, 0xC4,
-        0x43, 0x52, 0xE8, 0x90, 0x32, 0x11, 0xC0, 0x46, 0x92, 0x27, 0x2D, 0x8B, 0x2D, 0x1A,
-        0x53, 0x58, 0xA2, 0xCF, 0x1B, 0x6E, 0x0B, 0xFC, 0xF9, 0x9F, 0x92, 0x15, 0x30, 0xEC,
-        0x8E, 0x39, 0x35, 0x61, 0x79, 0xEA, 0xE4, 0x5E, 0x42, 0xBA, 0x92, 0xAE, 0xAC, 0xED,
-        0x82, 0x51, 0x71, 0xE1, 0xE8, 0xB9, 0xAF, 0x6D, 0x9C, 0x03, 0xE1, 0x32, 0x7F, 0x44,
-        0xBE, 0x08, 0x7E, 0xF0, 0x65, 0x30, 0xE6, 0x9F, 0x66, 0x61, 0x52, 0x61, 0xEE, 0xF5,
-        0x40, 0x73, 0xCA, 0x11, 0xCF, 0x58, 0x58, 0xF0, 0xED, 0xFD, 0xFE, 0x15, 0xEF, 0xEA,
-        0xB3, 0x49, 0xEF, 0x5D, 0x76, 0x98, 0x8A, 0x36, 0x72, 0xFA, 0xC4, 0x7B, 0x07, 0x69,
-        0x44, 0x7B,
-    };
-
     static const uint8_t srp_3072_A[] = {
         0xFA, 0xB6, 0xF5, 0xD2, 0x61, 0x5D, 0x1E, 0x32, 0x35, 0x12, 0xE7, 0x99, 0x1C, 0xC3,
         0x74, 0x43, 0xF4, 0x87, 0xDA, 0x60, 0x4C, 0xA8, 0xC9, 0x23, 0x0F, 0xCB, 0x04, 0xE5,
@@ -177,14 +160,14 @@ int SRPClient::verifySession(uint8_t **serverKeyProof, uint16_t *proof_len, uint
     ver = srp_verifier_new(alg,
                            ng_type,
                            username,
-                           (unsigned char *)srp_5054_salt,
+                           (unsigned char *)srp_3072_salt,
                            len_s,
                            bytes_v,
                            len_v,
                            bytes_A,
                            len_A,
-                           (unsigned char *)srp_5054_b,
-                           32,
+                           (unsigned char *)srp_3072_b,
+                           sizeof(srp_3072_b),
                            &bytes_B,
                            &len_B,
                            NULL,