From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 15 Feb 2002 11:22:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: gnutls_0_3_90~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fa123ecef2453db1445b4e7754313e3fe7c0965;p=thirdparty%2Fgnutls.git

*** empty log message ***
---

diff --git a/NEWS b/NEWS
index e31abe8cb1..57a557c6fb 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Version ?.?.?
   type.
 - Improved Diffie Hellman key exchanges support.
 - Bug fixes in the RSA key exchange.
+- Extension types now use a 16 bit type field.
 
 Version 0.3.5 (25/01/2002)
 - Corrected the RSA key exchange method, to avoid attacks against
diff --git a/doc/protocol/draft-ietf-tls-openpgp-keys-01.txt b/doc/protocol/draft-ietf-tls-openpgp-keys-01.txt
index 3debd56f87..98e84213e7 100644
--- a/doc/protocol/draft-ietf-tls-openpgp-keys-01.txt
+++ b/doc/protocol/draft-ietf-tls-openpgp-keys-01.txt
@@ -1,8 +1,8 @@
 
 
 TLS Working Group                                     N. Mavroyanopoulos
-Internet-Draft                                          ??????? ??, 200?
-Expires: ???? ??, 200?
+Internet-Draft                                         February 15, 2002
+Expires: August 14, 2002
 
 
                 Using OpenPGP keys for TLS authentication
@@ -53,7 +53,7 @@ Abstract
 
 
 
-N. Mavroyanopoulos         Expires ???? ??, 200?               [Page 1]
+N. Mavroyanopoulos         Expires August 14, 2002             [Page 1]
 
 Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
@@ -110,7 +110,7 @@ Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
 
 
-N. Mavroyanopoulos         Expires ???? ??, 200?               [Page 2]
+N. Mavroyanopoulos         Expires August 14, 2002             [Page 2]
 
 Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
@@ -152,7 +152,7 @@ Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
    client and vice versa are determined by the negotiated certificate
    type and the selected cipher suite's key exchange algorithm. 
 
-   In case OpenPGP certificate type is negotiated then it is required 
+   If the OpenPGP certificate type is negotiated then it is required 
    to present an OpenPGP key in the Certificate message. The OpenPGP
    key must contain a public key that matches the selected key exchange
    algorithm, as shown below.
@@ -167,7 +167,7 @@ Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
    DHE_RSA                 RSA public key which can be used for
                            signing.
 
-N. Mavroyanopoulos         Expires ???? ??, 200?               [Page 3]
+N. Mavroyanopoulos         Expires August 14, 2002             [Page 3]
 
 Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
@@ -224,7 +224,7 @@ Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
 
 
-N. Mavroyanopoulos         Expires ???? ??, 200?               [Page 4]
+N. Mavroyanopoulos         Expires August 14, 2002             [Page 4]
 
 Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
@@ -241,8 +241,8 @@ Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
 2.1.5 Server key exchange
 
-   The server key exchange message for OpenPGP keys is identical
-   to the TLS specification.
+   The server key exchange message for OpenPGP keys is identical to the
+   TLS specification.
 
 2.1.6 Certificate verify
 
@@ -281,7 +281,7 @@ Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
 
 
-N. Mavroyanopoulos         Expires ???? ??, 200?               [Page 5]
+N. Mavroyanopoulos         Expires August 14, 2002             [Page 5]
 
 Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
@@ -338,8 +338,7 @@ Author's Address
 
 
 
-
-N. Mavroyanopoulos         Expires ???? ??, 200?               [Page 6]
+N. Mavroyanopoulos         Expires August 14, 2002             [Page 6]
 
 Internet-Draft  Using OpenPGP keys for TLS Authentication  January 2002
 
@@ -396,5 +395,5 @@ Acknowledgement
 
 
 
-N. Mavroyanopoulos         Expires ???? ??, 200?               [Page 7]
+N. Mavroyanopoulos         Expires August 14, 2002             [Page 7]
 
diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex
index 1530cafa05..61e9952f39 100644
--- a/doc/tex/serv1.tex
+++ b/doc/tex/serv1.tex
@@ -28,6 +28,7 @@
 #define ERR(err,s) if(err==-1) {perror(s);return(1);}
 #define MAX_BUF 1024
 #define PORT 5556               /* listen to 5556 port */
+#define DH_BITS 1024
 
 /* These are global */
 GNUTLS_SRP_SERVER_CREDENTIALS srp_cred;
@@ -62,6 +63,8 @@ GNUTLS_STATE initialize_state()
    /* request client certificate if any.
     */
    gnutls_certificate_server_set_request( state, GNUTLS_CERT_REQUEST);
+
+   gnutls_dh_set_prime_bits( state, DH_BITS);
    
    return state;
 }
@@ -113,7 +116,7 @@ gnutls_datum prime, generator;
     * once a day, once a week or once a month. Depends on the
     * security requirements.
     */
-   gnutls_dh_generate_params( &prime, &generator, 1024);
+   gnutls_dh_generate_params( &prime, &generator, DH_BITS);
    gnutls_dh_replace_params( prime, generator);
 
    free( prime.data);