diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2024-11-01 18:34:07 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-11-01 18:34:07 +0000 |
| commit | 98c862c86b4c36ef66d94822cc18435c75e865d6 (patch) | |
| tree | a6d1e33475341faf75bef900c400571846ba59c3 /lib/libcrypto/cms | |
| parent | c65f3bde4d013c965b8092180a77d71e61004c1f (diff) | |
Only include cryptlib.h where it's needed
Clean up the other includes while there.
Diffstat (limited to 'lib/libcrypto/cms')
| -rw-r--r-- | lib/libcrypto/cms/cms_enc.c | 16 | ||||
| -rw-r--r-- | lib/libcrypto/cms/cms_kari.c | 14 |
2 files changed, 14 insertions, 16 deletions
diff --git a/lib/libcrypto/cms/cms_enc.c b/lib/libcrypto/cms/cms_enc.c index dee643fa19e..ef6925dbd6f 100644 --- a/lib/libcrypto/cms/cms_enc.c +++ b/lib/libcrypto/cms/cms_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_enc.c,v 1.24 2024/01/14 18:40:24 tb Exp $ */ +/* $OpenBSD: cms_enc.c,v 1.25 2024/11/01 18:34:06 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -52,19 +52,19 @@ * ==================================================================== */ +#include <stdlib.h> #include <string.h> -#include "cryptlib.h" -#include <openssl/asn1t.h> -#include <openssl/pem.h> -#include <openssl/x509v3.h> -#include <openssl/err.h> +#include <openssl/asn1.h> +#include <openssl/bio.h> #include <openssl/cms.h> -#include <openssl/rand.h> +#include <openssl/err.h> +#include <openssl/evp.h> +#include <openssl/objects.h> +#include <openssl/x509.h> #include "cms_local.h" #include "evp_local.h" -#include "x509_local.h" /* CMS EncryptedData Utilities */ diff --git a/lib/libcrypto/cms/cms_kari.c b/lib/libcrypto/cms/cms_kari.c index 242a496932f..86b1ad9e837 100644 --- a/lib/libcrypto/cms/cms_kari.c +++ b/lib/libcrypto/cms/cms_kari.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_kari.c,v 1.16 2024/02/02 14:11:45 tb Exp $ */ +/* $OpenBSD: cms_kari.c,v 1.17 2024/11/01 18:34:06 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -52,17 +52,15 @@ * ==================================================================== */ +#include <stdlib.h> #include <string.h> -#include "cryptlib.h" -#include <openssl/asn1t.h> -#include <openssl/pem.h> -#include <openssl/x509v3.h> -#include <openssl/err.h> +#include <openssl/asn1.h> #include <openssl/cms.h> -#include <openssl/aes.h> +#include <openssl/err.h> +#include <openssl/evp.h> + #include "cms_local.h" -#include "asn1/asn1_local.h" /* Key Agreement Recipient Info (KARI) routines */ |