Updated documentation and gnutls_pk_params_t mappings to ECRYPT II recommendations.

diff --git a/NEWS b/NEWS
index 343c210ada14d1a81a458748f455e53c62414f07..eeb77a5b7472f9cc65e77b0148976499ad2c5d3f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,17 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 See the end for copying conditions.
 
+* Version 2.11.1 (unreleased)
+
+** libgnutls: Updated documentation and gnutls_pk_params_t mappings
+to ECRYPT II recommendations.
+
+** libgnutls: HMAC-MD5 no longer used by default.
+
+** API and ABI modifications:
+No changes since last version.
+
+
 * Version 2.11.0 (released 2010-07-22)
 
 ** libgnutls: support scattered write using writev(). This takes

diff --git a/doc/cha-bib.texi b/doc/cha-bib.texi
index 792bc8c07808ac3408aebda354c576487b2f94d4..840af8795e741b25f4697ad2f9decae67a6a65f7 100644 (file)
--- a/doc/cha-bib.texi
+++ b/doc/cha-bib.texi
@@ -144,4 +144,9 @@ Arjen Lenstra and Xiaoyun Wang and Benne de Weger, "Colliding X.509
 Certificates", Cryptology ePrint Archive, Report 2005/067, Available
 at @url{http://eprint.iacr.org/}.
 
+@item @anchor{ECRYPT}[ECRYPT]
+European Network of Excellence in Cryptology II, "ECRYPT II Yearly
+Report on Algorithms and Keysizes (2009-2010)", Available
+at @url{http://www.ecrypt.eu.org/documents/D.SPA.13.pdf}.
+
 @end table

diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index a08a2d4ae7a48853cf2d654afc1d2e4646bfd32a..9d180ad88ad2ebd9015dd27e9fd65905083902fd 100644 (file)
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -494,52 +494,48 @@ resume functions, @ref{resume}.
 In TLS, since a lot of algorithms are involved, it is not easy to set
 a consistent security level.  For this reason this section will
 present some correspondance between key sizes of symmetric algorithms
-and public key algorithms based on the most conservative values of
-@xcite{SELKEY}.  Those can be used to generate certificates with
+and public key algorithms based on the ``ECRYPT II Yearly Report on Algorithms and Keysizes (2009-2010)''
+in @xcite{ECRYPT}.  Those can be used to generate certificates with
 appropriate key sizes as well as parameters for Diffie-Hellman and SRP
 authentication.
 
-@multitable @columnfractions .15 .20 .20 .20
+@multitable @columnfractions .10 .15 .10 .20 .35
 
-@item Year
-@tab Symmetric key size
-@tab RSA key size, DH and SRP prime size
+@item Security bits
+@tab RSA, DH and SRP parameter size
 @tab ECC key size
+@tab @code{gnutls_sec_param_t}
+@tab Description
+
+@item 64
+@tab 816
+@tab 128
+@tab @code{WEAK}
+@tab Very short term protection against small organizations
 
-@item 1982
-@tab 56
-@tab 417
-@tab 105
-
-@item 1988
-@tab 61
-@tab 566
-@tab 114
-
-@item 2002
-@tab 72
-@tab 1028
-@tab 139
-
-@item 2015
-@tab 82
-@tab 1613
-@tab 173
-
-@item 2028
-@tab 92
-@tab 2362
-@tab 210
-
-@item 2040
-@tab 101
-@tab 3214
-@tab 244
-
-@item 2050
-@tab 109
-@tab 4047
-@tab 272
+@item 80
+@tab 1248
+@tab 160
+@tab @code{LOW}
+@tab Very short term protection against agencies
+
+@item 112
+@tab 2432
+@tab 224
+@tab @code{NORMAL}
+@tab Medium-term protection
+
+@item 128
+@tab 3248
+@tab 256
+@tab @code{HIGH}
+@tab Long term protection
+
+@item 256
+@tab 15424
+@tab 512
+@tab @code{ULTRA}
+@tab Foreseeable future
 
 @end multitable
 

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index 88ac1982f4d847cd0acfc235732e23714dc27cd1..0bb3d32e5d4950c04f42f66ed1067a6462cfa911 100644 (file)
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -2301,14 +2301,14 @@ unsigned int gnutls_sec_param_to_pk_bits (gnutls_pk_algorithm_t algo,
         switch(param)
           {
             case GNUTLS_SEC_PARAM_LOW:
-              return 1024;
+              return 1248;
             case GNUTLS_SEC_PARAM_HIGH:
-              return 3072;
+              return 2432;
             case GNUTLS_SEC_PARAM_ULTRA:
-              return 7680;
+              return 3248;
             case GNUTLS_SEC_PARAM_NORMAL:
             default:
-              return 2048;
+              return 2432;
           }
         default:
           gnutls_assert();
@@ -2379,13 +2379,13 @@ gnutls_sec_param_t gnutls_pk_bits_to_sec_param (gnutls_pk_algorithm_t algo,
 {
 
   /* currently we ignore algo */
-  if (bits >= 7680)
+  if (bits >= 15423)
     return GNUTLS_SEC_PARAM_ULTRA;
-  else if (bits >= 3072)
+  else if (bits >= 3247)
     return GNUTLS_SEC_PARAM_HIGH;
-  else if (bits >= 2048)
+  else if (bits >= 2431)
     return GNUTLS_SEC_PARAM_NORMAL;
-  else if (bits >= 1024)
+  else if (bits >= 1248)
     return GNUTLS_SEC_PARAM_LOW;
   else 
     return GNUTLS_SEC_PARAM_WEAK;