[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-256-g2032ac2

[Nikos Mavrogiannopoulos]

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=2032ac294dc8721e3084162b585b1ead7ea40cc0

The branch, master has been updated
       via  2032ac294dc8721e3084162b585b1ead7ea40cc0 (commit)
       via  31435b02184346526da86b971b51005835168d0c (commit)
      from  f726b314a8d4ad8997872a7a65276bf0f0eda4c1 (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 2032ac294dc8721e3084162b585b1ead7ea40cc0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 26 21:51:03 2010 +0200

    When generating private key allow usage of --pkcs-cipher flag.

commit 31435b02184346526da86b971b51005835168d0c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 22 18:36:22 2010 +0200

    MAX_SRP_USERNAME -> MAX_USERNAME_SIZE

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

Summary of changes:
 lib/auth_dhe_psk.c |    2 +-
 lib/auth_psk.c     |    4 +-
 lib/auth_psk.h     |    4 +-
 lib/auth_srp.c     |    2 +-
 lib/auth_srp.h     |    2 +-
 lib/ext_srp.c      |    2 +-
 lib/gnutls_int.h   |    2 +-
 src/certtool.c     |   58 ++++++++++++++++++++++++++-------------------------
 8 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/lib/auth_dhe_psk.c b/lib/auth_dhe_psk.c
index 60da95c..f281b1d 100644
--- a/lib/auth_dhe_psk.c
+++ b/lib/auth_dhe_psk.c
@@ -217,7 +217,7 @@ proc_psk_client_kx (gnutls_session_t session, opaque * data,
    */
   info = _gnutls_get_auth_info (session);
 
-  if (username.size > MAX_SRP_USERNAME)
+  if (username.size > MAX_USERNAME_SIZE)
     {
       gnutls_assert ();
       return GNUTLS_E_ILLEGAL_SRP_USERNAME;
diff --git a/lib/auth_psk.c b/lib/auth_psk.c
index 242f6c4..b55203a 100644
--- a/lib/auth_psk.c
+++ b/lib/auth_psk.c
@@ -265,7 +265,7 @@ _gnutls_proc_psk_client_kx (gnutls_session_t session, 
opaque * data,
    */
   info = _gnutls_get_auth_info (session);
 
-  if (username.size > MAX_SRP_USERNAME)
+  if (username.size > MAX_USERNAME_SIZE)
     {
       gnutls_assert ();
       return GNUTLS_E_ILLEGAL_SRP_USERNAME;
@@ -377,7 +377,7 @@ _gnutls_proc_psk_server_kx (gnutls_session_t session, 
opaque * data,
    */
   info = _gnutls_get_auth_info (session);
 
-  if (hint.size > MAX_SRP_USERNAME)
+  if (hint.size > MAX_USERNAME_SIZE)
     {
       gnutls_assert ();
       return GNUTLS_E_ILLEGAL_SRP_USERNAME;
diff --git a/lib/auth_psk.h b/lib/auth_psk.h
index 200ec97..013ed0d 100644
--- a/lib/auth_psk.h
+++ b/lib/auth_psk.h
@@ -57,9 +57,9 @@ typedef struct gnutls_psk_server_credentials_st
 /* these structures should not use allocated data */
 typedef struct psk_auth_info_st
 {
-  char username[MAX_SRP_USERNAME + 1];
+  char username[MAX_USERNAME_SIZE + 1];
   dh_info_st dh;
-  char hint[MAX_SRP_USERNAME + 1];
+  char hint[MAX_USERNAME_SIZE + 1];
 } *psk_auth_info_t;
 
 
diff --git a/lib/auth_srp.c b/lib/auth_srp.c
index 43e463b..54bfd10 100644
--- a/lib/auth_srp.c
+++ b/lib/auth_srp.c
@@ -165,7 +165,7 @@ _gnutls_gen_srp_server_kx (gnutls_session_t session, opaque 
** data)
   info = _gnutls_get_auth_info (session);
   username = info->username;
 
-  _gnutls_str_cpy (username, MAX_SRP_USERNAME, priv->username);
+  _gnutls_str_cpy (username, MAX_USERNAME_SIZE, priv->username);
 
   ret = _gnutls_srp_pwd_read_entry (session, username, &pwd_entry);
 
diff --git a/lib/auth_srp.h b/lib/auth_srp.h
index 40cb97a..3b20fe7 100644
--- a/lib/auth_srp.h
+++ b/lib/auth_srp.h
@@ -48,7 +48,7 @@ typedef struct gnutls_srp_server_credentials_st
 /* these structures should not use allocated data */
 typedef struct srp_server_auth_info_st
 {
-  char username[MAX_SRP_USERNAME + 1];
+  char username[MAX_USERNAME_SIZE + 1];
 } *srp_server_auth_info_t;
 
 #ifdef ENABLE_SRP
diff --git a/lib/ext_srp.c b/lib/ext_srp.c
index 7c36de0..868714c 100644
--- a/lib/ext_srp.c
+++ b/lib/ext_srp.c
@@ -71,7 +71,7 @@ _gnutls_srp_recv_params (gnutls_session_t session, const 
opaque * data,
          len = data[0];
          DECR_LEN (data_size, len);
 
-         if (MAX_SRP_USERNAME < len)
+         if (MAX_USERNAME_SIZE < len)
            {
              gnutls_assert ();
              return GNUTLS_E_ILLEGAL_SRP_USERNAME;
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 36b40a9..d9b7fe7 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -84,7 +84,7 @@ typedef struct
 #define MAX_CIPHER_BLOCK_SIZE 16
 #define MAX_CIPHER_KEY_SIZE 32
 
-#define MAX_SRP_USERNAME 128
+#define MAX_USERNAME_SIZE 128
 #define MAX_SERVER_NAME_SIZE 128
 
 #define SESSION_TICKET_KEY_NAME_SIZE 16
diff --git a/src/certtool.c b/src/certtool.c
index e68f666..962268a 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -260,6 +260,35 @@ generate_private_key_int (void)
   return key;
 }
 
+static int
+cipher_to_flags (const char *cipher)
+{
+  if (strcasecmp (cipher, "3des") == 0)
+    {
+      return GNUTLS_PKCS_USE_PBES2_3DES;
+    }
+  else if (strcasecmp (cipher, "aes-128") == 0)
+    {
+      return GNUTLS_PKCS_USE_PBES2_AES_128;
+    }
+  else if (strcasecmp (cipher, "aes-192") == 0)
+    {
+      return GNUTLS_PKCS_USE_PBES2_AES_192;
+    }
+  else if (strcasecmp (cipher, "aes-256") == 0)
+    {
+      return GNUTLS_PKCS_USE_PBES2_AES_256;
+    }
+  else if (strcasecmp (cipher, "rc2-40") == 0)
+    {
+      return GNUTLS_PKCS_USE_PKCS12_RC2_40;
+    }
+
+  error (EXIT_FAILURE, 0, "Unknown cipher %s\n", cipher);
+  return -1;
+}
+
+
 static void
 print_private_key (gnutls_x509_privkey_t key)
 {
@@ -285,7 +314,7 @@ print_private_key (gnutls_x509_privkey_t key)
       if (info.export)
        flags = GNUTLS_PKCS_USE_PKCS12_RC2_40;
       else
-       flags = GNUTLS_PKCS_USE_PKCS12_3DES;
+       flags = cipher_to_flags (info.pkcs_cipher);
 
       if ((pass = get_confirmed_pass (true)) == NULL || *pass == '\0')
        flags = GNUTLS_PKCS_PLAIN;
@@ -2592,33 +2621,6 @@ verify_crl (void)
   fprintf (outfile, "\n");
 }
 
-static int
-cipher_to_flags (const char *cipher)
-{
-  if (strcasecmp (cipher, "3des") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_3DES;
-    }
-  else if (strcasecmp (cipher, "aes-128") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_AES_128;
-    }
-  else if (strcasecmp (cipher, "aes-192") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_AES_192;
-    }
-  else if (strcasecmp (cipher, "aes-256") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_AES_256;
-    }
-  else if (strcasecmp (cipher, "rc2-40") == 0)
-    {
-      return GNUTLS_PKCS_USE_PKCS12_RC2_40;
-    }
-
-  error (EXIT_FAILURE, 0, "Unknown cipher %s\n", cipher);
-  return -1;
-}
 
 void
 generate_pkcs8 (void)


hooks/post-receive
-- 
GNU gnutls