diff mbox series

[v2,1/3] openssl: Remove stray includes

Message ID 20200930113458.18120-2-bage@linutronix.de
State Accepted
Headers show
Series sslapi: Include wolfSSL's options.h for non-PKCS11 | expand

Commit Message

Bastian Germann Sept. 30, 2020, 11:34 a.m. UTC 
From: Bastian Germann <bage@linutronix.de>

Some files of sslapi including components include openssl headers.
Remove them because they are not needed.

Signed-off-by: Bastian Germann <bage@linutronix.de>
---
 corelib/swupdate_decrypt.c        | 1 -
 corelib/swupdate_verify_private.h | 3 ---
 2 files changed, 4 deletions(-)

Comments

Stefano Babic Oct. 1, 2020, 9:38 a.m. UTC | #1 
On 30.09.20 13:34, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
> 
> Some files of sslapi including components include openssl headers.
> Remove them because they are not needed.
> 
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
>  corelib/swupdate_decrypt.c        | 1 -
>  corelib/swupdate_verify_private.h | 3 ---
>  2 files changed, 4 deletions(-)
> 
> diff --git a/corelib/swupdate_decrypt.c b/corelib/swupdate_decrypt.c
> index 2d1fedb..a177ba9 100644
> --- a/corelib/swupdate_decrypt.c
> +++ b/corelib/swupdate_decrypt.c
> @@ -12,7 +12,6 @@
>  #include <stdlib.h>
>  #include <string.h>
>  #include <stdbool.h>
> -#include <openssl/opensslv.h>
>  #include "swupdate.h"
>  #include "sslapi.h"
>  #include "util.h"
> diff --git a/corelib/swupdate_verify_private.h b/corelib/swupdate_verify_private.h
> index b91e293..c81a92c 100644
> --- a/corelib/swupdate_verify_private.h
> +++ b/corelib/swupdate_verify_private.h
> @@ -8,8 +8,6 @@
>  #ifndef _SWUPDATE_VERIFY_H
>  #define _SWUPDATE_VERIFY_H
>  
> -#include <openssl/evp.h>
> -
>  struct swupdate_digest;
>  int dgst_init(struct swupdate_digest *dgst, const EVP_MD *md);
>  
> @@ -18,7 +16,6 @@ EVP_PKEY *load_pubkey(const char *file);
>  #endif
>  
>  #ifdef CONFIG_SIGALG_CMS
> -#include <openssl/cms.h>
>  int check_code_sign(const X509_PURPOSE *xp, const X509 *crt, int ca);
>  X509_STORE *load_cert_chain(const char *file);
>  #endif
> 

Applied to -master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/corelib/swupdate_decrypt.c b/corelib/swupdate_decrypt.c
index 2d1fedb..a177ba9 100644
--- a/corelib/swupdate_decrypt.c
+++ b/corelib/swupdate_decrypt.c
@@ -12,7 +12,6 @@ 
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <openssl/opensslv.h>
 #include "swupdate.h"
 #include "sslapi.h"
 #include "util.h"
diff --git a/corelib/swupdate_verify_private.h b/corelib/swupdate_verify_private.h
index b91e293..c81a92c 100644
--- a/corelib/swupdate_verify_private.h
+++ b/corelib/swupdate_verify_private.h
@@ -8,8 +8,6 @@ 
 #ifndef _SWUPDATE_VERIFY_H
 #define _SWUPDATE_VERIFY_H
 
-#include <openssl/evp.h>
-
 struct swupdate_digest;
 int dgst_init(struct swupdate_digest *dgst, const EVP_MD *md);
 
@@ -18,7 +16,6 @@  EVP_PKEY *load_pubkey(const char *file);
 #endif
 
 #ifdef CONFIG_SIGALG_CMS
-#include <openssl/cms.h>
 int check_code_sign(const X509_PURPOSE *xp, const X509 *crt, int ca);
 X509_STORE *load_cert_chain(const char *file);
 #endif