adding pkcs11 submodule

keldonin · keldonin · commit 74acdcb8f5bb · 2020-11-23T12:49:26.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,31 @@
 *~
-m4/
+
+/aclocal.m4
+/ar-lib
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/m4/
+/autom4te.cache/
+/include/config.h
+/include/config.h.in
+/include/stamp-h1
+
+Makefile
+Makefile.in
+*.o
+*.lo
+*.la
+.deps/
+.libs/
+
+/lib
+/*.ign/
 
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "include/cryptoki"]
+	path = include/cryptoki
+	url = https://github.com/oasis-tcs/pkcs11.git
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -2,3 +2,5 @@
 
 mkdir -p m4
 autoreconf --verbose --install --force
+git submodule update --init include/cryptoki
+
diff --git a/configure.ac b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ([2.69])
 AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/pkcs11-display.c])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([include/config.h])
 
 # automake & libtool
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
diff --git a/include/cryptoki b/include/cryptoki
@@ -0,0 +1 @@
+Subproject commit eb8438a9c102f99d7a53b3d37688f1d0c2b4333c
diff --git a/include/cryptoki.h b/include/cryptoki.h
@@ -0,0 +1,22 @@
+#ifndef _CRYPTOKI_H_
+#define _CRYPTOKI_H_ 1
+
+#define CK_PTR *
+
+#define CK_DECLARE_FUNCTION(returnType, name) \
+    returnType name
+
+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
+    returnType (* name)
+
+#define CK_CALLBACK_FUNCTION(returnType, name) \
+    returnType (* name)
+
+#ifndef NULL_PTR
+#define NULL_PTR 0
+#endif
+
+#include "pkcs11.h"		/* include from OASIS submodule */
+
+#endif /* _CRYPTOKI_H_ */
+
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/cryptoki/published/2-40-errata-1
 
 lib_LTLIBRARIES = libpkcs11spy.la
 
@@ -8,8 +8,8 @@ libpkcs11spy_la_SOURCES = 	pkcs11-spy.c \
 				libscdl.c libscdl.h \
 				pkcs11.exports
 
-libpkcs11spy_la_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS)
-libpkcs11spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS)
+libpkcs11spy_la_CFLAGS = $(LIBCRYPTO_CFLAGS)
+libpkcs11spy_la_LIBADD = $(LIBCRYPTO_LIBS)
 libpkcs11spy_la_LDFLAGS = $(AM_LDFLAGS) \
 	-export-symbols "$(srcdir)/pkcs11.exports" \
 	-module -shared -avoid-version -no-undefined
diff --git a/src/libpkcs11.c b/src/libpkcs11.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 #include "libscdl.h"
 #include "libpkcs11.h"
diff --git a/src/pkcs11-display.h b/src/pkcs11-display.h
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/pkcs11.h b/src/pkcs11.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "include/cryptoki"]`
	`2`	`+ path = include/cryptoki`
	`3`	`+ url = https://github.com/oasis-tcs/pkcs11.git`