[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  5b7af0dd6c9315ca76fba16813b66f5792c7fe6e (commit)
      from  5b70372d5d26bc06a501b48caba2be9d59e855e4 (commit)


- Log -----------------------------------------------------------------
commit 5b7af0dd6c9315ca76fba16813b66f5792c7fe6e
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Mar 4 18:05:35 2016 +0100

    Curve25519: fix const-initialization
    
    Clang is permissive of this, but gcc fails.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/ec/curve25519.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/ec/curve25519.c b/crypto/ec/curve25519.c
index 7474b3c..3dbf4ac 100644
--- a/crypto/ec/curve25519.c
+++ b/crypto/ec/curve25519.c
@@ -62,10 +62,10 @@
  * context.  */
 typedef int32_t fe[10];
 
-static const int64_t kBottom25Bits = 0x1ffffff;
-static const int64_t kBottom26Bits = 0x3ffffff;
-static const int64_t kTop39Bits = ~kBottom25Bits;
-static const int64_t kTop38Bits = ~kBottom26Bits;
+static const int64_t kBottom25Bits = 0x1ffffffLL;
+static const int64_t kBottom26Bits = 0x3ffffffLL;
+static const int64_t kTop39Bits = 0xfffffffffe000000LL;
+static const int64_t kTop38Bits = 0xfffffffffc000000LL;
 
 static uint64_t load_3(const uint8_t *in) {
   uint64_t result;