diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-05-10 12:51:48 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-05-10 12:51:48 +0000 |
| commit | cdc70acc5ea495c7f0e33d90748fa91c25311523 (patch) | |
| tree | 7b5fa4da6036db39fe7f6158f4664f6a279ec34e | |
| parent | 9509af0e791b74538de8ffa8dd0d47c05cb08eed (diff) | |
| parent | 0bdca5d51f203cf414d645e75ac197e3fadfadc8 (diff) | |
| download | gnutls-cdc70acc5ea495c7f0e33d90748fa91c25311523.tar.gz | |
Merge branch 'tmp-fix-srp' into 'master'
_gnutls_srp_entry_free: follow consistent behavior in freeing data
Closes #761
See merge request gnutls/gnutls!995
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/auth/srp_passwd.c | 12 |
2 files changed, 11 insertions, 4 deletions
@@ -11,6 +11,9 @@ See the end for copying conditions. ** libgnutls: Added new function to retrieve early keying material (#329) +** libgnutls: the gnutls_srp_set_server_credentials_function can be used + with the 8192 parameters as well (#995). + ** API and ABI modifications: gnutls_prf_early: Added diff --git a/lib/auth/srp_passwd.c b/lib/auth/srp_passwd.c index ad1937c962..6902be3d26 100644 --- a/lib/auth/srp_passwd.c +++ b/lib/auth/srp_passwd.c @@ -447,20 +447,24 @@ void _gnutls_srp_entry_free(SRP_PWD_ENTRY * entry) _gnutls_free_key_datum(&entry->v); _gnutls_free_datum(&entry->salt); - if ((entry->g.data != gnutls_srp_1024_group_generator.data) - && (entry->g.data != gnutls_srp_3072_group_generator.data)) + if ((entry->g.data != gnutls_srp_1024_group_generator.data) && + (entry->g.data != gnutls_srp_1536_group_generator.data) && + (entry->g.data != gnutls_srp_2048_group_generator.data) && + (entry->g.data != gnutls_srp_3072_group_generator.data) && + (entry->g.data != gnutls_srp_4096_group_generator.data) && + (entry->g.data != gnutls_srp_8192_group_generator.data)) _gnutls_free_datum(&entry->g); if (entry->n.data != gnutls_srp_1024_group_prime.data && entry->n.data != gnutls_srp_1536_group_prime.data && entry->n.data != gnutls_srp_2048_group_prime.data && entry->n.data != gnutls_srp_3072_group_prime.data && - entry->n.data != gnutls_srp_4096_group_prime.data) + entry->n.data != gnutls_srp_4096_group_prime.data && + entry->n.data != gnutls_srp_8192_group_prime.data) _gnutls_free_datum(&entry->n); gnutls_free(entry->username); gnutls_free(entry); } - #endif /* ENABLE SRP */ |