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

Move CT viewer extension code to crypto/x509v3

parent 4cfeb00b

apps/ocsp.c

+0 −2
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ 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();
@@ -971,7 +970,6 @@ end: 
		OPENSSL_free(path);

		}



	X509V3_EXT_cleanup();

	OPENSSL_EXIT(ret);

}

apps/s_client.c

+0 −3
Original line number Diff line number Diff line
@@ -713,8 +713,6 @@ 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);
@@ -2195,7 +2193,6 @@ end: 
		BIO_free(bio_c_msg);

		bio_c_msg=NULL;

		}

	X509V3_EXT_cleanup();

	apps_shutdown();

	OPENSSL_EXIT(ret);

	}

apps/x509.c

+0 −4
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 
#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
@@ -225,8 +224,6 @@ int MAIN(int argc, char **argv) 


	apps_startup();



	X509V3_EXT_add_rfc6962();



	if (bio_err == NULL)

		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
@@ -1158,7 +1155,6 @@ 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/crypto-lib.com

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ $ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ - 
	"v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ -

	"v3_ocsp,v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -

	"pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -

	"v3_asid,v3_addr"

	"v3_asid,v3_addr,v3_scts"

$ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap"

$ LIB_TXT_DB = "txt_db"

$ LIB_PKCS7 = "pk7_asn1,pk7_lib,pkcs7err,pk7_doit,pk7_smime,pk7_attr,"+ -

crypto/x509v3/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \ 
v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \

v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c \

pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c \

v3_asid.c v3_addr.c

v3_asid.c v3_addr.c v3_scts.c

LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \

v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o \

v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o \

v3_ocsp.o v3_akeya.o v3_pmaps.o v3_pcons.o v3_ncons.o v3_pcia.o v3_pci.o \

pcy_cache.o pcy_node.o pcy_data.o pcy_map.o pcy_tree.o pcy_lib.o \

v3_asid.o v3_addr.o

v3_asid.o v3_addr.o v3_scts.o



SRC= $(LIBSRC)