diff options
author | miod <> | 2014-04-13 15:16:38 +0000 |
---|---|---|
committer | miod <> | 2014-04-13 15:16:38 +0000 |
commit | fea4fc3d16f04ff054803f9276895492961ab5e2 (patch) | |
tree | 5120067244554214f4a55a9b6f4ab44bca0a0438 /src/lib/libcrypto/srp/srp_vfy.c | |
parent | 293732ea9d538daf81033ab02d62cbe188088510 (diff) | |
download | openbsd-fea4fc3d16f04ff054803f9276895492961ab5e2.tar.gz openbsd-fea4fc3d16f04ff054803f9276895492961ab5e2.tar.bz2 openbsd-fea4fc3d16f04ff054803f9276895492961ab5e2.zip |
Import OpenSSL 1.0.1g
Diffstat (limited to 'src/lib/libcrypto/srp/srp_vfy.c')
-rw-r--r-- | src/lib/libcrypto/srp/srp_vfy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/srp/srp_vfy.c b/src/lib/libcrypto/srp/srp_vfy.c index c8be907d7f..4a3d13edf6 100644 --- a/src/lib/libcrypto/srp/srp_vfy.c +++ b/src/lib/libcrypto/srp/srp_vfy.c | |||
@@ -390,7 +390,7 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file) | |||
390 | } | 390 | } |
391 | for (i = 0; i < sk_OPENSSL_PSTRING_num(tmpdb->data); i++) | 391 | for (i = 0; i < sk_OPENSSL_PSTRING_num(tmpdb->data); i++) |
392 | { | 392 | { |
393 | pp = (char **)sk_OPENSSL_PSTRING_value(tmpdb->data,i); | 393 | pp = sk_OPENSSL_PSTRING_value(tmpdb->data,i); |
394 | if (pp[DB_srptype][0] == DB_SRP_INDEX) | 394 | if (pp[DB_srptype][0] == DB_SRP_INDEX) |
395 | { | 395 | { |
396 | /*we add this couple in the internal Stack */ | 396 | /*we add this couple in the internal Stack */ |
@@ -581,7 +581,8 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt, | |||
581 | if (*salt == NULL) | 581 | if (*salt == NULL) |
582 | { | 582 | { |
583 | char *tmp_salt; | 583 | char *tmp_salt; |
584 | if ((tmp_salt = (char *)OPENSSL_malloc(SRP_RANDOM_SALT_LEN * 2)) == NULL) | 584 | |
585 | if ((tmp_salt = OPENSSL_malloc(SRP_RANDOM_SALT_LEN * 2)) == NULL) | ||
585 | { | 586 | { |
586 | OPENSSL_free(vf); | 587 | OPENSSL_free(vf); |
587 | goto err; | 588 | goto err; |