[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d728f0f5f28c9c5347ac371373e3cd4cb350760f (commit)
      from  4d60c7e10f1d7ebe34842f96e13b64db7fc2dc1b (commit)


- Log -----------------------------------------------------------------
commit d728f0f5f28c9c5347ac371373e3cd4cb350760f
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Sep 8 23:24:36 2015 -0400

    RT3993: Fix error found by VS2008
    
    Cast and then negate, don't negate an unsigned.
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/a_int.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 0d020e0..5d5e7f6 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -338,7 +338,7 @@ static int asn1_get_int64(int64_t *pr, const unsigned char *b, size_t blen,
             ASN1err(ASN1_F_ASN1_GET_INT64, ASN1_R_TOO_SMALL);
             return 0;
         }
-        *pr = (int64_t)-r;
+        *pr = -(int64_t)r;
     } else {
         if (r > INT64_MAX) {
             ASN1err(ASN1_F_ASN1_GET_INT64, ASN1_R_TOO_LARGE);