From 96135824d4b8da8a6e977d4e01bf57321be0250a Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Tue, 20 Jan 2009 00:37:59 +0000 Subject: [PATCH] Release version 2.25.5 * egg/Makefile.am: * egg/tests/test.asn: * egg/tests/unit-test-secmem.c: * egg/tests/unit-test-symkey.c: * egg/tests/test-data/test-certificate-1.der: (added) * egg/tests/test-data/pem-rsa-enc.key: (added) * gcr/Makefile.am: * pkcs11/roots-sotre/gck-roots-module.c: * configure.in: * NEWS: Release version 2.25.5 svn path=/trunk/; revision=1467 --- egg/Makefile.am | 10 +++++++--- egg/tests/test-data/pem-rsa-enc.key | 18 ++++++++++++++++++ egg/tests/test-data/test-certificate-1.der | Bin 0 -> 813 bytes egg/tests/test.asn | 3 +-- egg/tests/unit-test-secmem.c | 4 ++-- egg/tests/unit-test-symkey.c | 6 ++++++ gcr/Makefile.am | 4 +++- 7 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 egg/tests/test-data/pem-rsa-enc.key create mode 100644 egg/tests/test-data/test-certificate-1.der diff --git a/egg/Makefile.am b/egg/Makefile.am index 3fa1e19..ca3637b 100644 --- a/egg/Makefile.am +++ b/egg/Makefile.am @@ -23,18 +23,22 @@ libegg_la_SOURCES = \ egg-openssl.c egg-openssl.h \ egg-unix-credentials.c egg-unix-credentials.h \ egg-secure-memory.c egg-secure-memory.h \ - egg-symkey.c egg-symkey.h + egg-symkey.c egg-symkey.h \ + $(BUILT_SOURCES) asn1-def-pk.h: pk.asn - asn1Parser -o asn1-def-pk.h pk.asn + asn1Parser -o asn1-def-pk.h $(srcdir)/pk.asn asn1-def-pkix.h: pkix.asn - asn1Parser -o asn1-def-pkix.h pkix.asn + asn1Parser -o asn1-def-pkix.h $(srcdir)/pkix.asn EXTRA_DIST = \ pkix.asn \ pk.asn +DISTCLEANFILES = \ + $(BUILT_SOURCES) + # -------------------------------------------------------------------- # COMMON STUFF COMPILED INTO SMALLER COMPONENTS diff --git a/egg/tests/test-data/pem-rsa-enc.key b/egg/tests/test-data/pem-rsa-enc.key new file mode 100644 index 0000000..65439fe --- /dev/null +++ b/egg/tests/test-data/pem-rsa-enc.key @@ -0,0 +1,18 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: DES-EDE3-CBC,24522D4CE5F5CD7B + +2H/8j0HYUya7LWEUxpgjp/LVcCX7yZB7SoREdoJdcqJEBUMWVxU/2OfVB8EZupmy +7YHcnn5v1JwwtmAXAtqM9JGlvNWaRr1m4zDrhJn1fY3tu8YGtMR49IOZmOUBK+X+ +IxWAwaFDqLntuGZZnAmRJtgFVYVABEs5yM9zgoCGDaU4WMK3caD7Jnw8jH5m0nqQ +XiQ1y1dHxFJmAgG0b5h2z7zjQTmmXd3IhXqSqsE/9ryruCCYa0Z7aAN5oAmO89I9 +gOyy3J4h76mTNFfF5btV4Jllwd4LkgGOmm69UxAyUTGzwYJ5gxgB3xFzGBwpVlcu +72PrQCrjZqZ6rj6cTPGUYzcyMtEw3Xd6mFhApqJpVRZwNWUAMMJwHl2oWwKcIxfV +y+OftRX6kc+cunrxCkl9aKuHDoJPEq+/Uh+AEXqir+942Vull0WPyuWUjaPKR1xJ +poYsNfHRWq+klKCggQQL6jwuVbDLhbaXfgaNBQO1XMracgfmnO1PQPw8JSQ5iOkm +Ybt2oHAEnrEWxZGn1PfRq6Z8HAbBlQpfmG7SMJZdQjlndKA6GR+tN5krKfpj6uak +0eklm0Nb0YcDzJ3qqHXxIimK3Kh/WRZ1hVTnX4mS9u3HNQMo5Ov6z8OQN+Q45ffi +ZDFkVwUTEJ+iwmCG7XnxX0v8Bv5LZmAnPu95KQTp4Ds0AZ6Sp+RqxvhnCO25cgWj ++N5jHGzsDk9/Jw7rAHz8pnl3sziNBWdAk5ASPA28HCQQo5peWnWajM3Pk98+/wHY +blTh7gw77gTake6hpiegnhNUXwGm6BXEqmyu7mPW0z5XFRb9W7bpog== +-----END RSA PRIVATE KEY----- diff --git a/egg/tests/test-data/test-certificate-1.der b/egg/tests/test-data/test-certificate-1.der new file mode 100644 index 0000000000000000000000000000000000000000..1c084370b604d59e6f075bbba5a4075826fe705d GIT binary patch literal 813 zcmXqLV%9WhVw$vonTe5!iIKs8myJ`a&76mZp|b!_dc#^O0kfk(GhDu@@M#olK353@6iW{$O`G zzq3d0!@~E%t~spt@2QIgnmG#QZ nPmLmjZkK8VMDqOLmVC12=K5*9`T@7u55JOMZT#S?wqYj#OJ5H| literal 0 HcmV?d00001 diff --git a/egg/tests/test.asn b/egg/tests/test.asn index 0fdf483..0a9c7d1 100644 --- a/egg/tests/test.asn +++ b/egg/tests/test.asn @@ -7,8 +7,7 @@ BEGIN TestIntegers ::= SEQUENCE { uint1 INTEGER, uint2 INTEGER, - uint3 INTEGER, - mpi INTEGER + uint3 INTEGER } TestData ::= SEQUENCE { diff --git a/egg/tests/unit-test-secmem.c b/egg/tests/unit-test-secmem.c index a75b897..c5f1df0 100644 --- a/egg/tests/unit-test-secmem.c +++ b/egg/tests/unit-test-secmem.c @@ -42,7 +42,7 @@ * Tests be run in the order specified here. */ -#define IS_ZERO ~0 +#define IS_ZERO ((gsize)~0) static gsize find_non_zero (gpointer mem, gsize len) @@ -128,7 +128,7 @@ DEFINE_TEST(secmem_realloc) strcpy ((gchar*)p, str); p2 = egg_secure_realloc_full (p, 512, 0); - g_assert (p2 == NULL); + g_assert (p2 != NULL); g_assert_cmpint (IS_ZERO, ==, find_non_zero (((gchar*)p2) + len, 512 - len)); g_assert (strcmp (p2, str) == 0); diff --git a/egg/tests/unit-test-symkey.c b/egg/tests/unit-test-symkey.c index e09729c..51d7ac7 100644 --- a/egg/tests/unit-test-symkey.c +++ b/egg/tests/unit-test-symkey.c @@ -27,6 +27,7 @@ #include "run-auto-test.h" +#include "egg-secure-memory.h" #include "egg-symkey.h" #include @@ -34,6 +35,11 @@ DEFINE_SETUP(crypto_setup) { gcry_check_version (LIBGCRYPT_VERSION); + gcry_set_allocation_handler ((gcry_handler_alloc_t)g_malloc, + (gcry_handler_alloc_t)egg_secure_alloc, + egg_secure_check, + (gcry_handler_realloc_t)egg_secure_realloc, + egg_secure_free); } DEFINE_TEARDOWN(crypto_setup) diff --git a/gcr/Makefile.am b/gcr/Makefile.am index c257d9c..b1cef7d 100644 --- a/gcr/Makefile.am +++ b/gcr/Makefile.am @@ -43,7 +43,8 @@ pkgconfig_DATA = gcr-$(GCR_MAJOR).pc EXTRA_DIST = \ gcr.pc.in \ - gcr-marshal.list + gcr-marshal.list \ + gcr-import-dialog.glade DISTCLEANFILES = \ gcr-$(GCR_MAJOR).pc @@ -59,3 +60,4 @@ endif SUBDIRS = . \ $(TESTS_DIR) + -- 2.7.4