summaryrefslogtreecommitdiff
path: root/src/util/srp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/srp.cpp')
-rw-r--r--src/util/srp.cpp31
1 files changed, 19 insertions, 12 deletions
diff --git a/src/util/srp.cpp b/src/util/srp.cpp
index 6fafe8280..0d3ddf278 100644
--- a/src/util/srp.cpp
+++ b/src/util/srp.cpp
@@ -166,6 +166,15 @@ static struct NGHex global_Ng_constants[] = {
};
+static void delete_ng(NGConstant *ng)
+{
+ if (ng) {
+ mpz_clear(ng->N);
+ mpz_clear(ng->g);
+ free(ng);
+ }
+}
+
static NGConstant *new_ng( SRP_NGType ng_type, const char *n_hex, const char *g_hex )
{
NGConstant *ng = (NGConstant *) malloc(sizeof(NGConstant));
@@ -180,21 +189,17 @@ static NGConstant *new_ng( SRP_NGType ng_type, const char *n_hex, const char *g_
g_hex = global_Ng_constants[ ng_type ].g_hex;
}
- mpz_set_str(ng->N, n_hex, 16);
- mpz_set_str(ng->g, g_hex, 16);
-
- return ng;
-}
+ int rv = 0;
+ rv = mpz_set_str(ng->N, n_hex, 16);
+ rv = rv | mpz_set_str(ng->g, g_hex, 16);
-static void delete_ng( NGConstant *ng )
-{
- if (ng) {
- mpz_clear(ng->N);
- mpz_clear(ng->g);
- free(ng);
+ if (rv) {
+ delete_ng(ng);
+ return 0;
}
-}
+ return ng;
+}
typedef union
@@ -849,6 +854,8 @@ err_exit:
mpz_clear(usr->a);
mpz_clear(usr->A);
mpz_clear(usr->S);
+ if (usr->ng)
+ delete_ng(usr->ng);
if (usr->username)
free(usr->username);
if (usr->username_verifier)