diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-09-07 12:42:09 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-09-07 12:42:09 +0200 |
| commit | 94a85a9e6608a0bb2fcc27dfa1ecfd37809a5620 (patch) | |
| tree | 00bc73aa03c909685e3a06aa1da3e4d371904f22 | |
| parent | b102ca420e376a99df186c0eb977eedc9867527e (diff) | |
| download | gnutls-94a85a9e6608a0bb2fcc27dfa1ecfd37809a5620.tar.gz | |
Use official IANA values for SRP.
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | lib/gnutls_algorithms.c | 21 | ||||
| -rw-r--r-- | lib/gnutls_int.h | 2 |
3 files changed, 24 insertions, 12 deletions
@@ -3,6 +3,16 @@ Copyright (C) 2004, 2005, 2006, 2007 Simon Josefsson Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavroyanopoulos See the end for copying conditions. +* Version 2.0.1 (unreleased) + +** Update SRP extension type and cipher suite with official IANA values. +This breaks backwards compatibility with SRP in older versions of +GnuTLS, but this is intentional to speed up the adoption of the +official values. The old values were incorrect. + +** API and ABI modifications: +No changes since last version. + * Version 2.0.0 (released 2007-09-04) ** Included copy of Libtasn1 upgraded to version 1.1. @@ -11,6 +21,9 @@ See the end for copying conditions. ** Don't build examples for disabled features. +** API and ABI modifications: +No changes since last version. + * Version 1.7.19 (released 2007-08-27) ** Fix gnutls_error_is_fatal so that positive "errors" are non-critical. diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c index 95463bfbcc..7ec696e253 100644 --- a/lib/gnutls_algorithms.c +++ b/lib/gnutls_algorithms.c @@ -392,20 +392,19 @@ typedef struct /* SRP (not in TLS 1.0) - * draft-ietf-tls-srp-02: + * draft-ietf-tls-srp-14: */ -#define GNUTLS_SRP_SHA_3DES_EDE_CBC_SHA1 { 0x00, 0x50 } -#define GNUTLS_SRP_SHA_AES_128_CBC_SHA1 { 0x00, 0x53 } -#define GNUTLS_SRP_SHA_AES_256_CBC_SHA1 { 0x00, 0x56 } +#define GNUTLS_SRP_SHA_3DES_EDE_CBC_SHA1 { 0xC0, 0x1A } +#define GNUTLS_SRP_SHA_RSA_3DES_EDE_CBC_SHA1 { 0xC0, 0x1B } +#define GNUTLS_SRP_SHA_DSS_3DES_EDE_CBC_SHA1 { 0xC0, 0x1C } -#define GNUTLS_SRP_SHA_RSA_3DES_EDE_CBC_SHA1 { 0x00, 0x51 } -#define GNUTLS_SRP_SHA_DSS_3DES_EDE_CBC_SHA1 { 0x00, 0x52 } +#define GNUTLS_SRP_SHA_AES_128_CBC_SHA1 { 0xC0, 0x1D } +#define GNUTLS_SRP_SHA_RSA_AES_128_CBC_SHA1 { 0xC0, 0x1E } +#define GNUTLS_SRP_SHA_DSS_AES_128_CBC_SHA1 { 0xC0, 0x1F } -#define GNUTLS_SRP_SHA_RSA_AES_128_CBC_SHA1 { 0x00, 0x54 } -#define GNUTLS_SRP_SHA_DSS_AES_128_CBC_SHA1 { 0x00, 0x55 } - -#define GNUTLS_SRP_SHA_RSA_AES_256_CBC_SHA1 { 0x00, 0x57 } -#define GNUTLS_SRP_SHA_DSS_AES_256_CBC_SHA1 { 0x00, 0x58 } +#define GNUTLS_SRP_SHA_AES_256_CBC_SHA1 { 0xC0, 0x20 } +#define GNUTLS_SRP_SHA_RSA_AES_256_CBC_SHA1 { 0xC0, 0x21 } +#define GNUTLS_SRP_SHA_DSS_AES_256_CBC_SHA1 { 0xC0, 0x22 } /* RSA */ diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index 6f01c96afb..3e6ef39575 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -144,7 +144,7 @@ typedef enum extensions_t GNUTLS_EXTENSION_AUTHZ_CLIENT = 7, GNUTLS_EXTENSION_AUTHZ_SERVER = 8, GNUTLS_EXTENSION_CERT_TYPE = 9, - GNUTLS_EXTENSION_SRP = 26, + GNUTLS_EXTENSION_SRP = 12, GNUTLS_EXTENSION_INNER_APPLICATION = 37703 } extensions_t; |