[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-138-g7e7e802
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-138-g7e7e802 |
|
Date: |
Tue, 31 Jan 2012 00:02:32 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=7e7e8029a2ec9650a1020442907bb81fd31f98e3
The branch, master has been updated
via 7e7e8029a2ec9650a1020442907bb81fd31f98e3 (commit)
via f1e5862f7d9f0e8f63a48e6e0c6043591468eb1e (commit)
via 9ae30978a7ff2da4e802e007d703870a57244ccb (commit)
via 8dc5eef6b6ebe475af85a2be64e9940e32fd6020 (commit)
via 0a31892a4d1e47b53849348a317bb042560a81f0 (commit)
from c0bd56a1d9bc395d91c407983448d444fc573aed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e7e8029a2ec9650a1020442907bb81fd31f98e3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Jan 31 01:06:39 2012 +0100
No need for .def.in files.
The @VERSION@ is now being replaced on dist-hook.
Also corrected the dist-hook for ChangeLog.
commit f1e5862f7d9f0e8f63a48e6e0c6043591468eb1e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Jan 31 00:42:40 2012 +0100
updates
commit 9ae30978a7ff2da4e802e007d703870a57244ccb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Jan 31 00:37:23 2012 +0100
make configure detect valgrind.
This is by creating the suppressions.valgrind file.
commit 8dc5eef6b6ebe475af85a2be64e9940e32fd6020
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Jan 31 00:29:50 2012 +0100
use gnulib's base64 code
commit 0a31892a4d1e47b53849348a317bb042560a81f0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Jan 30 23:39:36 2012 +0100
Added test to ensure we can decode PEM encoded certificates with carriage
returns, spaces and tabs.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 8 -
Makefile.am | 3 +-
configure.ac | 11 +-
doc/Makefile.am | 12 +-
lib/x509_b64.c | 220 +++++----------------
src/{certtool-args.def.in => certtool-args.def} | 0
src/{cli-args.def.in => cli-args.def} | 0
src/{cli-debug-args.def.in => cli-debug-args.def} | 0
src/{ocsptool-args.def.in => ocsptool-args.def} | 0
src/{p11tool-args.def.in => p11tool-args.def} | 0
src/{psk-args.def.in => psk-args.def} | 0
src/{serv-args.def.in => serv-args.def} | 0
src/{srptool-args.def.in => srptool-args.def} | 0
tests/cert-tests/Makefile.am | 7 +-
tests/cert-tests/funny-spacing.pem | 28 +++
tests/cert-tests/{aki => pem-decoding} | 7 +-
16 files changed, 88 insertions(+), 208 deletions(-)
rename src/{certtool-args.def.in => certtool-args.def} (100%)
rename src/{cli-args.def.in => cli-args.def} (100%)
rename src/{cli-debug-args.def.in => cli-debug-args.def} (100%)
rename src/{ocsptool-args.def.in => ocsptool-args.def} (100%)
rename src/{p11tool-args.def.in => p11tool-args.def} (100%)
rename src/{psk-args.def.in => psk-args.def} (100%)
rename src/{serv-args.def.in => serv-args.def} (100%)
rename src/{srptool-args.def.in => srptool-args.def} (100%)
create mode 100644 tests/cert-tests/funny-spacing.pem
copy tests/cert-tests/{aki => pem-decoding} (87%)
diff --git a/.gitignore b/.gitignore
index 023d8eb..291a285 100644
--- a/.gitignore
+++ b/.gitignore
@@ -448,7 +448,6 @@ src/benchmark-cipher
src/benchmark-tls
src/certtool
src/certtool-args.c
-src/certtool-args.def
src/certtool-args.h
src/cfg/Makefile
src/cfg/Makefile.in
@@ -457,10 +456,8 @@ src/cfg/platon/Makefile.in
src/cfg/platon/str/Makefile
src/cfg/platon/str/Makefile.in
src/cli-args.c
-src/cli-args.def
src/cli-args.h
src/cli-debug-args.c
-src/cli-debug-args.def
src/cli-debug-args.h
src/crywrap/crywrap
src/gaa.skel
@@ -478,24 +475,19 @@ src/libcmd-serv.la
src/libcmd-srp.la
src/ocsptool
src/ocsptool-args.c
-src/ocsptool-args.def
src/ocsptool-args.h
src/ocsptool-gaa.c
src/ocsptool-gaa.h
src/p11tool
src/p11tool-args.c
-src/p11tool-args.def
src/p11tool-args.h
src/psk-args.c
-src/psk-args.def
src/psk-args.h
src/psktool
src/serv-args.c
-src/serv-args.def
src/serv-args.h
src/srptool
src/srptool-args.c
-src/srptool-args.def
src/srptool-args.h
stamp-h1
tags
diff --git a/Makefile.am b/Makefile.am
index ef072d7..ed8cc04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,4 +40,5 @@ EXTRA_DIST = cfg.mk maint.mk .clcopying
dist-hook:
rm -f ChangeLog
make ChangeLog
- make -C doc/manpages doit
+ cp -f ChangeLog $(distdir)/
+ sed 's/address@hidden@/$(VERSION)/g' -i $(distdir)/src/*.def
diff --git a/configure.ac b/configure.ac
index 42a84d4..37f5458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ AC_SUBST(MINOR_VERSION, `echo $PACKAGE_VERSION | sed
's/.*\.\(.*\)\..*/\1/g'`)
AC_SUBST(PATCH_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\..*\.\(.*\)/\1/g'`)
AC_SUBST(NUMBER_VERSION, `printf "0x%02x%02x%02x" $MAJOR_VERSION
$MINOR_VERSION $PATCH_VERSION`)
+touch suppressions.valgrind
dnl C and C++ capabilities
AC_C_INLINE
AC_HEADER_STDC
@@ -404,7 +405,7 @@ libidn=no
fi
AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$libidn" != "xno")
-
+rm -f suppressions.valgrind
dnl end of crywrap requirements
AC_CONFIG_FILES([guile/pre-inst-guile], [chmod +x guile/pre-inst-guile])
@@ -448,15 +449,7 @@ AC_CONFIG_FILES([
lib/x509/Makefile
po/Makefile.in
src/Makefile
- src/certtool-args.def
- src/cli-args.def
- src/cli-debug-args.def
src/crywrap/Makefile
- src/ocsptool-args.def
- src/p11tool-args.def
- src/psk-args.def
- src/serv-args.def
- src/srptool-args.def
tests/Makefile
tests/cert-tests/Makefile
tests/dsa/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index edf45a3..392da65 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -47,8 +47,8 @@ invoke-certtool.texi: ../src/certtool-args.def
invoke-srptool.texi: ../src/srptool-args.def
cd ../src/ && autogen -Tagtexi-cmd.tpl $<
mv ../src/$@ .
- sed -i 's/@subsection/@subsubsection/' $@
- sed -i 's/@section/@subsection/' $@
+ sed -i 's/@subsection/@subsubsection/g' $@
+ sed -i 's/@section/@subsection/g' $@
invoke-ocsptool.texi: ../src/ocsptool-args.def
cd ../src/ && autogen -Tagtexi-cmd.tpl $<
@@ -57,14 +57,14 @@ invoke-ocsptool.texi: ../src/ocsptool-args.def
invoke-psktool.texi: ../src/psk-args.def
cd ../src/ && autogen -Tagtexi-cmd.tpl $<
mv ../src/$@ .
- sed -i 's/@subsection/@subsubsection/' $@
- sed -i 's/@section/@subsection/' $@
+ sed -i 's/@subsection/@subsubsection/g' $@
+ sed -i 's/@section/@subsection/g' $@
invoke-p11tool.texi: ../src/p11tool-args.def
cd ../src/ && autogen -Tagtexi-cmd.tpl $<
mv ../src/$@ .
- sed -i 's/@subsection/@subsubsection/' $@
- sed -i 's/@section/@subsection/' $@
+ sed -i 's/@subsection/@subsubsection/g' $@
+ sed -i 's/@section/@subsection/g' $@
info_TEXINFOS = gnutls.texi gnutls-guile.texi
gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi \
diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index 00379c1..6cb10c6 100644
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -27,122 +27,12 @@
#include "gnutls_errors.h"
#include <gnutls_datum.h>
#include <x509_b64.h>
+#include <base64.h>
-/* FIXME: rewrite this to use GNULIB's base64 implementation.
- */
-
-static const uint8_t b64table[] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static const uint8_t asciitable[128] = {
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
- 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
- 0x3a, 0x3b, 0x3c, 0x3d, 0xff, 0xff,
- 0xff, 0xf1, 0xff, 0xff, 0xff, 0x00, /* 0xf1 for '=' */
- 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
- 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
- 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
- 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
- 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e,
- 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24,
- 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
- 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
- 0x31, 0x32, 0x33, 0xff, 0xff, 0xff,
- 0xff, 0xff
-};
-
-inline static int
-encode (char *result, const uint8_t * data, int left)
-{
-
- int data_len;
-
- if (left > 3)
- data_len = 3;
- else
- data_len = left;
-
- switch (data_len)
- {
- case 3:
- result[0] = b64table[(data[0] >> 2)];
- result[1] =
- b64table[(((((data[0] & 0x03) & 0xff) << 4) & 0xff) |
- (data[1] >> 4))];
- result[2] =
- b64table[((((data[1] & 0x0f) << 2) & 0xff) | (data[2] >> 6))];
- result[3] = b64table[(((data[2] << 2) & 0xff) >> 2)];
- break;
- case 2:
- result[0] = b64table[(data[0] >> 2)];
- result[1] =
- b64table[(((((data[0] & 0x03) & 0xff) << 4) & 0xff) |
- (data[1] >> 4))];
- result[2] = b64table[(((data[1] << 4) & 0xff) >> 2)];
- result[3] = '=';
- break;
- case 1:
- result[0] = b64table[(data[0] >> 2)];
- result[1] = b64table[(((((data[0] & 0x03) & 0xff) << 4) & 0xff))];
- result[2] = '=';
- result[3] = '=';
- break;
- default:
- return -1;
- }
-
- return 4;
-
-}
-
-/* data must be 4 bytes
- * result should be 3 bytes
- */
-#define TOASCII(c) (c < 127 ? asciitable[c] : 0xff)
-inline static int
-decode (uint8_t * result, const uint8_t * data)
-{
- uint8_t a1, a2;
- int ret = 3;
-
- a1 = TOASCII (data[0]);
- a2 = TOASCII (data[1]);
- if (a1 == 0xff || a2 == 0xff)
- return -1;
- result[0] = ((a1 << 2) & 0xff) | ((a2 >> 4) & 0xff);
-
- a1 = a2;
- a2 = TOASCII (data[2]);
- if (a2 == 0xff)
- return -1;
- result[1] = ((a1 << 4) & 0xff) | ((a2 >> 2) & 0xff);
-
- a1 = a2;
- a2 = TOASCII (data[3]);
- if (a2 == 0xff)
- return -1;
- result[2] = ((a1 << 6) & 0xff) | (a2 & 0xff);
-
- if (data[2] == '=')
- ret--;
-
- if (data[3] == '=')
- ret--;
- return ret;
-}
-
-#define INCR(what, size) \
+#define INCR(what, size, max_len) \
do { \
what+=size; \
- if (what > ret) { \
+ if (what > max_len) { \
gnutls_assert(); \
gnutls_free( (*result)); *result = NULL; \
return GNUTLS_E_INTERNAL_ERROR; \
@@ -156,13 +46,14 @@ int
_gnutls_fbase64_encode (const char *msg, const uint8_t * data,
size_t data_size, uint8_t ** result)
{
- int ret, tmp;
- unsigned int i, j;
- char tmpres[4];
+ int tmp;
+ unsigned int i;
+ char tmpres[66];
uint8_t *ptr;
char top[80];
char bottom[80];
- int pos, bytes, top_len, bottom_len;
+ size_t size, max, bytes;
+ int pos, top_len, bottom_len;
if (msg == NULL || strlen(msg) > 50)
{
@@ -172,18 +63,18 @@ _gnutls_fbase64_encode (const char *msg, const uint8_t *
data,
_gnutls_str_cpy (top, sizeof(top), "-----BEGIN ");
_gnutls_str_cat (top, sizeof(top), msg);
- _gnutls_str_cat (top, sizeof(top), "-----");
+ _gnutls_str_cat (top, sizeof(top), "-----\n");
- _gnutls_str_cpy (bottom, sizeof(bottom), "\n-----END ");
+ _gnutls_str_cpy (bottom, sizeof(bottom), "-----END ");
_gnutls_str_cat (bottom, sizeof(bottom), msg);
_gnutls_str_cat (bottom, sizeof(bottom), "-----\n");
top_len = strlen (top);
bottom_len = strlen (bottom);
- ret = B64FSIZE (top_len+bottom_len, data_size);
+ max = B64FSIZE (top_len+bottom_len, data_size);
- (*result) = gnutls_calloc (1, ret + 1);
+ (*result) = gnutls_calloc (1, max + 1);
if ((*result) == NULL)
{
gnutls_assert ();
@@ -191,65 +82,37 @@ _gnutls_fbase64_encode (const char *msg, const uint8_t *
data,
}
bytes = pos = 0;
- INCR (bytes, top_len);
+ INCR (bytes, top_len, max);
pos = top_len;
memcpy (*result, top, top_len);
- for (i = j = 0; i < data_size; i += 3, j += 4)
+ for (i = 0; i < data_size; i += 48)
{
+ if (data_size - i < 48)
+ tmp = data_size - i;
+ else
+ tmp = 48;
- tmp = encode (tmpres, &data[i], data_size - i);
- if (tmp == -1)
- {
- gnutls_assert ();
- gnutls_free ((*result));
- *result = NULL;
- return GNUTLS_E_BASE64_ENCODING_ERROR;
- }
+ base64_encode ((void*)&data[i], tmp, tmpres, sizeof(tmpres));
+ size = strlen(tmpres);
- INCR (bytes, 4);
- ptr = &(*result)[j + pos];
+ INCR (bytes, size+1, max);
+ ptr = &(*result)[pos];
- if ((j) % 64 == 0)
- {
- INCR (bytes, 1);
- pos++;
- *ptr++ = '\n';
- }
- *ptr++ = tmpres[0];
+ memcpy(ptr, tmpres, size);
+ ptr += size;
+ *ptr++ = '\n';
- if ((j + 1) % 64 == 0)
- {
- INCR (bytes, 1);
- pos++;
- *ptr++ = '\n';
- }
- *ptr++ = tmpres[1];
-
- if ((j + 2) % 64 == 0)
- {
- INCR (bytes, 1);
- pos++;
- *ptr++ = '\n';
- }
- *ptr++ = tmpres[2];
-
- if ((j + 3) % 64 == 0)
- {
- INCR (bytes, 1);
- pos++;
- *ptr++ = '\n';
- }
- *ptr++ = tmpres[3];
+ pos += size + 1;
}
- INCR (bytes, bottom_len);
+ INCR (bytes, bottom_len, max);
memcpy (&(*result)[bytes - bottom_len], bottom, bottom_len);
(*result)[bytes] = 0;
- return ret + 1;
+ return max + 1;
}
/**
@@ -340,29 +203,36 @@ static int
_gnutls_base64_decode (const uint8_t * data, size_t data_size,
uint8_t ** result)
{
- unsigned int i, j;
- int ret, tmp, est;
- uint8_t tmpres[3];
+ unsigned int i;
+ int pos, tmp, est;
+ uint8_t tmpres[48];
+ size_t tmpres_size, decode_size;
est = ((data_size * 3) / 4) + 1;
(*result) = gnutls_malloc (est);
if ((*result) == NULL)
return GNUTLS_E_MEMORY_ERROR;
- ret = 0;
- for (i = j = 0; i < data_size; i += 4, j += 3)
+ pos = 0;
+ for (i = 0; i < data_size; i += 64)
{
- tmp = decode (tmpres, &data[i]);
- if (tmp < 0)
+ if (data_size - i < 64)
+ decode_size = data_size - i;
+ else
+ decode_size = 64;
+
+ tmpres_size = sizeof(tmpres);
+ tmp = base64_decode ((void*)&data[i], decode_size, (void*)tmpres,
&tmpres_size);
+ if (tmp == 0)
{
gnutls_free (*result);
*result = NULL;
return tmp;
}
- memcpy (&(*result)[j], tmpres, tmp);
- ret += tmp;
+ memcpy (&(*result)[pos], tmpres, tmpres_size);
+ pos += tmpres_size;
}
- return ret;
+ return pos;
}
/* copies data to result but removes newlines and <CR>
diff --git a/src/certtool-args.def.in b/src/certtool-args.def
similarity index 100%
rename from src/certtool-args.def.in
rename to src/certtool-args.def
diff --git a/src/cli-args.def.in b/src/cli-args.def
similarity index 100%
rename from src/cli-args.def.in
rename to src/cli-args.def
diff --git a/src/cli-debug-args.def.in b/src/cli-debug-args.def
similarity index 100%
rename from src/cli-debug-args.def.in
rename to src/cli-debug-args.def
diff --git a/src/ocsptool-args.def.in b/src/ocsptool-args.def
similarity index 100%
rename from src/ocsptool-args.def.in
rename to src/ocsptool-args.def
diff --git a/src/p11tool-args.def.in b/src/p11tool-args.def
similarity index 100%
rename from src/p11tool-args.def.in
rename to src/p11tool-args.def
diff --git a/src/psk-args.def.in b/src/psk-args.def
similarity index 100%
rename from src/psk-args.def.in
rename to src/psk-args.def
diff --git a/src/serv-args.def.in b/src/serv-args.def
similarity index 100%
rename from src/serv-args.def.in
rename to src/serv-args.def
diff --git a/src/srptool-args.def.in b/src/srptool-args.def
similarity index 100%
rename from src/srptool-args.def.in
rename to src/srptool-args.def
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 4a6cd5b..38c0571 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -20,10 +20,11 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \
- template-test.key template-test.pem template-test.tmpl
+ template-test.key template-test.pem template-test.tmpl \
+ funny-spacing.pem
-dist_check_SCRIPTS = pathlen aki template-test
+dist_check_SCRIPTS = pathlen aki template-test pem-decoding
-TESTS = pathlen aki template-test
+TESTS = pathlen aki template-test pem-decoding
TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/tests/cert-tests/funny-spacing.pem
b/tests/cert-tests/funny-spacing.pem
new file mode 100644
index 0000000..98e4a75
--- /dev/null
+++ b/tests/cert-tests/funny-spacing.pem
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEhDCCA+2gAwIBAgIQLhA3A99GhZ16VQ2mWWGFODANBgkqhkiG9w0BAQQFADCB
+zDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9y
+eS9SUEEgSW5jb3JwLiBCeSBSZWYuLExJQUIuTFREKGMpOTgxSDBGBgNVBAMTP1Zl
+cmlTaWduIENsYXNzIDEgQ0EgSW5kaXZpZHVhbCBTdWJzY3JpYmVyLVBlcnNvbmEg
+Tm90IFZhbGlkYXRlZDAeFw0wMDA2MjYwMDAwMDBaFw0wMDA4MjUyMzU5NTlaMIIB
+CDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9y
+eS9SUEEgSW5jb3JwLiBieSBSZWYuLExJQUIuTFREKGMpOTgxHjAcBgNVBAsTFVBl
+cnNvbmEgTm90IFZhbGlkYXRlZDEmMCQGA1UECxMdRGlnaXRhbCBJRCBDbGFzcyAx
+IC0gTmV0c2NhcGUxGDAWBgNVBAMUD1NpbW9uIEpvc2Vmc3NvbjEiMCAGCSqGSIb3
+DQEJARYTc2ltb25Aam9zZWZzc29uLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEAyQzOiv5xRpvKHeWQEqURC8YtxDPGGehgWU4/ZD3k93uwvvkQB+l8psZa
+UTMkl3uj4Qi0UrYGEH1l325SvYE/Oa2zrRcTiCLnQ4w5t8LEukqLVBVJVaRNzABW
+e8hjTjfe+3kPRdzpXM1w8GRCNYTb5lmky0v+D0coDDURqUD8uqUCAwEAAaOCASYw
+ggEiMAkGA1UdEwQCMAAwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcBCDAqMCgGCCsG
+AQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMBEGCWCGSAGG+EIB
+AQQEAwIHgDCBhgYKYIZIAYb4RQEGAwR4FnZkNDY1MmJkNjNmMjA0NzAyOTI5ODc2
+M2M5ZDJmMjc1MDY5YzczNTliZWQxYjA1OWRhNzViYzRiYzk3MDE3NDdkYTVkNWU0
+MTQxYmVhZGIyYmQyZTg4MzE3YWY3YmY1ZDUxMTQ5OTdhM2JmNDVmOGYzZWE0NTBj
+MDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwudmVyaXNpZ24uY29tL2NsYXNz
+MS5jcmwwDQYJKoZIhvcNAQEEBQADgYEACTgvV56RpNJC2ddEwdgXFEkAaZ9r5JWT
+Nf2Wdv+Lv57dBWuCsvOvD/igL41lCCdU1I9Hecm+2fnOr38qBhcm87nmdLq5NT42
+Vl1BnM5o/NvFMUIJMjfnty6kxVHl/uVFWQxEys6tdyRStHhfzE8Vp48ggVZlCFA3
+dbyiEYJySHY=
+-----END CERTIFICATE-----
+
\ No newline at end of file
diff --git a/tests/cert-tests/aki b/tests/cert-tests/pem-decoding
similarity index 87%
copy from tests/cert-tests/aki
copy to tests/cert-tests/pem-decoding
index e0722a0..62cc0ee 100755
--- a/tests/cert-tests/aki
+++ b/tests/cert-tests/pem-decoding
@@ -25,14 +25,9 @@ set -e
srcdir=${srcdir:-.}
CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
-$CERTTOOL --certificate-info --infile $srcdir/aki-cert.pem \
- --outfile tmp-aki.pem
-
-diff $srcdir/aki-cert.pem tmp-aki.pem
+$CERTTOOL --certificate-info --infile $srcdir/funny-spacing.pem >/dev/null 2>&1
rc=$?
-rm -f tmp-aki.pem
-
# We're done.
if test "$rc" != "0"; then
exit $rc
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-138-g7e7e802,
Nikos Mavrogiannopoulos <=