Check return code of EVP_CipherInit() in PKCS#12 code.

[oweals/openssl.git] / crypto / ossl_typ.h

diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h
index 46200a80b165a5b671a0ccc337dd58cf4173a9a2..285fd0b1d977fb3f0f41a37d2b28cb8bdccea5a3 100644 (file)
--- a/crypto/ossl_typ.h
+++ b/crypto/ossl_typ.h
@@ -97,7 +97,6 @@ typedef int ASN1_NULL;
 
 #ifdef OPENSSL_SYS_WIN32
 #undef X509_NAME
-#undef X509_CERT_PAIR
 #undef PKCS7_ISSUER_AND_SERIAL
 #endif
 
@@ -114,9 +113,6 @@ typedef struct X509_name_st X509_NAME;
 typedef struct x509_store_st X509_STORE;
 typedef struct x509_store_ctx_st X509_STORE_CTX;
 
-typedef struct v3_ext_ctx X509V3_CTX;
-typedef struct conf_st CONF;
-
 typedef struct engine_st ENGINE;
 
   /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */