From 9cfb3fbc22f3e79ec16a037e2c3140cd9c7c634c Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Wed, 13 Jul 2016 10:52:41 -0400
Subject: Add "cryptech" to public "pkcs11" names.

Database location environment variable is now CRYPTECH_PKCS11_DATABASE.
Installed library is now libcryptech-pkcs11.{so,dylib}.
---
 Makefile      | 4 ++--
 pkcs11.c      | 2 +-
 unit_tests.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a275e3d..06cb61c 100644
--- a/Makefile
+++ b/Makefile
@@ -95,11 +95,11 @@ LIBS	:= ${LIBHAL_BLD}/libhal.a ${LIBTFM_BLD}/libtfm.a
 LIBHAL_TARGET := serial
 
 ifeq "${UNAME}" "Darwin"
-  SONAME  := libpkcs11.dylib
+  SONAME  := libcryptech-pkcs11.dylib
   SOFLAGS := -dynamiclib
 # LIBHAL_TARGET := serial
 else
-  SONAME  := libpkcs11.so
+  SONAME  := libcryptech-pkcs11.so
   SOFLAGS := -Wl,-Bsymbolic-functions -Wl,-Bsymbolic -Wl,-z,noexecstack -Wl,-soname,${SONAME}.0
 # LIBHAL_TARGET := daemon
 endif
diff --git a/pkcs11.c b/pkcs11.c
index b344648..5666e5e 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -479,7 +479,7 @@ static int sql_init(void)
 
   assert(sqldb == NULL);
 
-  const char * const env  = getenv("PKCS11_DATABASE");
+  const char * const env  = getenv("CRYPTECH_PKCS11_DATABASE");
   const char * const home = getenv("HOME");
   const char * const base = SQL_DATABASE;
   int ok;
diff --git a/unit_tests.py b/unit_tests.py
index a036a32..fb8446f 100644
--- a/unit_tests.py
+++ b/unit_tests.py
@@ -21,9 +21,9 @@ except ImportError:
 
 
 if platform.system() == "Darwin":
-    libpkcs11_default = "./libpkcs11.dylib"
+    libpkcs11_default = "./libcryptech-pkcs11.dylib"
 else:
-    libpkcs11_default = "./libpkcs11.so"
+    libpkcs11_default = "./libcryptech-pkcs11.so"
 
 
 def log(msg):
-- 
cgit v1.2.3