summaryrefslogtreecommitdiffstats
path: root/crypto/jpake
diff options
context:
space:
mode:
authorTim Hudson <tjh@openssl.org>2014-12-28 12:48:40 +1000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:23:04 +0000
commit6977c7e2baf291278aee7632f1a68581b7c4d1f9 (patch)
treeae6c4def1c5f7f4a3c4cb9bb7e63ec0ebf27b7f7 /crypto/jpake
parent43257b9f51de749262258668c77c2f0f99d7a15b (diff)
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments (cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960) Conflicts: crypto/bn/bn_lcl.h crypto/bn/bn_prime.c crypto/engine/eng_all.c crypto/rc4/rc4_utl.c crypto/sha/sha.h ssl/kssl.c ssl/t1_lib.c Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/jpake')
-rw-r--r--crypto/jpake/jpake.c8
-rw-r--r--crypto/jpake/jpaketest.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/jpake/jpake.c b/crypto/jpake/jpake.c
index f2489a4eef..81a5cb5120 100644
--- a/crypto/jpake/jpake.c
+++ b/crypto/jpake/jpake.c
@@ -348,7 +348,7 @@ int JPAKE_STEP2_generate(JPAKE_STEP2 *send, JPAKE_CTX *ctx)
BIGNUM *t1 = BN_new();
BIGNUM *t2 = BN_new();
- /*
+ /*-
* X = g^{(xa + xc + xd) * xb * s}
* t1 = g^xa
*/
@@ -360,7 +360,7 @@ int JPAKE_STEP2_generate(JPAKE_STEP2 *send, JPAKE_CTX *ctx)
/* t2 = xb * s */
BN_mod_mul(t2, ctx->xb, ctx->secret, ctx->p.q, ctx->ctx);
- /*
+ /*-
* ZKP(xb * s)
* XXX: this is kinda funky, because we're using
*
@@ -385,7 +385,7 @@ static int compute_key(JPAKE_CTX *ctx, const BIGNUM *gx)
BIGNUM *t2 = BN_new();
BIGNUM *t3 = BN_new();
- /*
+ /*-
* K = (gx/g^{xb * xd * s})^{xb}
* = (g^{(xc + xa + xb) * xd * s - xb * xd *s})^{xb}
* = (g^{(xa + xc) * xd * s})^{xb}
@@ -418,7 +418,7 @@ int JPAKE_STEP2_process(JPAKE_CTX *ctx, const JPAKE_STEP2 *received)
BIGNUM *t2 = BN_new();
int ret = 0;
- /*
+ /*-
* g' = g^{xc + xa + xb} [from our POV]
* t1 = xa + xb
*/
diff --git a/crypto/jpake/jpaketest.c b/crypto/jpake/jpaketest.c
index eaba75ed8a..a183262b18 100644
--- a/crypto/jpake/jpaketest.c
+++ b/crypto/jpake/jpaketest.c
@@ -128,12 +128,12 @@ int main(int argc, char **argv)
ERR_load_crypto_strings();
- /*
+ /*-
BN_hex2bn(&p, "fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7");
BN_hex2bn(&g, "f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d0782675159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243bcca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a");
BN_hex2bn(&q, "9760508f15230bccb292b982a2eb840bf0581cf5");
*/
- /*
+ /*-
p = BN_new();
BN_generate_prime(p, 1024, 1, NULL, NULL, NULL, NULL);
*/