Fix macosx-ppc build (and typos in unwind info).

[oweals/openssl.git] / crypto / jpake / jpaketest.c

diff --git a/crypto/jpake/jpaketest.c b/crypto/jpake/jpaketest.c
index a183262b18c04d9f17a92465497e0a6f6ae4cf45..ef9e54bdb3c9e3d89e1ebd5bd509c2f8fa67f40d 100644 (file)
--- a/crypto/jpake/jpaketest.c
+++ b/crypto/jpake/jpaketest.c
@@ -2,29 +2,29 @@
 
 #ifdef OPENSSL_NO_JPAKE
 
-#include <stdio.h>
+# include <stdio.h>
 
 int main(int argc, char *argv[])
 {
     printf("No J-PAKE support\n");
-    return(0);
+    return (0);
 }
 
 #else
 
-#include <openssl/jpake.h>
-#include <openssl/err.h>
+# include <openssl/jpake.h>
+# include <openssl/err.h>
 
 static void showbn(const char *name, const BIGNUM *bn)
-    {
+{
     fputs(name, stdout);
     fputs(" = ", stdout);
     BN_print_fp(stdout, bn);
     putc('\n', stdout);
-    }
+}
 
 static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
-    {
+{
     JPAKE_STEP1 alice_s1;
     JPAKE_STEP1 bob_s1;
     JPAKE_STEP2 alice_s2;
@@ -32,86 +32,80 @@ 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);
-    if(!JPAKE_STEP1_process(bob, &alice_s1))
-       {
-       printf("Bob fails to process Alice's step 1\n");
-       ERR_print_errors_fp(stdout);
-       return 1;
-       }
+    if (!JPAKE_STEP1_process(bob, &alice_s1)) {
+        printf("Bob fails to process Alice's step 1\n");
+        ERR_print_errors_fp(stdout);
+        return 1;
+    }
     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);
-    if(!JPAKE_STEP1_process(alice, &bob_s1))
-       {
-       printf("Alice fails to process Bob's step 1\n");
-       ERR_print_errors_fp(stdout);
-       return 2;
-       }
+    if (!JPAKE_STEP1_process(alice, &bob_s1)) {
+        printf("Alice fails to process Bob's step 1\n");
+        ERR_print_errors_fp(stdout);
+        return 2;
+    }
     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);
-    if(!JPAKE_STEP2_process(bob, &alice_s2))
-       {
-       printf("Bob fails to process Alice's step 2\n");
-       ERR_print_errors_fp(stdout);
-       return 3;
-       }
+    if (!JPAKE_STEP2_process(bob, &alice_s2)) {
+        printf("Bob fails to process Alice's step 2\n");
+        ERR_print_errors_fp(stdout);
+        return 3;
+    }
     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);
-    if(!JPAKE_STEP2_process(alice, &bob_s2))
-       {
-       printf("Alice fails to process Bob's step 2\n");
-       ERR_print_errors_fp(stdout);
-       return 4;
-       }
+    if (!JPAKE_STEP2_process(alice, &bob_s2)) {
+        printf("Alice fails to process Bob's step 2\n");
+        ERR_print_errors_fp(stdout);
+        return 4;
+    }
     JPAKE_STEP2_release(&bob_s2);
 
     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);
-    if(!JPAKE_STEP3A_process(bob, &alice_s3a))
-       {
-       printf("Bob fails to process Alice's step 3a\n");
-       ERR_print_errors_fp(stdout);
-       return 5;
-       }
+    if (!JPAKE_STEP3A_process(bob, &alice_s3a)) {
+        printf("Bob fails to process Alice's step 3a\n");
+        ERR_print_errors_fp(stdout);
+        return 5;
+    }
     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);
-    if(!JPAKE_STEP3B_process(alice, &bob_s3b))
-       {
-       printf("Alice fails to process Bob's step 3b\n");
-       ERR_print_errors_fp(stdout);
-       return 6;
-       }
+    if (!JPAKE_STEP3B_process(alice, &bob_s3b)) {
+        printf("Alice fails to process Bob's step 3b\n");
+        ERR_print_errors_fp(stdout);
+        return 6;
+    }
     JPAKE_STEP3B_release(&bob_s3b);
 
     return 0;
-    }
+}
 
 int main(int argc, char **argv)
-    {
+{
     JPAKE_CTX *alice;
     JPAKE_CTX *bob;
     BIGNUM *p = NULL;
@@ -137,8 +131,9 @@ 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) */
-    BN_hex2bn(&p, "F9E5B365665EA7A05A9C534502780FEE6F1AB5BD4F49947FD036DBD7E905269AF46EF28B0FC07487EE4F5D20FB3C0AF8E700F3A2FA3414970CBED44FEDFF80CE78D800F184BB82435D137AADA2C6C16523247930A63B85661D1FC817A51ACD96168E95898A1F83A79FFB529368AA7833ABD1B0C3AEDDB14D2E1A2F71D99F763F");
+    /* Use a safe prime for p (that we found earlier) */
+    BN_hex2bn(&p,
+              "F9E5B365665EA7A05A9C534502780FEE6F1AB5BD4F49947FD036DBD7E905269AF46EF28B0FC07487EE4F5D20FB3C0AF8E700F3A2FA3414970CBED44FEDFF80CE78D800F184BB82435D137AADA2C6C16523247930A63B85661D1FC817A51ACD96168E95898A1F83A79FFB529368AA7833ABD1B0C3AEDDB14D2E1A2F71D99F763F");
     showbn("p", p);
     g = BN_new();
     BN_set_word(g, 2);
@@ -149,29 +144,27 @@ 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);
 
-    if(run_jpake(alice, bob) != 0)
-       {
-       fprintf(stderr, "Plain JPAKE run failed\n");
-       return 1;
-       }
+    if (run_jpake(alice, bob) != 0) {
+        fprintf(stderr, "Plain JPAKE run failed\n");
+        return 1;
+    }
 
     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);
 
-    if(run_jpake(alice, bob) != 5)
-       {
-       fprintf(stderr, "Mismatched secret JPAKE run failed\n");
-       return 1;
-       }
+    if (run_jpake(alice, bob) != 5) {
+        fprintf(stderr, "Mismatched secret JPAKE run failed\n");
+        return 1;
+    }
 
     JPAKE_CTX_free(bob);
     JPAKE_CTX_free(alice);
@@ -187,6 +180,6 @@ int main(int argc, char **argv)
     CRYPTO_mem_leaks(bio_err);
 
     return 0;
-    }
+}
 
 #endif