diff options
| author |   mmcc <mmcc@openbsd.org> | 2016-03-21 04:05:33 +0000 |
|---|---|---|
| committer | mmcc <mmcc@openbsd.org> | 2016-03-21 04:05:33 +0000 |
| commit | ec3bd58c2c6f2d54c5c15bb96eaa064fcbf407cf (patch) | |
| tree | 5451c2f0e0de49e19e9d9de24e56eeecdfa3f552 /lib/libssl/src | |
| parent | Provide _dlctl(), an alternate name for dlctl() that's in the reserved (diff) | |
| download | wireguard-openbsd-ec3bd58c2c6f2d54c5c15bb96eaa064fcbf407cf.tar.xz wireguard-openbsd-ec3bd58c2c6f2d54c5c15bb96eaa064fcbf407cf.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 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/x509/x509_att.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/x509/x509_v3.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/src/crypto/x509/x509_att.c b/lib/libssl/src/crypto/x509/x509_att.c index 5e5cf4e3843..ab11e79b0af 100644 --- a/lib/libssl/src/crypto/x509/x509_att.c +++ b/lib/libssl/src/crypto/x509/x509_att.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_att.c,v 1.13 2014/09/29 16:20:40 miod Exp $ */ +/* $OpenBSD: x509_att.c,v 1.14 2016/03/21 04:05:33 mmcc Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -297,7 +297,7 @@ X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj) return (0); ASN1_OBJECT_free(attr->object); attr->object = OBJ_dup(obj); - return (1); + return attr->object != NULL; } int diff --git a/lib/libssl/src/crypto/x509/x509_v3.c b/lib/libssl/src/crypto/x509/x509_v3.c index a9f3fdb10ef..d9ec9c8c14b 100644 --- a/lib/libssl/src/crypto/x509/x509_v3.c +++ b/lib/libssl/src/crypto/x509/x509_v3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_v3.c,v 1.12 2015/07/29 14:58:34 jsing Exp $ */ +/* $OpenBSD: x509_v3.c,v 1.13 2016/03/21 04:05:33 mmcc Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -248,7 +248,7 @@ X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj) return (0); ASN1_OBJECT_free(ex->object); ex->object = OBJ_dup(obj); - return (1); + return ex->object != NULL; } int |