diff options
author | beck <> | 2014-07-13 16:03:10 +0000 |
---|---|---|
committer | beck <> | 2014-07-13 16:03:10 +0000 |
commit | 6e4dfa23733fddf37830d1039cf31a2ffb86bdaf (patch) | |
tree | c2bbb8405534dcf838bc686b6748045284f3966b /src/lib/libcrypto/srp/srp_vfy.c | |
parent | 143b41eb184dd7da7b6f74162483016fbb5faab0 (diff) | |
download | openbsd-6e4dfa23733fddf37830d1039cf31a2ffb86bdaf.tar.gz openbsd-6e4dfa23733fddf37830d1039cf31a2ffb86bdaf.tar.bz2 openbsd-6e4dfa23733fddf37830d1039cf31a2ffb86bdaf.zip |
The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@
Diffstat (limited to 'src/lib/libcrypto/srp/srp_vfy.c')
-rw-r--r-- | src/lib/libcrypto/srp/srp_vfy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/srp/srp_vfy.c b/src/lib/libcrypto/srp/srp_vfy.c index 0981890086..6de843527d 100644 --- a/src/lib/libcrypto/srp/srp_vfy.c +++ b/src/lib/libcrypto/srp/srp_vfy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: srp_vfy.c,v 1.7 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: srp_vfy.c,v 1.8 2014/07/13 16:03:10 beck Exp $ */ |
2 | /* Written by Christophe Renou (christophe.renou@edelweb.fr) with | 2 | /* Written by Christophe Renou (christophe.renou@edelweb.fr) with |
3 | * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) | 3 | * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) |
4 | * for the EdelKey project and contributed to the OpenSSL project 2004. | 4 | * for the EdelKey project and contributed to the OpenSSL project 2004. |
@@ -218,9 +218,9 @@ static void SRP_user_pwd_set_gN(SRP_user_pwd *vinfo, const BIGNUM *g, | |||
218 | static int SRP_user_pwd_set_ids(SRP_user_pwd *vinfo, const char *id, | 218 | static int SRP_user_pwd_set_ids(SRP_user_pwd *vinfo, const char *id, |
219 | const char *info) | 219 | const char *info) |
220 | { | 220 | { |
221 | if (id != NULL && NULL == (vinfo->id = BUF_strdup(id))) | 221 | if (id != NULL && NULL == (vinfo->id = strdup(id))) |
222 | return 0; | 222 | return 0; |
223 | return (info == NULL || NULL != (vinfo->info = BUF_strdup(info))) ; | 223 | return (info == NULL || NULL != (vinfo->info = strdup(info))) ; |
224 | } | 224 | } |
225 | 225 | ||
226 | static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s, | 226 | static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s, |
@@ -261,7 +261,7 @@ SRP_VBASE *SRP_VBASE_new(char *seed_key) | |||
261 | vb->default_N = NULL; | 261 | vb->default_N = NULL; |
262 | vb->seed_key = NULL; | 262 | vb->seed_key = NULL; |
263 | if ((seed_key != NULL) && | 263 | if ((seed_key != NULL) && |
264 | (vb->seed_key = BUF_strdup(seed_key)) == NULL) | 264 | (vb->seed_key = strdup(seed_key)) == NULL) |
265 | { | 265 | { |
266 | sk_SRP_user_pwd_free(vb->users_pwd); | 266 | sk_SRP_user_pwd_free(vb->users_pwd); |
267 | sk_SRP_gN_cache_free(vb->gN_cache); | 267 | sk_SRP_gN_cache_free(vb->gN_cache); |