[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-225-g94f7470

[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=94f747024139098500cd82180ea725d48ca0d873

The branch, master has been updated
       via  94f747024139098500cd82180ea725d48ca0d873 (commit)
       via  d065ddda860cc897d28fbea7c1d007ee426f398a (commit)
      from  e044aabe9f67af9781e512d597315e79ca13f4fe (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 94f747024139098500cd82180ea725d48ca0d873
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Jun 14 19:40:33 2010 +0200

    Allow SHA224 hash in certtool. Added tests for SHA-256 and SHA-224 for DSA.

commit d065ddda860cc897d28fbea7c1d007ee426f398a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Jun 14 19:13:14 2010 +0200

    Do not warn multiple times for the deprecation of --bits.

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

Summary of changes:
 src/certtool.c               |   10 +++++++-
 tests/sha2/key-ca-dsa.pem    |   53 +++++++++++++++++++++--------------------
 tests/sha2/key-subca-dsa.pem |   21 ++++++++++++++++
 tests/sha2/sha2              |    3 +-
 tests/sha2/sha2-dsa          |   20 +++++++++++++--
 5 files changed, 75 insertions(+), 32 deletions(-)
 create mode 100644 tests/sha2/key-subca-dsa.pem

diff --git a/src/certtool.c b/src/certtool.c
index 87c3a13..e68f666 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -204,7 +204,13 @@ int bits;
 
   if (info.bits != 0)
     {
-      fprintf(stderr, "** Note: Please use the --sec-param instead of 
--bits\n");
+      static int warned = 0;
+      
+      if (warned == 0) 
+        {
+          warned = 1;
+          fprintf(stderr, "** Note: Please use the --sec-param instead of 
--bits\n");
+        }
       bits = info.bits;
     }
   else
@@ -980,6 +986,8 @@ gaa_parser (int argc, char **argv)
        default_dig = GNUTLS_DIG_SHA1;
       else if (strcasecmp (info.hash, "sha256") == 0)
        default_dig = GNUTLS_DIG_SHA256;
+      else if (strcasecmp (info.hash, "sha224") == 0)
+       default_dig = GNUTLS_DIG_SHA224;
       else if (strcasecmp (info.hash, "sha384") == 0)
        default_dig = GNUTLS_DIG_SHA384;
       else if (strcasecmp (info.hash, "sha512") == 0)
diff --git a/tests/sha2/key-ca-dsa.pem b/tests/sha2/key-ca-dsa.pem
index 991f6ad..3510e95 100644
--- a/tests/sha2/key-ca-dsa.pem
+++ b/tests/sha2/key-ca-dsa.pem
@@ -1,28 +1,29 @@
+Setting log level to 2
 -----BEGIN DSA PRIVATE KEY-----
-MIIEvgIBAAKCAYEAx25OA2wqGmV3ygRR94me1sFVCiYVyADh9PHdcBO4vE1htok3
-SShUlv8y8BR9qaY531tneBhsRwTbl1QTvCi/UiFasB8RnfJH36DNA6+cAU2tiy6W
-lPTeIFcYAR79Ss7fqEGlgrEv8U1nGI5DJrWe15t0Bh4y9EQXPvddWvKf1K/6tzgC
-SR3dFg3/c8dIzN/QFIR92CE+QW2ScNvzZ1hFqPFHV0521dpGJhNAFg2QOdDqchNN
-pVkV1z7oYix67zu9MSZ23/P0eooa8lCQH9NBGnw7eR79SoFuOIQAhv0I0aDHafs/
-MjNdGRfIyWeoK7wcAL5NwAWcPZRMY8m20gbIyxio+x5tr8MbLGcPHbdfB4kWBxSx
-zTY728MiuryT/Jg3pnzzzkLZ1dZIDNn5LEDfjSBFjNTWo5tTzQ0gtdb9Q6idPWZC
-SVvu9DMtbGr8GkpQq2kbOK2F757jZ1jbIPHj5sYIAsVledmDogUzfq7i95HTsTDn
-6uUsV2zw2TdCCHfZAhUA26q615JtGdKJYOcjOZjJqF7VMo8CggGAGCgoo2zrWhCt
-vXhexkMjr70u6oontJph0c6moEgq7KE/aa9HldcUlvKRRhzq+ggtkKEp16R2UbBa
-nvRLAfCW8wvZQSqc984riGX5JhKeOyjLNEYQtcNtY26Y1Ext9UKJxZNZXFc2Noff
-WfL15F9wd1VY/3mG8FcoironPfUw9AueYZn9sJSXHpeaP1kUsqBu7dhVEV+RwWkf
-Bb05oMTqA0ePWKXVdztdM0WnyXCsVs/bWGjiWlhMlqardudmi8/oxLfcJfbC6lJr
-E6XZpjTV5557zcyheXVNXB+RvQNak1/P0LZwFuis3Yqpie96iJrmfDsELZhnjRWe
-GJTSCzOy8g9guU2ELba3zcxNN7Yqevxguaa9IFYvWpqKKPTRSvOgHeYO65QXg7ou
-YKAbj+RwKkLjw2HWZlnuU/Fs2OFk4cAPsgJB2IaGjmmFfLnMI9xwIoX9FcJQl5Ur
-aNd4nDJpsFR6MTmbk/QHmtwniFcjGTHvbDT7jf6070wj1mzPHkyMAoIBgQC6nPN5
-N/sl+1JxFbKS92bPLwXW0YVIKcxqFAGhtA7cS9CksfWrZDO+Cjt/10yLL3ybR5RQ
-ZYD8exgHijCq9jEQQ2TkJl7mGZpD1sHNfrU0y4teOuXvvrtAnkLZLhPhV0nEskyc
-b6huAqJ0SpwzipdjQ0Xmh9roTSbwZ67e0RmrM6IBvd4ffOnunu2w3vaj7Ey7RV1k
-G3q5kQ1Fe6/ORXOxI3NKaeN/f+wdwzvXpQfsATdUvPnll1VP+UGvUIFmS5fvz7V/
-n4JLUTSp8NAJWyxSlvgNiQAfyC5VxzGi6nLg4zmR7/b1TlpQzm/L8T0OWz0Z8Sn6
-kRb/GHi/MvlrgjdArvMQz/i3Tt9H+gn7tGmQA/2cHujKtucMUDESv1XifyM5+AXP
-efQUKCzwci/Q/Yas5qTBtmdjvs1RSP/mj3fU3GKSJYtPM3B2QxFVutpOGSTxGpan
-yqnPPpiGngJ4w9oFU7R3PKgcCep+++vkDJIDi3SjumXd8zPYdvjDWYDYYhoCFDXP
-tGP+raIwP/zw2l2fhcvRjVHi
+MIIE1wIBAAKCAYEAxNL8GlkBTtfIl06DRrANFXvHHwkNKPezAMORJphd0OaEU497
+W6ymgQJXo3eoXZJBoyHrwOMOFx0Y65ii1oRYbZT1eztDAkVk40FKmNQNWHCsq4Zj
+LiMqXlAxhseGtval5AfeXWHEvGdHoiLzALLLZuXMYBRqh8rIgVHUb613aBdN2JhG
+tAl1RHvXbZJwvnaCzRZuTy04Z90afaz52pJE3ASUsfvKGKVmkfdmluOlU7RhAEW0
+uW8SeDwfcBGpSME97WcbelRcuRHDkHaDv8QvtU0WtF9ig5LAi4amZ4KJk7B3CZoH
+8v/zyDR6zCDevYf8rM9HTf2To1U5I8i+1TKJ8EAwNRLNoNPUh4YXgCjY8r5Q3NPt
+MqEZJztKyDOR6o5x0AULXpjflE0LrjyHp1NtqzSfFcqUQoDyPsFuLTnkQYJzlfPE
+X5TNCLHDByQw2TiDYlJdTp+YOWLDfAJ4dLL1cNHlsIWcsZLcMVnEz8sbWfJAk3sv
+jsahYhZhTwqR5OizAiEA0TMc2t7JeZOgtHJeboc5CToKPmNB0uYx5A4a3K1UEk0C
+ggGBAMC35py7lqAViVx3hQkro1GDSTaoCHpseOzmbHivF5Zx3ARkLkJywgd/8zjR
+ghQQVGOYOw4btdJOaqNENtpvDM+FITuJD1ecNrBxEqfNXDhTsVQ8S0eC0LXxwG0u
+k9qUEkljPhT1a+7CO+lbeVCpLfy6akK+9B4pnBCXdfQDkZA0FylXCxtX165Iuto8
+miJo2SI/qnK+P8E0KC3pY/ij3HH9aTJGVRDyq2XcD41H5hGNA0gFWwzha+vD0MVx
+Yw/wuQXmUTBR42Y8o33HZdQkDz55ZdKRxk6v9CzSnzP0rvYQUxSzTZD9wfnPnHys
+UJJvqz0jFaf3K+yEyo2SLP3w0vgEuRpNeyJ+2QcXC5ARv4JSFr52UOuTEo5UZxAb
+ail8TMhB1EJEO7rm5499Vd8oTuohfHQudU0L6Br6AEy9vGJZd1lCyidcZJ0Bqj+y
+zzUxGpQpgmrrfYYtuY5KXKz4HbHniwWwW4LGbNW2Ypks/C4nLjnfl56ElbBj26jG
+VyDMigKCAYBEjw3ptLcuVYNAS53dtkP1uku/O+bfUh25oPVSnx1cd6YT8u0opvFA
+HRK6U/fb8yvpxV7ILfJ4jC8FuWNal5ISdzmw4tddRvwmtT7AzuKvPhzum6TTpSiN
+7CKjoGZ+nowuF2nKoUS6NMScP+LPnMvrgAQOcJZ0aGR3Ds8Ax5X9fkT5zalSIWlw
+yzQPFwEvz0RozD/SGM0DRZ1ovyQGtFnVkPaDUCv1Zld31tdPTOusF/Ie1QOpJ4jd
+SirVEF3K9e5qyGBM366a94CEl+GZywV1n+6IEfF6sGyee4JHeIO0IaQQKDRHisXi
+iYTd7Cr3CS6oKK1EMDWbVuKeqzod+Tvk8+ExoarLcIaN2MIUfLA2PLlkhGdk9DIj
+uJ2QG+qm8o3bGP43vtKEz93xgWH5uyPjT3Ff5OHQ7tp5k3E3XAWE3wJvTbp3nqVh
+AW1+96xesu2j4LUQATtjEEXysbaOZKfmceP3L6DVwWgpMRY0PwpWVbVdlHIK+/73
+f5KeFIUPX44CIQCgUxkzi+BY/Xw8H1a0ebDANAuoH3zKJxPLt8Vm+b0JNA==
 -----END DSA PRIVATE KEY-----
diff --git a/tests/sha2/key-subca-dsa.pem b/tests/sha2/key-subca-dsa.pem
new file mode 100644
index 0000000..98f74e3
--- /dev/null
+++ b/tests/sha2/key-subca-dsa.pem
@@ -0,0 +1,21 @@
+Setting log level to 2
+-----BEGIN DSA PRIVATE KEY-----
+MIIDTwIBAAKCAQEA4S+RSYF4Ofkhh9CiEug5GaopwisjrRbUd/C4TVbFyG3Q7H6B
+aFRag96a3JSd2BKeBqtgl2xx2gXQO1oxxDnkqYyv4j8WSI1R0RIXBeO9izeFeAWl
+LQzMeRn7me3JAaVYbgrFgVb0BY/Ob6cZtkV5LRNSKkHre+YWY7tzzQDqGz/H+d1o
+7UILiqTryIyYX6+0rHjxTxmxKF3xOkGFJYvBZtzZa7aCqpNeqnMLMdku2SbHNpyu
+7yBFA9GY0zNMe8jwBjEuoZIkF9MVY9sopCLR1YW3GvtMOTvsnDV3VpS28MTQkEyz
+syYyqONK3Em0UUhjYehSSp/n15EgVYhKrJioVwIdAIXSpNyteqPR2NrFg7QLTD5v
+HK3O/fd9xT6YlT0CggEBANhamrmZUys+YHUsM95BhbSHCcgItme7euBSCiP8DL++
+0vaPLXNmv21DqP5aYAowUVBL86jJe1NoK+Cs65pjUzGvXVbeW1pptA1pkMXlw8VR
+MdczJleTwHevrk389UrSXXs4Jd7KfO52y5Aw7FLhTt1ggZH+sDaTO2NdlqOk6t/s
++6lsbtI1iMXWytDiuG5U2mRY7w8hkIneEST/BElA4quUaDHNd/99IkvhUuqJK2pb
+TwNrNnBEr34IMlR9gYloc0AoZ9mi9127xEdi59dZ0hdPWhqX/DJXMOXoT39j8Z4h
+av0sCloW6m5oPY2LUjl11n1hHoS/CqZWWvNkJ4jLjaMCggEBAK4fM+fc8iuowcuT
+nmunkNr08VzCtcOZeo7cqP09VjyRQBk69ZSSFa0CiKRuTexrzwP9zXGgabCklfK/
+y07OX5/EVQOGeDWCz6KNY7xqME20yOLerDOIDZLE8wkDaxJuuyGa7rEtD76rk+D3
+usYc83aK9fA8tkegei/Kt/o4dGlunpl9bWWRLxVVEdBIJe4Pst775tD1MNwr8uFY
+0v0HHdDvPhrD+GWtK+2Mlg8tT50mNsJZFdiqYR76+WgPaPweY1zZ7aK294Qcmn7G
+m94kJ3UusICP0iVlhqXF4lVmOXp1+Ido77OOnRBGNfZes7IM1+icyM+ZoKyCLRDZ
+TL1zYHECHADNHOMk9jl5zXkL4sIi+LX7Hvav8/CtwdW2aVs=
+-----END DSA PRIVATE KEY-----
diff --git a/tests/sha2/sha2 b/tests/sha2/sha2
index 80b4bc1..d094326 100755
--- a/tests/sha2/sha2
+++ b/tests/sha2/sha2
@@ -68,8 +68,7 @@ if [ $? != 0 ];then
        exit 1
 fi
 
-echo ca > template
-echo cn = "End-user" >> template
+echo cn = "End-user" > template
 
 $CERTTOOL -d 2 --generate-certificate --template template \
     --load-ca-privkey $srcdir/key-subsubca.pem \
diff --git a/tests/sha2/sha2-dsa b/tests/sha2/sha2-dsa
index c778ff3..c62e6a2 100755
--- a/tests/sha2/sha2-dsa
+++ b/tests/sha2/sha2-dsa
@@ -39,11 +39,25 @@ if [ $? != 0 ];then
 fi
 
 echo ca > template
-echo cn = "End-user" >> template
+echo cn = "SHA 224 Mid CA" >> template
 
 $CERTTOOL -d 2 --generate-certificate --template template \
     --load-ca-privkey $srcdir/key-ca-dsa.pem \
     --load-ca-certificate new-ca-dsa.pem \
+    --load-privkey $srcdir/key-subca-dsa.pem \
+    --outfile new-subca-dsa.pem \
+    --hash sha224 >out 2>&1
+
+if [ $? != 0 ];then
+       cat out
+       exit 1
+fi
+
+echo cn = "End-user" > template
+
+$CERTTOOL -d 2 --generate-certificate --template template \
+    --load-ca-privkey $srcdir/key-subca-dsa.pem \
+    --load-ca-certificate new-subca-dsa.pem \
     --load-privkey $srcdir/key-dsa.pem \
     --outfile new-user.pem >out 2>&1
 
@@ -52,7 +66,7 @@ if [ $? != 0 ];then
        exit 1
 fi
 
-cat new-user.pem new-ca-dsa.pem > out
+cat new-user.pem new-subca-dsa.pem new-ca-dsa.pem > out
 $CERTTOOL --verify-chain <out > verify
 
 if [ $? != 0 ];then
@@ -60,6 +74,6 @@ if [ $? != 0 ];then
        exit 1
 fi
 
-rm -f verify new-user.pem new-dsa-ca.pem template
+rm -f verify new-user.pem new-ca-dsa.pem new-subca-dsa.pem template out
 
 exit 0


hooks/post-receive
-- 
GNU gnutls