Commit 765e9ba9 authored by Ben Laurie's avatar Ben Laurie
Browse files

Merge branch 'sct-viewer-master' of https://github.com/robstradling/openssl into sct-viewer

parents 6ecbc2bb b263f212

apps/ocsp.c

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ int MAIN(int argc, char **argv) 
		goto end;

	SSL_load_error_strings();

	OpenSSL_add_ssl_algorithms();

	X509V3_EXT_add_rfc6962();

	args = argv + 1;

	reqnames = sk_OPENSSL_STRING_new_null();

	ids = sk_OCSP_CERTID_new_null();
@@ -970,6 +971,7 @@ end: 
		OPENSSL_free(path);

		}



	X509V3_EXT_cleanup();

	OPENSSL_EXIT(ret);

}

apps/s_client.c

+3 −0
Original line number Diff line number Diff line
@@ -713,6 +713,8 @@ static char *jpake_secret = NULL; 
	c_msg=0;

	c_showcerts=0;



	X509V3_EXT_add_rfc6962();



	if (bio_err == NULL)

		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
@@ -2193,6 +2195,7 @@ end: 
		BIO_free(bio_c_msg);

		bio_c_msg=NULL;

		}

	X509V3_EXT_cleanup();

	apps_shutdown();

	OPENSSL_EXIT(ret);

	}

apps/x509.c

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#include <openssl/x509v3.h>

#include <openssl/objects.h>

#include <openssl/pem.h>

#include <openssl/ssl.h>

#ifndef OPENSSL_NO_RSA

#include <openssl/rsa.h>

#endif
@@ -224,6 +225,8 @@ int MAIN(int argc, char **argv) 


	apps_startup();



	X509V3_EXT_add_rfc6962();



	if (bio_err == NULL)

		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
@@ -1155,6 +1158,7 @@ end: 
	sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);

	sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);

	if (passin) OPENSSL_free(passin);

	X509V3_EXT_cleanup();

	apps_shutdown();

	OPENSSL_EXIT(ret);

	}

crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \ 
SRC= $(LIBSRC)



EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \

	ossl_typ.h

HEADER=	cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER)

	ossl_typ.h o_time.h

HEADER=	cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h $(EXHEADER)



ALL=    $(GENERAL) $(SRC) $(HEADER)

crypto/bio/b_dump.c

+22 −0
Original line number Diff line number Diff line
@@ -185,3 +185,25 @@ int BIO_dump_indent(BIO *bp, const char *s, int len, int indent) 
	return BIO_dump_indent_cb(write_bio, bp, s, len, indent);

	}



int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,

		   int datalen)

	{

	int i, j = 0;



	if (datalen < 1)

		return 1;



	for (i = 0; i < datalen - 1; i++)

		{

		if (i && !j) BIO_printf(out, "%*s", indent, "");



		BIO_printf(out, "%02X:", data[i]);



		j = (j + 1) % width;

		if (!j) BIO_printf(out, "\n");

		}



	if (i && !j) BIO_printf(out, "%*s", indent, "");

	BIO_printf(out, "%02X", data[datalen - 1]);

	return 1;

	}