diff options
Diffstat (limited to 'src/lib/libcrypto/ossl_typ.h')
-rw-r--r-- | src/lib/libcrypto/ossl_typ.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h index 0e7a380880..12bd7014de 100644 --- a/src/lib/libcrypto/ossl_typ.h +++ b/src/lib/libcrypto/ossl_typ.h | |||
@@ -95,6 +95,8 @@ typedef int ASN1_BOOLEAN; | |||
95 | typedef int ASN1_NULL; | 95 | typedef int ASN1_NULL; |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | typedef struct asn1_pctx_st ASN1_PCTX; | ||
99 | |||
98 | #ifdef OPENSSL_SYS_WIN32 | 100 | #ifdef OPENSSL_SYS_WIN32 |
99 | #undef X509_NAME | 101 | #undef X509_NAME |
100 | #undef X509_EXTENSIONS | 102 | #undef X509_EXTENSIONS |
@@ -122,6 +124,11 @@ typedef struct env_md_st EVP_MD; | |||
122 | typedef struct env_md_ctx_st EVP_MD_CTX; | 124 | typedef struct env_md_ctx_st EVP_MD_CTX; |
123 | typedef struct evp_pkey_st EVP_PKEY; | 125 | typedef struct evp_pkey_st EVP_PKEY; |
124 | 126 | ||
127 | typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD; | ||
128 | |||
129 | typedef struct evp_pkey_method_st EVP_PKEY_METHOD; | ||
130 | typedef struct evp_pkey_ctx_st EVP_PKEY_CTX; | ||
131 | |||
125 | typedef struct dh_st DH; | 132 | typedef struct dh_st DH; |
126 | typedef struct dh_method DH_METHOD; | 133 | typedef struct dh_method DH_METHOD; |
127 | 134 | ||
@@ -139,11 +146,14 @@ typedef struct ecdsa_method ECDSA_METHOD; | |||
139 | typedef struct x509_st X509; | 146 | typedef struct x509_st X509; |
140 | typedef struct X509_algor_st X509_ALGOR; | 147 | typedef struct X509_algor_st X509_ALGOR; |
141 | typedef struct X509_crl_st X509_CRL; | 148 | typedef struct X509_crl_st X509_CRL; |
149 | typedef struct x509_crl_method_st X509_CRL_METHOD; | ||
150 | typedef struct x509_revoked_st X509_REVOKED; | ||
142 | typedef struct X509_name_st X509_NAME; | 151 | typedef struct X509_name_st X509_NAME; |
152 | typedef struct X509_pubkey_st X509_PUBKEY; | ||
143 | typedef struct x509_store_st X509_STORE; | 153 | typedef struct x509_store_st X509_STORE; |
144 | typedef struct x509_store_ctx_st X509_STORE_CTX; | 154 | typedef struct x509_store_ctx_st X509_STORE_CTX; |
145 | typedef struct ssl_st SSL; | 155 | |
146 | typedef struct ssl_ctx_st SSL_CTX; | 156 | typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO; |
147 | 157 | ||
148 | typedef struct v3_ext_ctx X509V3_CTX; | 158 | typedef struct v3_ext_ctx X509V3_CTX; |
149 | typedef struct conf_st CONF; | 159 | typedef struct conf_st CONF; |
@@ -157,12 +167,19 @@ typedef struct ui_method_st UI_METHOD; | |||
157 | typedef struct st_ERR_FNS ERR_FNS; | 167 | typedef struct st_ERR_FNS ERR_FNS; |
158 | 168 | ||
159 | typedef struct engine_st ENGINE; | 169 | typedef struct engine_st ENGINE; |
170 | typedef struct ssl_st SSL; | ||
171 | typedef struct ssl_ctx_st SSL_CTX; | ||
160 | 172 | ||
161 | typedef struct X509_POLICY_NODE_st X509_POLICY_NODE; | 173 | typedef struct X509_POLICY_NODE_st X509_POLICY_NODE; |
162 | typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL; | 174 | typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL; |
163 | typedef struct X509_POLICY_TREE_st X509_POLICY_TREE; | 175 | typedef struct X509_POLICY_TREE_st X509_POLICY_TREE; |
164 | typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE; | 176 | typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE; |
165 | 177 | ||
178 | typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID; | ||
179 | typedef struct DIST_POINT_st DIST_POINT; | ||
180 | typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT; | ||
181 | typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS; | ||
182 | |||
166 | /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */ | 183 | /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */ |
167 | #define DECLARE_PKCS12_STACK_OF(type) /* Nothing */ | 184 | #define DECLARE_PKCS12_STACK_OF(type) /* Nothing */ |
168 | #define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */ | 185 | #define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */ |