summaryrefslogtreecommitdiff
path: root/p11-kit
diff options
context:
space:
mode:
Diffstat (limited to 'p11-kit')
-rw-r--r--p11-kit/Makefile.am2
-rw-r--r--p11-kit/conf.c2
-rw-r--r--p11-kit/modules.c1
-rw-r--r--p11-kit/pin.c1
-rw-r--r--p11-kit/proxy.c1
-rw-r--r--p11-kit/tests/Makefile.am6
-rw-r--r--p11-kit/tests/conf-test.c31
-rw-r--r--p11-kit/tests/test-iter.c1
-rw-r--r--p11-kit/tests/test-modules.c1
-rw-r--r--p11-kit/tests/uri-test.c5
-rw-r--r--p11-kit/uri.c2
-rw-r--r--p11-kit/util.c1
12 files changed, 29 insertions, 25 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 1967403..1ab3b3d 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -55,7 +55,7 @@ libp11_kit_la_SOURCES = $(MODULE_SRCS)
libp11_kit_la_LIBADD = \
$(LTLIBINTL) \
- $(top_builddir)/common/libp11-compat.la \
+ $(top_builddir)/common/libp11-common.la \
$(top_builddir)/common/libp11-library.la \
$(NULL)
diff --git a/p11-kit/conf.c b/p11-kit/conf.c
index 2cd5481..c3eb05e 100644
--- a/p11-kit/conf.c
+++ b/p11-kit/conf.c
@@ -41,7 +41,7 @@
#define P11_DEBUG_FLAG P11_DEBUG_CONF
#include "debug.h"
#include "lexer.h"
-#include "library.h"
+#include "message.h"
#include "private.h"
#include <sys/param.h>
diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index 7648167..18400bb 100644
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -40,6 +40,7 @@
#include "debug.h"
#include "dict.h"
#include "library.h"
+#include "message.h"
#include "pkcs11.h"
#include "p11-kit.h"
#include "private.h"
diff --git a/p11-kit/pin.c b/p11-kit/pin.c
index dac635c..b64b737 100644
--- a/p11-kit/pin.c
+++ b/p11-kit/pin.c
@@ -38,6 +38,7 @@
#include "debug.h"
#include "dict.h"
#include "library.h"
+#include "message.h"
#include "pkcs11.h"
#include "p11-kit.h"
#include "pin.h"
diff --git a/p11-kit/proxy.c b/p11-kit/proxy.c
index 35f0c82..1908d34 100644
--- a/p11-kit/proxy.c
+++ b/p11-kit/proxy.c
@@ -39,6 +39,7 @@
#include "debug.h"
#include "dict.h"
#include "library.h"
+#include "message.h"
#define CRYPTOKI_EXPORTS
#include "pkcs11.h"
#include "p11-kit.h"
diff --git a/p11-kit/tests/Makefile.am b/p11-kit/tests/Makefile.am
index bc96bf4..c7b87ae 100644
--- a/p11-kit/tests/Makefile.am
+++ b/p11-kit/tests/Makefile.am
@@ -12,8 +12,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/p11-kit/libp11-kit-testable.la \
$(top_builddir)/common/libp11-mock.la \
- $(top_builddir)/common/libp11-library.la \
- $(top_builddir)/common/libp11-compat.la \
+ $(top_builddir)/common/libp11-common.la \
$(CUTEST_LIBS) \
$(LTLIBINTL)
@@ -47,8 +46,7 @@ mock_one_la_CFLAGS = \
mock_one_la_LIBADD = \
$(top_builddir)/common/libp11-mock.la \
- $(top_builddir)/common/libp11-library.la \
- $(top_builddir)/common/libp11-compat.la \
+ $(top_builddir)/common/libp11-common.la \
$(NULL)
mock_one_la_LDFLAGS = \
diff --git a/p11-kit/tests/conf-test.c b/p11-kit/tests/conf-test.c
index e74da1b..d259cf8 100644
--- a/p11-kit/tests/conf-test.c
+++ b/p11-kit/tests/conf-test.c
@@ -41,7 +41,8 @@
#include <string.h>
#include "conf.h"
-#include "library.h"
+#include "debug.h"
+#include "message.h"
#include "p11-kit.h"
#include "private.h"
@@ -78,7 +79,7 @@ test_parse_ignore_missing (CuTest *tc)
CuAssertPtrNotNull (tc, map);
CuAssertIntEquals (tc, 0, p11_dict_size (map));
- CuAssertPtrEquals (tc, NULL, (void*)p11_kit_message ());
+ CuAssertPtrEquals (tc, NULL, (void*)p11_message_last ());
p11_dict_free (map);
}
@@ -89,7 +90,7 @@ test_parse_fail_missing (CuTest *tc)
map = _p11_conf_parse_file (SRCDIR "/files/non-existant.conf", 0);
CuAssertPtrEquals (tc, map, NULL);
- CuAssertPtrNotNull (tc, p11_kit_message ());
+ CuAssertPtrNotNull (tc, p11_message_last ());
}
static void
@@ -131,7 +132,7 @@ test_load_globals_merge (CuTest *tc)
SRCDIR "/files/test-user.conf",
&user_mode);
CuAssertPtrNotNull (tc, config);
- CuAssertStrEquals (tc, NULL, p11_kit_message ());
+ CuAssertStrEquals (tc, NULL, p11_message_last ());
CuAssertIntEquals (tc, CONF_USER_MERGE, user_mode);
CuAssertStrEquals (tc, p11_dict_get (config, "key1"), "system1");
@@ -153,7 +154,7 @@ test_load_globals_no_user (CuTest *tc)
SRCDIR "/files/test-user.conf",
&user_mode);
CuAssertPtrNotNull (tc, config);
- CuAssertStrEquals (tc, NULL, p11_kit_message ());
+ CuAssertStrEquals (tc, NULL, p11_message_last ());
CuAssertIntEquals (tc, CONF_USER_NONE, user_mode);
CuAssertStrEquals (tc, p11_dict_get (config, "key1"), "system1");
@@ -175,7 +176,7 @@ test_load_globals_user_sets_only (CuTest *tc)
SRCDIR "/files/test-user-only.conf",
&user_mode);
CuAssertPtrNotNull (tc, config);
- CuAssertStrEquals (tc, NULL, p11_kit_message ());
+ CuAssertStrEquals (tc, NULL, p11_message_last ());
CuAssertIntEquals (tc, CONF_USER_ONLY, user_mode);
CuAssertStrEquals (tc, p11_dict_get (config, "key1"), NULL);
@@ -197,7 +198,7 @@ test_load_globals_system_sets_only (CuTest *tc)
SRCDIR "/files/test-user.conf",
&user_mode);
CuAssertPtrNotNull (tc, config);
- CuAssertStrEquals (tc, NULL, p11_kit_message ());
+ CuAssertStrEquals (tc, NULL, p11_message_last ());
CuAssertIntEquals (tc, CONF_USER_ONLY, user_mode);
CuAssertStrEquals (tc, p11_dict_get (config, "key1"), NULL);
@@ -222,7 +223,7 @@ test_load_globals_system_sets_invalid (CuTest *tc)
error = errno;
CuAssertPtrEquals (tc, NULL, config);
CuAssertIntEquals (tc, EINVAL, error);
- CuAssertPtrNotNull (tc, p11_kit_message ());
+ CuAssertPtrNotNull (tc, p11_message_last ());
p11_dict_free (config);
}
@@ -242,7 +243,7 @@ test_load_globals_user_sets_invalid (CuTest *tc)
error = errno;
CuAssertPtrEquals (tc, NULL, config);
CuAssertIntEquals (tc, EINVAL, error);
- CuAssertPtrNotNull (tc, p11_kit_message ());
+ CuAssertPtrNotNull (tc, p11_message_last ());
p11_dict_free (config);
}
@@ -267,7 +268,7 @@ test_load_modules_merge (CuTest *tc)
SRCDIR "/files/system-modules",
SRCDIR "/files/user-modules");
CuAssertPtrNotNull (tc, configs);
- CuAssertTrue (tc, assert_msg_contains (p11_kit_message (), "invalid config filename"));
+ CuAssertTrue (tc, assert_msg_contains (p11_message_last (), "invalid config filename"));
config = p11_dict_get (configs, "one");
CuAssertPtrNotNull (tc, config);
@@ -300,7 +301,7 @@ test_load_modules_user_none (CuTest *tc)
SRCDIR "/files/system-modules",
SRCDIR "/files/user-modules");
CuAssertPtrNotNull (tc, configs);
- CuAssertTrue (tc, assert_msg_contains (p11_kit_message (), "invalid config filename"));
+ CuAssertTrue (tc, assert_msg_contains (p11_message_last (), "invalid config filename"));
config = p11_dict_get (configs, "one");
CuAssertPtrNotNull (tc, config);
@@ -331,7 +332,7 @@ test_load_modules_user_only (CuTest *tc)
SRCDIR "/files/system-modules",
SRCDIR "/files/user-modules");
CuAssertPtrNotNull (tc, configs);
- CuAssertPtrEquals (tc, NULL, (void *)p11_kit_message ());
+ CuAssertPtrEquals (tc, NULL, (void *)p11_message_last ());
config = p11_dict_get (configs, "one");
CuAssertPtrNotNull (tc, config);
@@ -362,7 +363,7 @@ test_load_modules_no_user (CuTest *tc)
SRCDIR "/files/system-modules",
SRCDIR "/files/non-existant");
CuAssertPtrNotNull (tc, configs);
- CuAssertTrue (tc, assert_msg_contains (p11_kit_message (), "invalid config filename"));
+ CuAssertTrue (tc, assert_msg_contains (p11_message_last (), "invalid config filename"));
config = p11_dict_get (configs, "one");
CuAssertPtrNotNull (tc, config);
@@ -398,7 +399,7 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
- p11_library_init ();
+ p11_debug_init ();
SUITE_ADD_TEST (suite, test_parse_conf_1);
SUITE_ADD_TEST (suite, test_parse_ignore_missing);
@@ -416,8 +417,6 @@ main (void)
SUITE_ADD_TEST (suite, test_load_modules_user_none);
SUITE_ADD_TEST (suite, test_parse_boolean);
- p11_kit_be_quiet ();
-
CuSuiteRun (suite);
CuSuiteSummary (suite, output);
CuSuiteDetails (suite, output);
diff --git a/p11-kit/tests/test-iter.c b/p11-kit/tests/test-iter.c
index ccfce2c..08e43b3 100644
--- a/p11-kit/tests/test-iter.c
+++ b/p11-kit/tests/test-iter.c
@@ -40,6 +40,7 @@
#include "attrs.h"
#include "iter.h"
#include "library.h"
+#include "message.h"
#include "mock.h"
#include <assert.h>
diff --git a/p11-kit/tests/test-modules.c b/p11-kit/tests/test-modules.c
index 3f0e4e0..3a6e968 100644
--- a/p11-kit/tests/test-modules.c
+++ b/p11-kit/tests/test-modules.c
@@ -40,6 +40,7 @@
#include <stdio.h>
#include <string.h>
+#include "debug.h"
#include "library.h"
#include "p11-kit.h"
#include "private.h"
diff --git a/p11-kit/tests/uri-test.c b/p11-kit/tests/uri-test.c
index 18ee706..2bc121c 100644
--- a/p11-kit/tests/uri-test.c
+++ b/p11-kit/tests/uri-test.c
@@ -35,7 +35,8 @@
#include "config.h"
#include "CuTest.h"
-#include "library.h"
+#include "debug.h"
+#include "message.h"
#include <assert.h>
#include <string.h>
@@ -1203,7 +1204,7 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
- p11_library_init ();
+ p11_debug_init ();
SUITE_ADD_TEST (suite, test_uri_parse);
SUITE_ADD_TEST (suite, test_uri_parse_bad_scheme);
diff --git a/p11-kit/uri.c b/p11-kit/uri.c
index 52bd61d..a811b92 100644
--- a/p11-kit/uri.c
+++ b/p11-kit/uri.c
@@ -38,7 +38,7 @@
#include "buffer.h"
#define P11_DEBUG_FLAG P11_DEBUG_URI
#include "debug.h"
-#include "library.h"
+#include "message.h"
#include "pkcs11.h"
#include "private.h"
#include "p11-kit.h"
diff --git a/p11-kit/util.c b/p11-kit/util.c
index bb074ac..c4e5636 100644
--- a/p11-kit/util.c
+++ b/p11-kit/util.c
@@ -41,6 +41,7 @@
#define P11_DEBUG_FLAG P11_DEBUG_LIB
#include "debug.h"
#include "library.h"
+#include "message.h"
#include "p11-kit.h"
#include "private.h"
generated by cgit v1.1 at 2024-10-06 22:40:56 +0000