Move struct typedefs to base.h

include/openssl/base.h

@@ -349,6 +349,14 @@ typedef struct md4_state_st MD4_CTX;
 typedef struct md5_state_st MD5_CTX;
 typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
 typedef struct ossl_init_settings_st OPENSSL_INIT_SETTINGS;
+typedef struct pkcs7_st PKCS7;
+typedef struct pkcs7_signed_st PKCS7_SIGNED;
+typedef struct pkcs7_envelope_st PKCS7_ENVELOPE;
+typedef struct pkcs7_sign_envelope_st PKCS7_SIGN_ENVELOPE;
+typedef struct pkcs7_digest_st PKCS7_DIGEST;
+typedef struct pkcs7_encrypt_st PKCS7_ENCRYPT;
+typedef struct pkcs7_recip_info_st PKCS7_RECIP_INFO;
+typedef struct pkcs7_signer_info_st PKCS7_SIGNER_INFO;
 typedef struct pkcs12_st PKCS12;
 typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
 typedef struct private_key_st X509_PKEY;

include/openssl/pkcs7.h

@@ -108,15 +108,6 @@ OPENSSL_EXPORT int PKCS7_get_PEM_CRLs(STACK_OF(X509_CRL) *out_crls,
 // API. It intentionally does not implement the whole thing, only the minimum
 // needed to build cryptography.io and CRuby.
 
-typedef struct pkcs7_st PKCS7;
-typedef struct pkcs7_signed_st PKCS7_SIGNED;
-typedef struct pkcs7_envelope_st PKCS7_ENVELOPE;
-typedef struct pkcs7_sign_envelope_st PKCS7_SIGN_ENVELOPE;
-typedef struct pkcs7_digest_st PKCS7_DIGEST;
-typedef struct pkcs7_encrypt_st PKCS7_ENCRYPT;
-typedef struct pkcs7_recip_info_st PKCS7_RECIP_INFO;
-typedef struct pkcs7_signer_info_st PKCS7_SIGNER_INFO;
-
 struct pkcs7_st {
   // Unlike OpenSSL, the following fields are immutable. They filled in when the
   // object is parsed and ignored in serialization.