Fixes for libwolfkeymgr headers for shared use.

dgarske · dgarske · commit 71670ad220c1 · 2021-02-19T16:02:18.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -40,4 +40,4 @@ diff
 src/wolfkeymgr
 examples/etsi_client/etsi_client
 libtool
-src/options.h
+wolfkeymgr/options.h
diff --git a/configure.ac b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.59)
 
 AC_INIT([wolfKeyManager],[0.2],[http://www.wolfssl.com])
 AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([wolfkeymgr/config.h])
 AC_CONFIG_MACRO_DIR(m4)
 
 # The following sets CFLAGS to empty if unset on command line.  We do not
@@ -143,7 +143,7 @@ AM_CONDITIONAL([BUILD_ETSI_SERVICE],[test "x$ENABLED_ETSI_SERVICE" = "xyes"])
 
 
 # FINAL
-AC_CONFIG_FILES([Makefile src/options.h src/version.h])
+AC_CONFIG_FILES([Makefile wolfkeymgr/options.h wolfkeymgr/version.h])
 
 AX_AM_JOBSERVER([yes])
 
@@ -161,7 +161,7 @@ echo
 echo "---"
 echo "Generating user options header..."
 
-OPTION_FILE="src/options.h"
+OPTION_FILE="wolfkeymgr/options.h"
 rm -f $OPTION_FILE
 
 echo "/* wolf key manager options.h" > $OPTION_FILE
diff --git a/src/include.am b/src/include.am
@@ -17,12 +17,12 @@ src_wolfkeymgr_LDFLAGS      = -Lsrc
 src_wolfkeymgr_LDADD        = src/libwolfkeymgr.la $(LTLIBEVENT) $(LIB_STATIC_ADD)
 src_wolfkeymgr_DEPENDENCIES = src/libwolfkeymgr.la
 
+noinst_HEADERS  += wolfkeymgr/keymanager.h \
+                   wolfkeymgr/sock_mgr.h \
+                   wolfkeymgr/svc_etsi.h
 
-nobase_include_HEADERS += src/keymanager.h \
-                          src/sock_mgr.h \
-                          src/mod_etsi.h \
-                          src/mod_http.h \
-                          src/mod_socket.h \
-                          src/mod_tls.h \
-                          src/svc_etsi.h \
-                          src/wkm_utils.h
+nobase_include_HEADERS += wolfkeymgr/mod_etsi.h \
+                          wolfkeymgr/mod_http.h \
+                          wolfkeymgr/mod_socket.h \
+                          wolfkeymgr/mod_tls.h \
+                          wolfkeymgr/wkm_utils.h
diff --git a/src/keymanager.c b/src/keymanager.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include "keymanager.h"
+#include "wolfkeymgr/keymanager.h"
 
 #include <unistd.h>    /* getopt */
 #include <signal.h>    /* SIGPIPE */
diff --git a/src/mod_etsi.c b/src/mod_etsi.c
@@ -21,9 +21,7 @@
 
 #ifdef WOLFKM_ETSI_SERVICE
 
-#include "mod_etsi.h"
-#include "mod_http.h"
-#include "mod_tls.h"
+#include "wolfkeymgr/mod_etsi.h"
 
 struct EtsiClientCtx {
     WOLFSSL_CTX*   sslCtx;
diff --git a/src/mod_http.c b/src/mod_http.c
@@ -21,8 +21,9 @@
 
 /* HTTP 1.1 Client and Server Module */
 
-#include "mod_http.h"
-#include "wkm_utils.h"
+#include "wolfkeymgr/mod_http.h"
+#include "wolfkeymgr/wkm_utils.h"
+
 #include <string.h>
 
 static const char* kCrlf = "\r\n";
diff --git a/src/mod_socket.c b/src/mod_socket.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include "mod_socket.h"
+#include "wolfkeymgr/mod_socket.h"
 
 
 #ifdef USE_IPV6
diff --git a/src/mod_tls.c b/src/mod_tls.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include "mod_tls.h"
+#include "wolfkeymgr/mod_tls.h"
 
 /* wolfSSL I/O Receive CallBack */
 static int wkmTlsReadCb(WOLFSSL* ssl, char* buf, int sz, void* ctx)
diff --git a/src/sock_mgr.c b/src/sock_mgr.c
@@ -37,7 +37,7 @@
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 
-#include "keymanager.h"
+#include "wolfkeymgr/keymanager.h"
 
 /* per thread stats, doesn't use lock */
 static __thread stats threadStats;
diff --git a/src/svc_etsi.c b/src/svc_etsi.c
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include "keymanager.h"
-#include "mod_http.h"
-#include "mod_etsi.h"
+#include "wolfkeymgr/keymanager.h"
+#include "wolfkeymgr/mod_http.h"
+#include "wolfkeymgr/mod_etsi.h"
 
 #ifdef WOLFKM_ETSI_SERVICE
 
diff --git a/src/wkm_utils.c b/src/wkm_utils.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include "wkm_utils.h"
+#include "wolfkeymgr/wkm_utils.h"
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/wolfkeymgr/keymanager.h b/wolfkeymgr/keymanager.h
@@ -28,12 +28,12 @@
 
 
 /* Key Manager Headers */
-#include "wkm_types.h"
-#include "wkm_utils.h"
-#include "mod_http.h"
-#include "mod_etsi.h"
-#include "sock_mgr.h"
-#include "svc_etsi.h"
+#include "wolfkeymgr/wkm_types.h"
+#include "wolfkeymgr/wkm_utils.h"
+#include "wolfkeymgr/mod_http.h"
+#include "wolfkeymgr/mod_etsi.h"
+#include "wolfkeymgr/sock_mgr.h"
+#include "wolfkeymgr/svc_etsi.h"
 
 
 /* wolfssl headers */
diff --git a/wolfkeymgr/mod_etsi.h b/wolfkeymgr/mod_etsi.h
@@ -26,8 +26,10 @@
 extern "C" {
 #endif
 
-#include "wkm_types.h"
-#include "mod_socket.h"
+#include "wolfkeymgr/wkm_types.h"
+#include "wolfkeymgr/mod_http.h"
+#include "wolfkeymgr/mod_socket.h"
+#include "wolfkeymgr/mod_tls.h"
 
 typedef struct EtsiClientCtx EtsiClientCtx;
 
diff --git a/wolfkeymgr/mod_http.h b/wolfkeymgr/mod_http.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include "wkm_types.h"
+#include "wolfkeymgr/wkm_types.h"
 
 /* Configurable HTTP Settings */
 #ifndef HTTP_HDR_MAX_ITEMS
diff --git a/wolfkeymgr/mod_socket.h b/wolfkeymgr/mod_socket.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#include "wkm_types.h"
-#include "wkm_utils.h"
+#include "wolfkeymgr/wkm_types.h"
+#include "wolfkeymgr/wkm_utils.h"
 
 #ifdef USE_WINDOWS_API
     #include <winsock2.h>
diff --git a/wolfkeymgr/mod_tls.h b/wolfkeymgr/mod_tls.h
@@ -26,9 +26,9 @@
 extern "C" {
 #endif
 
-#include "wkm_types.h"
-#include "wkm_utils.h"
-#include "mod_socket.h"
+#include "wolfkeymgr/wkm_types.h"
+#include "wolfkeymgr/wkm_utils.h"
+#include "wolfkeymgr/mod_socket.h"
 
 
 /* wolfssl headers */
diff --git a/wolfkeymgr/options.h b/wolfkeymgr/options.h
@@ -0,0 +1,29 @@
+/* wolf key manager options.h
+ * generated from configure options
+ *
+ * Copyright (C) 2006-2021 wolfSSL Inc.
+ *
+ */
+
+#ifndef WOLFKM_OPTIONS_H
+#define WOLFKM_OPTIONS_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef  SIZEOF_LONG
+#define SIZEOF_LONG 8
+
+#undef  WOLFKM_ETSI_SERVICE
+#define WOLFKM_ETSI_SERVICE
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* WOLFKM_OPTIONS_H */
+
diff --git a/wolfkeymgr/options.h.in b/wolfkeymgr/options.h.in
diff --git a/wolfkeymgr/sock_mgr.h b/wolfkeymgr/sock_mgr.h
@@ -34,7 +34,7 @@
 #include <event2/buffer.h>
 #include <event2/dns.h>
 
-#include "wkm_types.h"
+#include "wolfkeymgr/wkm_types.h"
 
 /* wolfssl headers */
 #include <wolfssl/options.h>
diff --git a/wolfkeymgr/svc_etsi.h b/wolfkeymgr/svc_etsi.h
diff --git a/wolfkeymgr/version.h b/wolfkeymgr/version.h
diff --git a/wolfkeymgr/version.h.in b/wolfkeymgr/version.h.in
diff --git a/wolfkeymgr/visibility.h b/wolfkeymgr/visibility.h
diff --git a/wolfkeymgr/wkm_types.h b/wolfkeymgr/wkm_types.h
@@ -22,8 +22,10 @@
 #ifndef WOLFKM_TYPES_H
 #define WOLFKM_TYPES_H
 
-#include "config.h"
-#include "visibility.h"
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+#include "wolfkeymgr/visibility.h"
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/wolfkeymgr/wkm_utils.h b/wolfkeymgr/wkm_utils.h
@@ -22,7 +22,7 @@
 #ifndef WOLFKM_UTILS_H
 #define WOLFKM_UTILS_H
 
-#include "wkm_types.h"
+#include "wolfkeymgr/wkm_types.h"
 
 
 #ifdef __GNUC__
