Commit c80fd6b2 authored by Matt Caswell's avatar Matt Caswell
Browse files

Further comment changes for reformat (master)



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 4b618848
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ end:
	OPENSSL_EXIT(ret);
	}

/*
/*-
 *----------------------------------------------------------------------
 * int add_certs_from_file
 *
+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int MAIN(int argc, char **argv)
			}
		else if (strcmp(*argv,"-2") == 0)
			g=2;
	/*	else if (strcmp(*argv,"-3") == 0)
	/*-	else if (strcmp(*argv,"-3") == 0)
			g=3; */
		else if (strcmp(*argv,"-5") == 0)
			g=5;
+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
	{
	if (cert_file != NULL)
		{
		/*
		/*-
		SSL *ssl;
		X509 *x509;
		*/
+16 −15
Original line number Diff line number Diff line
@@ -435,19 +435,20 @@ static int srp_Verify_N_and_g(const BIGNUM *N, const BIGNUM *g)
	return ret;
	}

/* This callback is used here for two purposes:
   - extended debugging
   - making some primality tests for unknown groups
   The callback is only called for a non default group.

   An application does not need the call back at all if
   only the stanard groups are used.  In real life situations, 
   client and server already share well known groups, 
   thus there is no need to verify them. 
   Furthermore, in case that a server actually proposes a group that
   is not one of those defined in RFC 5054, it is more appropriate 
   to add the group to a static list and then compare since 
   primality tests are rather cpu consuming.
/*-
 * This callback is used here for two purposes:
 * - extended debugging
 * - making some primality tests for unknown groups
 * The callback is only called for a non default group.
 *
 * An application does not need the call back at all if
 * only the stanard groups are used.  In real life situations, 
 * client and server already share well known groups, 
 * thus there is no need to verify them. 
 * Furthermore, in case that a server actually proposes a group that
 * is not one of those defined in RFC 5054, it is more appropriate 
 * to add the group to a static list and then compare since 
 * primality tests are rather cpu consuming.
 */

static int ssl_srp_verify_param_cb(SSL *s, void *arg)
@@ -1821,7 +1822,7 @@ SSL_set_tlsext_status_ids(con, ids);
					openssl_fdset(SSL_get_fd(con),&writefds);
			}
#endif
/*			printf("mode tty(%d %d%d) ssl(%d%d)\n",
/*-			printf("mode tty(%d %d%d) ssl(%d%d)\n",
				tty_on,read_tty,write_tty,read_ssl,write_ssl);*/

			/* Note: under VMS with SOCKETSHR the second parameter
+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ end:
	OPENSSL_EXIT(ret);
	}

/***********************************************************************
/*-
 * doConnection - make a connection
 * Args:
 *		scon	= earlier ssl connection for session id, or NULL
Loading