diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-07-21 17:50:05 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-07-21 17:50:05 +0200 |
| commit | 272600f60c1b8e3a0bc89d35b9981e76b436c0b7 (patch) | |
| tree | 2bd9f44983a893e7544a54c681b8cf86ea3a5a74 | |
| parent | d23f0730aa9ddffb0825456caca00a206469dfdb (diff) | |
| download | gnutls-272600f60c1b8e3a0bc89d35b9981e76b436c0b7.tar.gz | |
tests: x509cert-tl checks gnutls_x509_trust_list_add_trust_dir()
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/x509cert-dir/ca.pem | 13 | ||||
| -rw-r--r-- | tests/x509cert-tl.c | 16 |
3 files changed, 20 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 4fed9852ef..ffd47eeb16 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -35,7 +35,7 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h test-chains.h \ certs/ca-cert-ecc.pem certs/cert-ecc256.pem certs/cert-ecc521.pem \ certs/cert-rsa-2432.pem certs/ecc384.pem certs/ecc.pem \ certs/ca-ecc.pem certs/cert-ecc384.pem certs/cert-ecc.pem certs/ecc256.pem \ - certs/ecc521.pem certs/rsa-2432.pem + certs/ecc521.pem certs/rsa-2432.pem x509cert-dir/ca.pem AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ diff --git a/tests/x509cert-dir/ca.pem b/tests/x509cert-dir/ca.pem new file mode 100644 index 0000000000..9bcfef26a5 --- /dev/null +++ b/tests/x509cert-dir/ca.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIIB5zCCAVKgAwIBAgIERiYdJzALBgkqhkiG9w0BAQUwGTEXMBUGA1UEAxMOR251 +VExTIHRlc3QgQ0EwHhcNMDcwNDE4MTMyOTExWhcNMDgwNDE3MTMyOTExWjAZMRcw +FQYDVQQDEw5HbnVUTFMgdGVzdCBDQTCBnDALBgkqhkiG9w0BAQEDgYwAMIGIAoGA +vuyYeh1vfmslnuggeEKgZAVmQ5ltSdUY7H25WGSygKMUYZ0KT74v8C780qtcNt9T +7EPH/N6RvB4BprdssgcQLsthR3XKA84jbjjxNCcaGs33lvOz8A1nf8p3hD+cKfRi +kfYSW2JazLrtCC4yRCas/SPOUxu78of+3HiTfFm/oXUCAwEAAaNDMEEwDwYDVR0T +AQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwQAMB0GA1UdDgQWBBTpPBz7rZJu5gak +Viyi4cBTJ8jylTALBgkqhkiG9w0BAQUDgYEAiaIRqGfp1jPpNeVhABK60SU0KIAy +njuu7kHq5peUgYn8Jd9zNzExBOEp1VOipGsf6G66oQAhDFp2o8zkz7ZH71zR4HEW +KoX6n5Emn6DvcEH/9pAhnGxNHJAoS7czTKv/JDZJhkqHxyrE1fuLsg5Qv25DTw7+ +PfqUpIhz5Bbm7J4= +-----END CERTIFICATE----- diff --git a/tests/x509cert-tl.c b/tests/x509cert-tl.c index a5bbb1e529..dad78601db 100644 --- a/tests/x509cert-tl.c +++ b/tests/x509cert-tl.c @@ -190,7 +190,7 @@ void doit(void) { int ret; gnutls_datum_t data; - gnutls_x509_crt_t server_crt, ca_crt, ca_crt2; + gnutls_x509_crt_t server_crt, ca_crt2; gnutls_x509_trust_list_t tl; unsigned int status; @@ -205,27 +205,23 @@ void doit(void) /* test for gnutls_certificate_get_issuer() */ gnutls_x509_trust_list_init(&tl, 0); + gnutls_x509_crt_init(&server_crt); - gnutls_x509_crt_init(&ca_crt); gnutls_x509_crt_init(&ca_crt2); + ret = gnutls_x509_trust_list_add_trust_dir(tl, "./x509cert-dir", NULL, GNUTLS_X509_FMT_PEM, 0, 0); + if (ret != 1) + fail("gnutls_x509_trust_list_add_trust_dir: %d\n", ret); + ret = gnutls_x509_crt_import(server_crt, &cert, GNUTLS_X509_FMT_PEM); if (ret < 0) fail("gnutls_x509_crt_import"); - ret = gnutls_x509_crt_import(ca_crt, &ca, GNUTLS_X509_FMT_PEM); - if (ret < 0) - fail("gnutls_x509_crt_import"); - ret = gnutls_x509_crt_import(ca_crt2, &ca, GNUTLS_X509_FMT_PEM); if (ret < 0) fail("gnutls_x509_crt_import"); - ret = gnutls_x509_trust_list_add_cas(tl, &ca_crt, 1, 0); - if (ret < 0) - fail("gnutls_x509_trust_list_add_cas"); - ret = gnutls_x509_trust_list_add_named_crt(tl, server_crt, NAME, NAME_SIZE, 0); |