diff options
author | mmcc <> | 2016-03-21 04:05:33 +0000 |
---|---|---|
committer | mmcc <> | 2016-03-21 04:05:33 +0000 |
commit | 3cdab73e59c45735c6b5ca1721098e912982895e (patch) | |
tree | 622312da1088c9243f08ffd8a388233deeceda09 /src | |
parent | b0d59af38cf8802ece4b23a2ed7c6271dd75137b (diff) | |
download | openbsd-3cdab73e59c45735c6b5ca1721098e912982895e.tar.gz openbsd-3cdab73e59c45735c6b5ca1721098e912982895e.tar.bz2 openbsd-3cdab73e59c45735c6b5ca1721098e912982895e.zip |
Return zero from two functions on allocation failure instead of always
returning one (indicating success). Each function has only a single
usage, and both usages check the return value.
Merged from BoringSSL 0ce78a757d815c0dde9ed5884229f3a5b2cb3e9c:
https://boringssl.googlesource.com/boringssl/+/0ce78a757d815c0dde9ed5884229f3a5b2cb3e9c%5E!/#F0
ok beck@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/x509/x509_att.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_v3.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509/x509_att.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509/x509_v3.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c index 5e5cf4e384..ab11e79b0a 100644 --- a/src/lib/libcrypto/x509/x509_att.c +++ b/src/lib/libcrypto/x509/x509_att.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_att.c,v 1.13 2014/09/29 16:20:40 miod Exp $ */ | 1 | /* $OpenBSD: x509_att.c,v 1.14 2016/03/21 04:05:33 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -297,7 +297,7 @@ X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj) | |||
297 | return (0); | 297 | return (0); |
298 | ASN1_OBJECT_free(attr->object); | 298 | ASN1_OBJECT_free(attr->object); |
299 | attr->object = OBJ_dup(obj); | 299 | attr->object = OBJ_dup(obj); |
300 | return (1); | 300 | return attr->object != NULL; |
301 | } | 301 | } |
302 | 302 | ||
303 | int | 303 | int |
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c index a9f3fdb10e..d9ec9c8c14 100644 --- a/src/lib/libcrypto/x509/x509_v3.c +++ b/src/lib/libcrypto/x509/x509_v3.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_v3.c,v 1.12 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: x509_v3.c,v 1.13 2016/03/21 04:05:33 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -248,7 +248,7 @@ X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj) | |||
248 | return (0); | 248 | return (0); |
249 | ASN1_OBJECT_free(ex->object); | 249 | ASN1_OBJECT_free(ex->object); |
250 | ex->object = OBJ_dup(obj); | 250 | ex->object = OBJ_dup(obj); |
251 | return (1); | 251 | return ex->object != NULL; |
252 | } | 252 | } |
253 | 253 | ||
254 | int | 254 | int |
diff --git a/src/lib/libssl/src/crypto/x509/x509_att.c b/src/lib/libssl/src/crypto/x509/x509_att.c index 5e5cf4e384..ab11e79b0a 100644 --- a/src/lib/libssl/src/crypto/x509/x509_att.c +++ b/src/lib/libssl/src/crypto/x509/x509_att.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_att.c,v 1.13 2014/09/29 16:20:40 miod Exp $ */ | 1 | /* $OpenBSD: x509_att.c,v 1.14 2016/03/21 04:05:33 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -297,7 +297,7 @@ X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj) | |||
297 | return (0); | 297 | return (0); |
298 | ASN1_OBJECT_free(attr->object); | 298 | ASN1_OBJECT_free(attr->object); |
299 | attr->object = OBJ_dup(obj); | 299 | attr->object = OBJ_dup(obj); |
300 | return (1); | 300 | return attr->object != NULL; |
301 | } | 301 | } |
302 | 302 | ||
303 | int | 303 | int |
diff --git a/src/lib/libssl/src/crypto/x509/x509_v3.c b/src/lib/libssl/src/crypto/x509/x509_v3.c index a9f3fdb10e..d9ec9c8c14 100644 --- a/src/lib/libssl/src/crypto/x509/x509_v3.c +++ b/src/lib/libssl/src/crypto/x509/x509_v3.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_v3.c,v 1.12 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: x509_v3.c,v 1.13 2016/03/21 04:05:33 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -248,7 +248,7 @@ X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj) | |||
248 | return (0); | 248 | return (0); |
249 | ASN1_OBJECT_free(ex->object); | 249 | ASN1_OBJECT_free(ex->object); |
250 | ex->object = OBJ_dup(obj); | 250 | ex->object = OBJ_dup(obj); |
251 | return (1); | 251 | return ex->object != NULL; |
252 | } | 252 | } |
253 | 253 | ||
254 | int | 254 | int |