X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7bd5a86050fa6fb39e2928b25f46df4f7dc24600..2d466ffd08675d26db45e524c2fe6a8cf4628e2b:/sshdh.c

diff --git a/sshdh.c b/sshdh.c
index 0beac6cf..7a1772b8 100644
--- a/sshdh.c
+++ b/sshdh.c
@@ -34,12 +34,12 @@ static unsigned char G[] = { 2 };
  * Variables.
  */
 static Bignum x, e, p, q, qmask, g;
-static int need_to_free_pg;
 
 /*
  * Common DH initialisation.
  */
-static void dh_init(void) {
+static void dh_init(void)
+{
     q = bignum_rshift(p, 1);
     qmask = bignum_bitmask(q);
 }
@@ -47,7 +47,8 @@ static void dh_init(void) {
 /*
  * Initialise DH for the standard group1.
  */
-void dh_setup_group1(void) {
+void dh_setup_group1(void)
+{
     p = bignum_from_bytes(P, sizeof(P));
     g = bignum_from_bytes(G, sizeof(G));
     dh_init();
@@ -56,7 +57,8 @@ void dh_setup_group1(void) {
 /*
  * Initialise DH for an alternative group.
  */
-void dh_setup_group(Bignum pval, Bignum gval) {
+void dh_setup_group(Bignum pval, Bignum gval)
+{
     p = copybn(pval);
     g = copybn(gval);
     dh_init();
@@ -65,7 +67,8 @@ void dh_setup_group(Bignum pval, Bignum gval) {
 /*
  * Clean up.
  */
-void dh_cleanup(void) {
+void dh_cleanup(void)
+{
     freebn(p);
     freebn(g);
     freebn(q);
@@ -87,7 +90,8 @@ void dh_cleanup(void) {
  * Advances in Cryptology: Proceedings of Eurocrypt '96
  * Springer-Verlag, May 1996.
  */
-Bignum dh_create_e(int nbits) {
+Bignum dh_create_e(int nbits)
+{
     int i;
 
     int nbytes;
@@ -101,8 +105,9 @@ Bignum dh_create_e(int nbits) {
 	 * Create a potential x, by ANDing a string of random bytes
 	 * with qmask.
 	 */
-        if (x) freebn(x);
-	if (nbits == 0 || nbits > ssh1_bignum_bitcount(qmask)) {
+	if (x)
+	    freebn(x);
+	if (nbits == 0 || nbits > bignum_bitcount(qmask)) {
 	    ssh1_write_bignum(buf, qmask);
 	    for (i = 2; i < nbytes; i++)
 		buf[i] &= random_byte();
@@ -110,7 +115,7 @@ Bignum dh_create_e(int nbits) {
 	} else {
 	    int b, nb;
 	    x = bn_power_2(nbits);
-	    nb = 0;
+	    b = nb = 0;
 	    for (i = 0; i < nbits; i++) {
 		if (nb == 0) {
 		    nb = 8;
@@ -134,7 +139,8 @@ Bignum dh_create_e(int nbits) {
 /*
  * DH stage 2: given a number f, compute K = f^x mod p.
  */
-Bignum dh_find_K(Bignum f) {
+Bignum dh_find_K(Bignum f)
+{
     Bignum ret;
     ret = modpow(f, x, p);
     return ret;