Commit 7984f082 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove store. 



Rebased and merged by me, with Ben's approval.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarBen Laurie <ben@openssl.org>
parent deca5df2

Configure

+1 −3
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ $config{sdirs} = [ 
    "bn", "ec", "rsa", "dsa", "dh", "dso", "engine",

    "buffer", "bio", "stack", "lhash", "rand", "err",

    "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",

    "cms", "ts", "jpake", "srp", "store", "cmac", "ct", "async", "kdf"

    "cms", "ts", "jpake", "srp", "cmac", "ct", "async", "kdf"

    ];



# Known TLS and DTLS protocols
@@ -294,7 +294,6 @@ my @disablables = ( 
    "ssl-trace",

    "static-engine",

    "stdio",

    "store",

    "threads",

    "tls",

    "unit-test",
@@ -319,7 +318,6 @@ my %disabled = ( # "what" => "comment" [or special keyword "experimental 
		 "sctp"           => "default",

		 "shared"         => "default",

		 "ssl-trace"	  => "default",

		 "store"	  => "experimental",

		 "unit-test"	  => "default",

		 "zlib"           => "default",

		 "zlib-dynamic"   => "default",

Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ rehash.time: certs build_apps build_tools 
		touch rehash.time; \

	else :; fi



test:   tests

test:   files tests





tests: rehash

crypto/engine/Makefile.in

+3 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ GENERAL=Makefile 
LIB=$(TOP)/libcrypto.a

LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \

	eng_table.c eng_pkey.c eng_fat.c eng_all.c \

	tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c tb_store.c \

	tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c \

	tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c tb_eckey.c \

	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \

	eng_rdrand.c

LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \

	eng_table.o eng_pkey.o eng_fat.o eng_all.o \

	tb_rsa.o tb_dsa.o tb_dh.o tb_rand.o tb_store.o \

	tb_rsa.o tb_dsa.o tb_dh.o tb_rand.o \

	tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o tb_eckey.o \

	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \

	eng_rdrand.o

crypto/engine/eng_int.h

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ struct engine_st { 
    const DH_METHOD *dh_meth;

    const EC_KEY_METHOD *ec_meth;

    const RAND_METHOD *rand_meth;

    const STORE_METHOD *store_meth;

    /* Cipher handling is via this callback */

    ENGINE_CIPHERS_PTR ciphers;

    /* Digest handling is via this callback */

crypto/engine/eng_lib.c

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ void engine_set_all_null(ENGINE *e) 
    e->dsa_meth = NULL;

    e->dh_meth = NULL;

    e->rand_meth = NULL;

    e->store_meth = NULL;

    e->ciphers = NULL;

    e->digests = NULL;

    e->destroy = NULL;