diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-26 14:26:18 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-26 14:26:18 +0000 |
| commit | 2c34009656f3c6488ea38d09cdd6c60f892291dd (patch) | |
| tree | 6c293ee5b5ce1e4eb906c279eda6c3b7610f333a /lib | |
| parent | b7a18968e76a3d3dd4d58154b30aea25c34a10a9 (diff) | |
| download | gnutls-2c34009656f3c6488ea38d09cdd6c60f892291dd.tar.gz | |
Corrected session resuming in SRP ciphersuites.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnutls_handshake.c | 4 | ||||
| -rw-r--r-- | lib/pkix.asn | 2 | ||||
| -rw-r--r-- | lib/pkix_asn1_tab.c | 29 |
3 files changed, 31 insertions, 4 deletions
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c index 2cbe9a688f..8f7c4752b4 100644 --- a/lib/gnutls_handshake.c +++ b/lib/gnutls_handshake.c @@ -1634,7 +1634,9 @@ static int _gnutls_send_server_hello(gnutls_session session, int again) _gnutls_cipher_suite_get_kx_algo( &session->security_parameters.current_cipher_suite))) { - if (session->security_parameters.extensions.srp_username[0] == 0) { + if (session->internals.resumed == RESUME_FALSE && + session->security_parameters.extensions.srp_username[0] == 0) + { /* The peer didn't send a valid SRP extension with the * SRP username. The draft requires that we send an * alert and start the handshake again. diff --git a/lib/pkix.asn b/lib/pkix.asn index 95b6e32cc7..30dff8a7e9 100644 --- a/lib/pkix.asn +++ b/lib/pkix.asn @@ -853,7 +853,7 @@ TerminalType ::= INTEGER { g3-facsimile (5), g4-facsimile (6), ia5-terminal (7), - videotex (8) } (0..ub-integer-options) + videotex (8) } -- (0..ub-integer-options) -- Extension Domain-defined Attributes diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c index 14b06b12b0..c31c516258 100644 --- a/lib/pkix_asn1_tab.c +++ b/lib/pkix_asn1_tab.c @@ -418,6 +418,10 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={ {0,1073741825,"id-at"}, {0,1,"12"}, {"X520Title",1073741826,"DirectoryString"}, + {"id-at-description",1880096780,"AttributeType"}, + {0,1073741825,"id-at"}, + {0,1,"13"}, + {"X520Description",1073741826,"DirectoryString"}, {"id-at-dnQualifier",1880096780,"AttributeType"}, {0,1073741825,"id-at"}, {0,1,"46"}, @@ -427,10 +431,26 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={ {0,1,"6"}, {"X520countryName",1612709890,"PrintableString"}, {0,1048586,"2"}, + {"id-at-serialNumber",1880096780,"AttributeType"}, + {0,1073741825,"id-at"}, + {0,1,"5"}, + {"X520serialNumber",1073741826,"PrintableString"}, + {"id-at-telephoneNumber",1880096780,"AttributeType"}, + {0,1073741825,"id-at"}, + {0,1,"20"}, + {"X520telephoneNumber",1073741826,"PrintableString"}, + {"id-at-facsimileTelephoneNumber",1880096780,"AttributeType"}, + {0,1073741825,"id-at"}, + {0,1,"23"}, + {"X520facsimileTelephoneNumber",1073741826,"PrintableString"}, {"id-at-pseudonym",1880096780,"AttributeType"}, {0,1073741825,"id-at"}, {0,1,"65"}, {"X520pseudonym",1073741826,"DirectoryString"}, + {"id-at-name",1880096780,"AttributeType"}, + {0,1073741825,"id-at"}, + {0,1,"41"}, + {"X520name",1073741826,"DirectoryString"}, {"id-at-streetAddress",1880096780,"AttributeType"}, {0,1073741825,"id-at"}, {0,1,"9"}, @@ -764,8 +784,13 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={ {"MAX",1074266122,"1"}, {0,7,0}, {"terminal-type",1342177283,"23"}, - {"TerminalType",1611137027,0}, - {"0",10,"ub-integer-options"}, + {"TerminalType",1610874883,0}, + {"telex",1073741825,"3"}, + {"teletex",1073741825,"4"}, + {"g3-facsimile",1073741825,"5"}, + {"g4-facsimile",1073741825,"6"}, + {"ia5-terminal",1073741825,"7"}, + {"videotex",1,"8"}, {"teletex-domain-defined-attributes",1342177283,"6"}, {"TeletexDomainDefinedAttributes",1612709899,0}, {"ub-domain-defined-attributes",1074266122,"1"}, |