diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-11-19 13:07:21 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-11-19 13:07:21 +0000 |
| commit | b58a168e293155fe11deada650d28fb6ac865781 (patch) | |
| tree | d4653c8fa152da2edcc5bf1d655552ecddc76f01 /lib/gnutls_handshake.c | |
| parent | fe1b1d18fa42e2162cc58da5bcc262d07dfb9b9b (diff) | |
| download | gnutls-b58a168e293155fe11deada650d28fb6ac865781.tar.gz | |
Added support for the DSS certificate SRP authenticated cipher suites (currently only with 3DES cipher). Cleaned up the client and server code, which was duplicated.
Diffstat (limited to 'lib/gnutls_handshake.c')
| -rw-r--r-- | lib/gnutls_handshake.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c index 6771fcb8a7..00dfd2a5c2 100644 --- a/lib/gnutls_handshake.c +++ b/lib/gnutls_handshake.c @@ -553,7 +553,7 @@ int _gnutls_server_select_suite(gnutls_session session, opaque *data, int datale if (x<=0) { gnutls_assert(); if (x<0) return x; - else return GNUTLS_E_INSUFICIENT_CREDENTIALS; + else return GNUTLS_E_UNKNOWN_CIPHER_SUITE; } #ifdef HANDSHAKE_DEBUG @@ -2389,6 +2389,7 @@ int _gnutls_remove_unwanted_ciphersuites(gnutls_session session, /* if it is defined but had no credentials */ if (_gnutls_get_kx_cred(session, kx, NULL) == NULL) { +fprintf(stderr, "HERE\n"); keep = 1; } else /* If there was no credentials to use with the specified @@ -2396,14 +2397,16 @@ int _gnutls_remove_unwanted_ciphersuites(gnutls_session session, */ if (_gnutls_map_kx_get_cred(kx, server) == GNUTLS_CRD_CERTIFICATE) { keep = 1; /* do not keep */ + +fprintf(stderr, "THERE %d\n", kx); if (x509_cred != NULL) { if (server) { /* here we check if the KX algorithm * is compatible with the certificate. */ -fprintf(stderr, "KX: %d\n", kx); for (j = 0; j < alg_size; j++) { -fprintf(stderr, "ALG: %d\n", alg[j]); +fprintf(stderr, "ALG %d\n", alg[j]); + if (alg[j] == kx) { keep = 0; break; |