summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiod <>2015-05-20 04:33:35 +0000
committermiod <>2015-05-20 04:33:35 +0000
commiteb7adbe13b0deaf406d9e40f680e68c8b650e0c9 (patch)
treed231c0996a9e92e3478b69629fef7c40f2d88d40 /src
parent9c96fd790399439730561da51272b5233c07a63d (diff)
downloadopenbsd-eb7adbe13b0deaf406d9e40f680e68c8b650e0c9.tar.gz
openbsd-eb7adbe13b0deaf406d9e40f680e68c8b650e0c9.tar.bz2
openbsd-eb7adbe13b0deaf406d9e40f680e68c8b650e0c9.zip
No need to check the return value of memcpy() if you actually checked this
pointer for NULL the line above; ok doug@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c5
-rw-r--r--src/lib/libssl/src/crypto/ec/ec_lib.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index d36c2c2e6e..a12a2ffbb6 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_lib.c,v 1.17 2015/04/29 00:11:12 doug Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.18 2015/05/20 04:33:35 miod Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -216,8 +216,7 @@ EC_GROUP_copy(EC_GROUP * dest, const EC_GROUP * src)
216 dest->seed = malloc(src->seed_len); 216 dest->seed = malloc(src->seed_len);
217 if (dest->seed == NULL) 217 if (dest->seed == NULL)
218 return 0; 218 return 0;
219 if (!memcpy(dest->seed, src->seed, src->seed_len)) 219 memcpy(dest->seed, src->seed, src->seed_len);
220 return 0;
221 dest->seed_len = src->seed_len; 220 dest->seed_len = src->seed_len;
222 } else { 221 } else {
223 free(dest->seed); 222 free(dest->seed);
diff --git a/src/lib/libssl/src/crypto/ec/ec_lib.c b/src/lib/libssl/src/crypto/ec/ec_lib.c
index d36c2c2e6e..a12a2ffbb6 100644
--- a/src/lib/libssl/src/crypto/ec/ec_lib.c
+++ b/src/lib/libssl/src/crypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_lib.c,v 1.17 2015/04/29 00:11:12 doug Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.18 2015/05/20 04:33:35 miod Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -216,8 +216,7 @@ EC_GROUP_copy(EC_GROUP * dest, const EC_GROUP * src)
216 dest->seed = malloc(src->seed_len); 216 dest->seed = malloc(src->seed_len);
217 if (dest->seed == NULL) 217 if (dest->seed == NULL)
218 return 0; 218 return 0;
219 if (!memcpy(dest->seed, src->seed, src->seed_len)) 219 memcpy(dest->seed, src->seed, src->seed_len);
220 return 0;
221 dest->seed_len = src->seed_len; 220 dest->seed_len = src->seed_len;
222 } else { 221 } else {
223 free(dest->seed); 222 free(dest->seed);