diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-03-28 23:17:34 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-03-28 23:17:34 +0000 |
commit | 8d8c7266d4de9887fb0190a0770df9dc254a16a3 (patch) | |
tree | 53266f3f48875973f3c7f96abf912c5084155a23 /crypto/err | |
parent | cfcefcbe2aff81c1735c788ca6ae26b7c16cc453 (diff) | |
download | openssl-8d8c7266d4de9887fb0190a0770df9dc254a16a3.tar.gz |
Yet more PKCS#12 integration: add lots of files under crypto/pkcs12 and add
them to the build environment.
Diffstat (limited to 'crypto/err')
-rw-r--r-- | crypto/err/err.h | 2 | ||||
-rw-r--r-- | crypto/err/err_all.c | 2 | ||||
-rw-r--r-- | crypto/err/ssleay.ec | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/crypto/err/err.h b/crypto/err/err.h index fe037109d9..c10868ac7f 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -117,6 +117,7 @@ typedef struct err_state_st #define ERR_LIB_BIO 32 #define ERR_LIB_PKCS7 33 #define ERR_LIB_X509V3 34 +#define ERR_LIB_PKCS12 35 #define ERR_LIB_USER 128 @@ -143,6 +144,7 @@ typedef struct err_state_st #define PROXYerr(f,r) ERR_PUT_error(ERR_LIB_PROXY,(f),(r),ERR_file_name,__LINE__) #define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),ERR_file_name,__LINE__) #define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),ERR_file_name,__LINE__) +#define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),ERR_file_name,__LINE__) /* Borland C seems too stupid to be able to shift and do longs in * the pre-processor :-( */ diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 6917b48fb2..06076064f6 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -79,6 +79,7 @@ #include "x509.h" #include "x509v3.h" #include "conf.h" +#include "pkcs12.h" #include "err.h" void ERR_load_crypto_strings() @@ -114,5 +115,6 @@ void ERR_load_crypto_strings() ERR_load_X509V3_strings(); ERR_load_CRYPTO_strings(); ERR_load_PKCS7_strings(); + ERR_load_PKCS12_strings(); #endif } diff --git a/crypto/err/ssleay.ec b/crypto/err/ssleay.ec index fa2df26ca2..2f9fd16edc 100644 --- a/crypto/err/ssleay.ec +++ b/crypto/err/ssleay.ec @@ -16,6 +16,7 @@ L ASN1 asn1/asn1.err L CONF conf/conf.err L PROXY proxy/proxy.err L PKCS7 pkcs7/pkcs7.err +L PKCS12 pkcs12/pkcs12.err L RSAREF ../rsaref/rsaref.err L SSL ../ssl/ssl.err L SSL2 ../ssl/ssl2.err |