Commit be81f4dd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2716 

Submitted by: Adam Langley <agl@google.com>

Fix handling of exporter return value and use OpenSSL indentation in
s_client, s_server.
parent e626c778

apps/s_client.c

+17 −14
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static void sc_usage(void) 
# endif

#endif

	BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");

	BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");

	BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");

 	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");

 	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");

	}
@@ -2077,21 +2077,24 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
	}

 

	SSL_SESSION_print(bio,SSL_get_session(s));

	if (keymatexportlabel != NULL) {

	if (keymatexportlabel != NULL)

		{

		BIO_printf(bio, "Keying material exporter:\n");

		BIO_printf(bio, "    Label: '%s'\n", keymatexportlabel);

		BIO_printf(bio, "    Length: %i bytes\n", keymatexportlen);

		exportedkeymat = OPENSSL_malloc(keymatexportlen);

		if (exportedkeymat != NULL) {

			i = SSL_export_keying_material(s, exportedkeymat,

		if (exportedkeymat != NULL)

			{

			if (!SSL_export_keying_material(s, exportedkeymat,

						        keymatexportlen,

						        keymatexportlabel,

						        strlen(keymatexportlabel),

						       NULL, 0, 0);

			if (i != keymatexportlen) {

				BIO_printf(bio,

					   "    Error: return value %i\n", i);

			} else {

						        NULL, 0, 0))

				{

				BIO_printf(bio, "    Error\n");

				}

			else

				{

				BIO_printf(bio, "    Keying material: ");

				for (i=0; i<keymatexportlen; i++)

					BIO_printf(bio, "%02X",

apps/s_server.c

+27 −24
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void sv_usage(void) 
# ifndef OPENSSL_NO_NEXTPROTONEG

	BIO_printf(bio_err," -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");

# endif

        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");

        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");

#endif

	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");

	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
@@ -2505,22 +2505,25 @@ static int init_ssl_connection(SSL *con) 
#endif /* OPENSSL_NO_KRB5 */

	BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n",

		      SSL_get_secure_renegotiation_support(con) ? "" : " NOT");

 	if (keymatexportlabel != NULL) {

	if (keymatexportlabel != NULL)

		{

		BIO_printf(bio_s_out, "Keying material exporter:\n");

		BIO_printf(bio_s_out, "    Label: '%s'\n", keymatexportlabel);

		BIO_printf(bio_s_out, "    Length: %i bytes\n",

			   keymatexportlen);

		exportedkeymat = OPENSSL_malloc(keymatexportlen);

 		if (exportedkeymat != NULL) {

 			i = SSL_export_keying_material(con, exportedkeymat,

		if (exportedkeymat != NULL)

			{

			if (!SSL_export_keying_material(con, exportedkeymat,

						        keymatexportlen,

						        keymatexportlabel,

						        strlen(keymatexportlabel),

						       NULL, 0, 0);

 			if (i != keymatexportlen) {

 				BIO_printf(bio_s_out,

					   "    Error: return value %i\n", i);

 			} else {

						        NULL, 0, 0))

				{

				BIO_printf(bio_s_out, "    Error\n");

				}

			else

				{

				BIO_printf(bio_s_out, "    Keying material: ");

				for (i=0; i<keymatexportlen; i++)

					BIO_printf(bio_s_out, "%02X",