Fixes from HEAD.
This commit is contained in:
@@ -18,7 +18,7 @@ static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
|
||||
JPAKE_STEP3A alice_s3a;
|
||||
JPAKE_STEP3B bob_s3b;
|
||||
|
||||
// Alice -> Bob: step 1
|
||||
/* Alice -> Bob: step 1 */
|
||||
puts("A->B s1");
|
||||
JPAKE_STEP1_init(&alice_s1);
|
||||
JPAKE_STEP1_generate(&alice_s1, alice);
|
||||
@@ -30,7 +30,7 @@ static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
|
||||
}
|
||||
JPAKE_STEP1_release(&alice_s1);
|
||||
|
||||
// Bob -> Alice: step 1
|
||||
/* Bob -> Alice: step 1 */
|
||||
puts("B->A s1");
|
||||
JPAKE_STEP1_init(&bob_s1);
|
||||
JPAKE_STEP1_generate(&bob_s1, bob);
|
||||
@@ -42,7 +42,7 @@ static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
|
||||
}
|
||||
JPAKE_STEP1_release(&bob_s1);
|
||||
|
||||
// Alice -> Bob: step 2
|
||||
/* Alice -> Bob: step 2 */
|
||||
puts("A->B s2");
|
||||
JPAKE_STEP2_init(&alice_s2);
|
||||
JPAKE_STEP2_generate(&alice_s2, alice);
|
||||
@@ -54,7 +54,7 @@ static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
|
||||
}
|
||||
JPAKE_STEP2_release(&alice_s2);
|
||||
|
||||
// Bob -> Alice: step 2
|
||||
/* Bob -> Alice: step 2 */
|
||||
puts("B->A s2");
|
||||
JPAKE_STEP2_init(&bob_s2);
|
||||
JPAKE_STEP2_generate(&bob_s2, bob);
|
||||
@@ -69,7 +69,7 @@ static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
|
||||
showbn("Alice's key", JPAKE_get_shared_key(alice));
|
||||
showbn("Bob's key ", JPAKE_get_shared_key(bob));
|
||||
|
||||
// Alice -> Bob: step 3a
|
||||
/* Alice -> Bob: step 3a */
|
||||
puts("A->B s3a");
|
||||
JPAKE_STEP3A_init(&alice_s3a);
|
||||
JPAKE_STEP3A_generate(&alice_s3a, alice);
|
||||
@@ -81,7 +81,7 @@ static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
|
||||
}
|
||||
JPAKE_STEP3A_release(&alice_s3a);
|
||||
|
||||
// Bob -> Alice: step 3b
|
||||
/* Bob -> Alice: step 3b */
|
||||
puts("B->A s3b");
|
||||
JPAKE_STEP3B_init(&bob_s3b);
|
||||
JPAKE_STEP3B_generate(&bob_s3b, bob);
|
||||
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
|
||||
p = BN_new();
|
||||
BN_generate_prime(p, 1024, 1, NULL, NULL, NULL, NULL);
|
||||
*/
|
||||
// Use a safe prime for p (that we found earlier)
|
||||
/* Use a safe prime for p (that we found earlier) */
|
||||
BN_hex2bn(&p, "F9E5B365665EA7A05A9C534502780FEE6F1AB5BD4F49947FD036DBD7E905269AF46EF28B0FC07487EE4F5D20FB3C0AF8E700F3A2FA3414970CBED44FEDFF80CE78D800F184BB82435D137AADA2C6C16523247930A63B85661D1FC817A51ACD96168E95898A1F83A79FFB529368AA7833ABD1B0C3AEDDB14D2E1A2F71D99F763F");
|
||||
showbn("p", p);
|
||||
g = BN_new();
|
||||
@@ -135,7 +135,7 @@ int main(int argc, char **argv)
|
||||
|
||||
BN_rand(secret, 32, -1, 0);
|
||||
|
||||
// A normal run, expect this to work...
|
||||
/* A normal run, expect this to work... */
|
||||
alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
|
||||
bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
|
||||
|
||||
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
|
||||
JPAKE_CTX_free(bob);
|
||||
JPAKE_CTX_free(alice);
|
||||
|
||||
// Now give Alice and Bob different secrets
|
||||
/* Now give Alice and Bob different secrets */
|
||||
alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
|
||||
BN_add_word(secret, 1);
|
||||
bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
|
||||
|
||||
Reference in New Issue
Block a user