diff options
| author |   bcook <bcook@openbsd.org> | 2016-07-17 22:01:01 +0000 |
|---|---|---|
| committer | bcook <bcook@openbsd.org> | 2016-07-17 22:01:01 +0000 |
| commit | 4b91da1e08f0f46e0d534e0d8609f8a18d993fe4 (patch) | |
| tree | 2dce0dff5bb76b158be84e1f9d5e25eeb6b3b354 | |
| parent | remove unused OPENSSL_NO_OBJECT case (diff) | |
| download | wireguard-openbsd-4b91da1e08f0f46e0d534e0d8609f8a18d993fe4.tar.xz wireguard-openbsd-4b91da1e08f0f46e0d534e0d8609f8a18d993fe4.zip | |
use memset to initialize the union
| -rw-r--r-- | lib/libcrypto/bn/bn_nist.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/bn/bn_nist.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/libcrypto/bn/bn_nist.c b/lib/libcrypto/bn/bn_nist.c index 44bf0cb0ce3..9a0970138d6 100644 --- a/lib/libcrypto/bn/bn_nist.c +++ b/lib/libcrypto/bn/bn_nist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_nist.c,v 1.16 2016/07/17 21:21:40 bcook Exp $ */ +/* $OpenBSD: bn_nist.c,v 1.17 2016/07/17 22:01:01 bcook Exp $ */ /* * Written by Nils Larsch for the OpenSSL project */ @@ -59,6 +59,7 @@ #include <machine/endian.h> #include <stdint.h> +#include <string.h> #include "bn_lcl.h" @@ -568,7 +569,8 @@ BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx) BN_ULONG bn[BN_NIST_224_TOP]; unsigned int ui[BN_NIST_224_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)]; - } buf = {0}; + } buf; + memset(&buf, 0, sizeof(buf)); BN_ULONG c_d[BN_NIST_224_TOP], *res; uintptr_t mask; union { diff --git a/lib/libssl/src/crypto/bn/bn_nist.c b/lib/libssl/src/crypto/bn/bn_nist.c index 44bf0cb0ce3..9a0970138d6 100644 --- a/lib/libssl/src/crypto/bn/bn_nist.c +++ b/lib/libssl/src/crypto/bn/bn_nist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_nist.c,v 1.16 2016/07/17 21:21:40 bcook Exp $ */ +/* $OpenBSD: bn_nist.c,v 1.17 2016/07/17 22:01:01 bcook Exp $ */ /* * Written by Nils Larsch for the OpenSSL project */ @@ -59,6 +59,7 @@ #include <machine/endian.h> #include <stdint.h> +#include <string.h> #include "bn_lcl.h" @@ -568,7 +569,8 @@ BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx) BN_ULONG bn[BN_NIST_224_TOP]; unsigned int ui[BN_NIST_224_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)]; - } buf = {0}; + } buf; + memset(&buf, 0, sizeof(buf)); BN_ULONG c_d[BN_NIST_224_TOP], *res; uintptr_t mask; union { |