[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-7-gc54fcfe

[Simon Josefsson]

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=c54fcfeacb02927159e170b66401782d8cf706f9

The branch, master has been updated
       via  c54fcfeacb02927159e170b66401782d8cf706f9 (commit)
      from  32c2729e127fef1ac1d4c8c7351aedac9fdddf0e (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 c54fcfeacb02927159e170b66401782d8cf706f9
Author: Simon Josefsson <address@hidden>
Date:   Wed Oct 14 17:22:11 2009 +0200

    Fix MAC password.

-----------------------------------------------------------------------

Summary of changes:
 tests/pkcs12_encode.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/pkcs12_encode.c b/tests/pkcs12_encode.c
index 93ad396..ff72f43 100644
--- a/tests/pkcs12_encode.c
+++ b/tests/pkcs12_encode.c
@@ -136,13 +136,12 @@ main (void)
       if (ret < 0)
        error (EXIT_FAILURE, 0, "bag_set_key_id: %d", ret);
 
-      ret = gnutls_pkcs12_bag_encrypt (bag, "password",
+      ret = gnutls_pkcs12_bag_encrypt (bag, "pass",
                                       i == 0 ? GNUTLS_PKCS8_USE_PKCS12_3DES
                                       : GNUTLS_PKCS_USE_PKCS12_RC2_40);
       if (ret < 0)
        error (EXIT_FAILURE, 0, "bag_encrypt: %d", ret);
 
-      /* Set PKCS#12 structure. */
       ret = gnutls_pkcs12_set_bag (pkcs12, bag);
       if (ret < 0)
        error (EXIT_FAILURE, 0, "set_bag: %d", ret);
@@ -150,7 +149,8 @@ main (void)
       gnutls_pkcs12_bag_deinit (bag);
     }
 
-  ret = gnutls_pkcs12_generate_mac (pkcs12, "mac pass");
+  /* MAC the structure, export and print. */
+  ret = gnutls_pkcs12_generate_mac (pkcs12, "pass");
   if (ret < 0)
     error (EXIT_FAILURE, 0, "generate_mac: %d", ret);
 


hooks/post-receive
-- 
GNU gnutls