Move debug and library code into the common/ subdirectory

Start using p11_ as our internal prefix rather than _p11_. We explicitly
export p11_kit_ so this is fine as far as visibility.

Move the threading, mutex, and module compat, dict, and array code
into the common directory too.

Take this opportunity to clean up a bit of internal API as well,
since so many lines are being touched internally.

23 files changed, 141 insertions, 0 deletions

diff --git a/p11-kit/tests/files/system-modules/four.module b/p11-kit/tests/files/system-modules/four.module
new file mode 100644
index 0000000..6eace3c
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/four.module
@@ -0,0 +1,3 @@
+
+module: mock-four.so
+disable-in: test-disable, test-other
diff --git a/p11-kit/tests/files/system-modules/one.module b/p11-kit/tests/files/system-modules/one.module
new file mode 100644
index 0000000..3620869
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/one.module
@@ -0,0 +1,3 @@
+
+module: mock-one.so
+setting: system1
\ No newline at end of file
diff --git a/p11-kit/tests/files/system-modules/two-duplicate.module b/p11-kit/tests/files/system-modules/two-duplicate.module
new file mode 100644
index 0000000..907aa75
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/two-duplicate.module
@@ -0,0 +1,3 @@
+
+# This is a duplicate of the 'two' module
+module: mock-two.so
diff --git a/p11-kit/tests/files/system-modules/two.badname b/p11-kit/tests/files/system-modules/two.badname
new file mode 100644
index 0000000..0d41cac
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/two.badname
@@ -0,0 +1,5 @@
+# This module doesn't have a .module extension, but p11-kit doesn't yet
+# enforce the naming, just warns, so it should still be loaded
+
+module: mock-two.so
+setting: system2
diff --git a/p11-kit/tests/files/system-modules/win32/four.module b/p11-kit/tests/files/system-modules/win32/four.module
new file mode 100644
index 0000000..7fd1540
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/win32/four.module
@@ -0,0 +1,3 @@
+
+module: mock-four.dll
+disable-in: test-disable, test-other
diff --git a/p11-kit/tests/files/system-modules/win32/one.module b/p11-kit/tests/files/system-modules/win32/one.module
new file mode 100644
index 0000000..5f80304
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/win32/one.module
@@ -0,0 +1,3 @@
+
+module: mock-one.dll
+setting: system1
\ No newline at end of file
diff --git a/p11-kit/tests/files/system-modules/win32/two-duplicate.module b/p11-kit/tests/files/system-modules/win32/two-duplicate.module
new file mode 100644
index 0000000..e80c9e8
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/win32/two-duplicate.module
@@ -0,0 +1,3 @@
+
+# This is a duplicate of the 'two' module
+module: mock-two.dll
diff --git a/p11-kit/tests/files/system-modules/win32/two.badname b/p11-kit/tests/files/system-modules/win32/two.badname
new file mode 100644
index 0000000..ae44b83
--- /dev/null
+++ b/p11-kit/tests/files/system-modules/win32/two.badname
@@ -0,0 +1,5 @@
+# This module doesn't have a .module extension, but p11-kit doesn't yet
+# enforce the naming, just warns, so it should still be loaded
+
+module: mock-two.dll
+setting: system2
diff --git a/p11-kit/tests/files/system-pkcs11.conf b/p11-kit/tests/files/system-pkcs11.conf
new file mode 100644
index 0000000..20741e7
--- /dev/null
+++ b/p11-kit/tests/files/system-pkcs11.conf
@@ -0,0 +1,3 @@
+
+# Merge in user config
+user-config: merge
\ No newline at end of file
diff --git a/p11-kit/tests/files/test-1.conf b/p11-kit/tests/files/test-1.conf
new file mode 100644
index 0000000..d4ae0a1
--- /dev/null
+++ b/p11-kit/tests/files/test-1.conf
@@ -0,0 +1,6 @@
+key1:value1
+with-whitespace : value-with-whitespace
+with-colon: value-of-colon
+
+# A comment
+embedded-comment: this is # not a comment
diff --git a/p11-kit/tests/files/test-pinfile b/p11-kit/tests/files/test-pinfile
new file mode 100644
index 0000000..f646f3d
--- /dev/null
+++ b/p11-kit/tests/files/test-pinfile
@@ -0,0 +1 @@
+yogabbagabba
\ No newline at end of file
diff --git a/p11-kit/tests/files/test-pinfile-large b/p11-kit/tests/files/test-pinfile-large
new file mode 100644
index 0000000..506668d
--- /dev/null
+++ b/p11-kit/tests/files/test-pinfile-large
@@ -0,0 +1,53 @@
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba
+yogabbagabba yogabbagabba yogabbagabba yo
\ No newline at end of file
diff --git a/p11-kit/tests/files/test-system-invalid.conf b/p11-kit/tests/files/test-system-invalid.conf
new file mode 100644
index 0000000..344ee96
--- /dev/null
+++ b/p11-kit/tests/files/test-system-invalid.conf
@@ -0,0 +1,3 @@
+
+# Invalid user-config setting
+user-config: bad
diff --git a/p11-kit/tests/files/test-system-merge.conf b/p11-kit/tests/files/test-system-merge.conf
new file mode 100644
index 0000000..978427d
--- /dev/null
+++ b/p11-kit/tests/files/test-system-merge.conf
@@ -0,0 +1,7 @@
+
+# Merge in user config
+user-config: merge
+
+key1: system1
+key2: system2
+key3: system3
\ No newline at end of file
diff --git a/p11-kit/tests/files/test-system-none.conf b/p11-kit/tests/files/test-system-none.conf
new file mode 100644
index 0000000..95351e6
--- /dev/null
+++ b/p11-kit/tests/files/test-system-none.conf
@@ -0,0 +1,8 @@
+
+# Only user config
+user-config: none
+
+# These values will not be overriden
+key1: system1
+key2: system2
+key3: system3
\ No newline at end of file
diff --git a/p11-kit/tests/files/test-system-only.conf b/p11-kit/tests/files/test-system-only.conf
new file mode 100644
index 0000000..589f1c7
--- /dev/null
+++ b/p11-kit/tests/files/test-system-only.conf
@@ -0,0 +1,8 @@
+
+# Only user config
+user-config: only
+
+# This stuff will be ignored
+key1: system1
+key2: system2
+key3: system3
\ No newline at end of file
diff --git a/p11-kit/tests/files/test-user-invalid.conf b/p11-kit/tests/files/test-user-invalid.conf
new file mode 100644
index 0000000..344ee96
--- /dev/null
+++ b/p11-kit/tests/files/test-user-invalid.conf
@@ -0,0 +1,3 @@
+
+# Invalid user-config setting
+user-config: bad
diff --git a/p11-kit/tests/files/test-user-only.conf b/p11-kit/tests/files/test-user-only.conf
new file mode 100644
index 0000000..3224c01
--- /dev/null
+++ b/p11-kit/tests/files/test-user-only.conf
@@ -0,0 +1,4 @@
+
+user-config: only
+key2: user2
+key3: user3
\ No newline at end of file
diff --git a/p11-kit/tests/files/test-user.conf b/p11-kit/tests/files/test-user.conf
new file mode 100644
index 0000000..369544a
--- /dev/null
+++ b/p11-kit/tests/files/test-user.conf
@@ -0,0 +1,3 @@
+
+key2: user2
+key3: user3
\ No newline at end of file
diff --git a/p11-kit/tests/files/user-modules/one.module b/p11-kit/tests/files/user-modules/one.module
new file mode 100644
index 0000000..c371e4a
--- /dev/null
+++ b/p11-kit/tests/files/user-modules/one.module
@@ -0,0 +1,2 @@
+
+setting: user1
\ No newline at end of file
diff --git a/p11-kit/tests/files/user-modules/three.module b/p11-kit/tests/files/user-modules/three.module
new file mode 100644
index 0000000..00caab5
--- /dev/null
+++ b/p11-kit/tests/files/user-modules/three.module
@@ -0,0 +1,5 @@
+
+module: mock-three.so
+setting: user3
+
+enable-in: test-enable
\ No newline at end of file
diff --git a/p11-kit/tests/files/user-modules/win32/one.module b/p11-kit/tests/files/user-modules/win32/one.module
new file mode 100644
index 0000000..c371e4a
--- /dev/null
+++ b/p11-kit/tests/files/user-modules/win32/one.module
@@ -0,0 +1,2 @@
+
+setting: user1
\ No newline at end of file
diff --git a/p11-kit/tests/files/user-modules/win32/three.module b/p11-kit/tests/files/user-modules/win32/three.module
new file mode 100644
index 0000000..58f883d
--- /dev/null
+++ b/p11-kit/tests/files/user-modules/win32/three.module
@@ -0,0 +1,5 @@
+
+module: mock-three.dll
+setting: user3
+
+enable-in: test-enable
\ No newline at end of file