From: Nikos <nmav@crystal.(none)>
Date: Tue, 19 Feb 2008 20:48:35 +0000 (+0200)
Subject: some updates
X-Git-Tag: gnutls_2_3_1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f92cc2bc9c522569711ca9ae0c165c22b348dd;p=thirdparty%2Fgnutls.git

some updates
---

diff --git a/tests/openpgp_test.c b/tests/openpgp_test.c
index fa87b23270..cf31d30284 100644
--- a/tests/openpgp_test.c
+++ b/tests/openpgp_test.c
@@ -69,12 +69,12 @@ main (int argc, char **argv)
   rc = gnutls_certificate_allocate_credentials (&ctx);
   assert (rc == 0);
 
-  s = "../src/openpgp/cli_ring.gpg";
+  s = "../doc/credentials/openpgp/cli_ring.gpg";
   rc = gnutls_certificate_set_openpgp_keyring_file (ctx, s);
   assert (rc == 0);
 
-  s = "../src/openpgp/pub.asc";
-  t = "../src/openpgp/sec.asc";
+  s = "../doc/credentials/openpgp/pub.asc";
+  t = "../doc/credentials/openpgp/sec.asc";
   rc = gnutls_certificate_set_openpgp_key_file (ctx, s, t);
   assert (rc == 0);
 
diff --git a/tests/openpgpself.c b/tests/openpgpself.c
index 9ee63884cb..7216146b82 100644
--- a/tests/openpgpself.c
+++ b/tests/openpgpself.c
@@ -116,9 +116,9 @@ client (void)
    */
   success ("Setting key files...\n");
 
-  pubkey = "../doc/credentials/openpgp/pub.asc";
-  seckey = "../doc/credentials/openpgp/sec.asc";
-  ret = gnutls_certificate_set_openpgp_key_file2 (xcred, pubkey, seckey, "auto", GNUTLS_OPENPGP_FMT_BASE64);
+  pubkey = "../doc/credentials/openpgp/cli_pub.asc";
+  seckey = "../doc/credentials/openpgp/cli_sec.asc";
+  ret = gnutls_certificate_set_openpgp_key_file (xcred, pubkey, seckey, GNUTLS_OPENPGP_FMT_BASE64);
   if (ret < 0)
     {
       fail ("Could not set key files...\n");