[pkg-opensc-commit] [libp11] 43/86: #include cleanup

Eric Dorland eric at moszumanska.debian.org
Sun Jul 24 21:40:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit 2318734087ec28659de74a8a55b61e960de4c5af
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Tue Feb 9 16:05:03 2016 +0100

    #include cleanup
---
 src/eng_back.c   | 3 ---
 src/eng_front.c  | 2 +-
 src/libp11-int.h | 9 ++-------
 src/libp11.h     | 1 -
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/eng_back.c b/src/eng_back.c
index d90d160..533f928 100644
--- a/src/eng_back.c
+++ b/src/eng_back.c
@@ -29,9 +29,6 @@
 #include "engine.h"
 #include <stdio.h>
 #include <string.h>
-#include <openssl/crypto.h>
-#include <openssl/objects.h>
-#include <openssl/engine.h>
 
 /* The maximum length of an internally-allocated PIN */
 #define MAX_PIN_LENGTH   32
diff --git a/src/eng_front.c b/src/eng_front.c
index 28510ec..b8b011f 100644
--- a/src/eng_front.c
+++ b/src/eng_front.c
@@ -63,8 +63,8 @@
 #include "engine.h"
 #include <stdio.h>
 #include <string.h>
-#include <openssl/opensslv.h>
 #include <openssl/opensslconf.h>
+#include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 #include <openssl/objects.h>
 #include <openssl/engine.h>
diff --git a/src/libp11-int.h b/src/libp11-int.h
index 0ea4fce..e58fe85 100644
--- a/src/libp11-int.h
+++ b/src/libp11-int.h
@@ -23,10 +23,8 @@
 #include "config.h"
 #endif
 
-#include <openssl/opensslv.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
+#include "libp11.h"
+#include "atfork.h"
 
 #define CRYPTOKI_EXPORTS
 #include "pkcs11.h"
@@ -34,9 +32,6 @@
 extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
 extern CK_RV C_UnloadModule(void *module);
 
-#include "libp11.h"
-#include "atfork.h"
-
 /* get private implementations of PKCS11 structures */
 
 /*
diff --git a/src/libp11.h b/src/libp11.h
index aab5145..f3303df 100644
--- a/src/libp11.h
+++ b/src/libp11.h
@@ -24,7 +24,6 @@
 #ifndef _LIB11_H
 #define _LIB11_H
 
-#include <openssl/opensslv.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git



More information about the pkg-opensc-commit mailing list