Commit a5db6fa5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Define a STORE type. For documentation, read the entry in CHANGES, 

crypto/store/README, crypto/store/store.h and crypto/store/str_locl.h.
parent 9236b5b0

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 


 Changes between 0.9.7a and 0.9.8  [xx XXX xxxx]



  *) Add the STORE type.  The intention is to provide a common interface

     to certificate and key stores, be they simple file-based stores, or

     HSM-type store, or LDAP stores, or...

     NOTE: The code is currently UNTESTED and isn't really used anywhere.

     [Richard Levitte]



  *) Add a generic structure called OPENSSL_ITEM.  This can be used to

     pass a list of arguments to any function as well as provide a way

     for a function to pass data back to the caller.

Makefile.org

+2 −1
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ SDIRS= \ 
	des rc2 rc4 rc5 idea bf cast \

	bn ec rsa dsa ecdsa dh ecdh dso engine aes \

	buffer bio stack lhash rand err objects \

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

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \

	store



# tests to perform.  "alltests" is a special word indicating that all tests

# should be performed.

crypto/Makefile.ssl

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ SDIRS= md2 md5 sha mdc2 hmac ripemd \ 
	des rc2 rc4 rc5 idea bf cast \

	bn ec rsa dsa ecdsa ecdh dh dso engine aes \

	buffer bio stack lhash rand err objects \

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

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \

	store



GENERAL=Makefile README crypto-lib.com install.com

crypto/crypto-lib.com

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ $ ENCRYPT_TYPES = "Basic,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ - 
		  "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,"+ -

		  "BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,"+ -

		  "EVP,EVP_2,ASN1,ASN1_2,PEM,X509,X509V3,"+ -

		  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5"

		  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -

		  "STORE"

$!

$! Check To Make Sure We Have Valid Command Line Parameters.

$!
@@ -265,6 +266,7 @@ $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ - 
$ LIB_UI_COMPAT = ",ui_compat"

$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT

$ LIB_KRB5 = "krb5_asn"

$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"

$!

$! Setup exceptional compilations

$!

crypto/err/err.h

+3 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ typedef struct err_state_st 
#define ERR_LIB_COMP            41

#define ERR_LIB_ECDSA		42

#define ERR_LIB_ECDH		43

#define ERR_LIB_STORE           44



#define ERR_LIB_USER		128
@@ -165,6 +166,7 @@ typedef struct err_state_st 
#define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)

#define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)

#define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)

#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)



/* Borland C seems too stupid to be able to shift and do longs in

 * the pre-processor :-( */
@@ -219,6 +221,7 @@ typedef struct err_state_st 
#define ERR_R_COMP_LIB	ERR_LIB_COMP     /* 41 */

#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA	 /* 42 */

#define ERR_R_ECDH_LIB  ERR_LIB_ECDH	 /* 43 */

#define ERR_R_STORE_LIB ERR_LIB_STORE    /* 44 */



#define ERR_R_NESTED_ASN1_ERROR			58

#define ERR_R_BAD_ASN1_OBJECT_HEADER		59