[openssl-commits] [openssl] OpenSSL_1_0_2-stable update
Andy Polyakov
appro at openssl.org
Sat Mar 25 10:21:23 UTC 2017
The branch OpenSSL_1_0_2-stable has been updated
via cf5e259d5ba83e62b67ae8bf093f3ef1739812ed (commit)
from e704d91d273164074b21de348e86ace3e074419e (commit)
- Log -----------------------------------------------------------------
commit cf5e259d5ba83e62b67ae8bf093f3ef1739812ed
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date: Fri Mar 24 13:18:22 2017 +0100
Fixed a gcc-7-strict-warnings issue.
Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3026)
-----------------------------------------------------------------------
Summary of changes:
crypto/asn1/a_bitstr.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index f906188..c429342 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -114,10 +114,11 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
*(p++) = (unsigned char)bits;
d = a->data;
- memcpy(p, d, len);
- p += len;
- if (len > 0)
+ if (len > 0) {
+ memcpy(p, d, len);
+ p += len;
p[-1] &= (0xff << bits);
+ }
*pp = p;
return (ret);
}
More information about the openssl-commits
mailing list