Commit 191570d0 authored by Shane Lontis's avatar Shane Lontis Committed by Richard Levitte
Browse files

fix truncation of integers on 32bit AIX 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8417)

(cherry picked from commit 98f29466)
parent d38ef8c8

crypto/blake2/blake2b.c

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ 


static const uint64_t blake2b_IV[8] =

{

    0x6a09e667f3bcc908U, 0xbb67ae8584caa73bU,

    0x3c6ef372fe94f82bU, 0xa54ff53a5f1d36f1U,

    0x510e527fade682d1U, 0x9b05688c2b3e6c1fU,

    0x1f83d9abfb41bd6bU, 0x5be0cd19137e2179U

    0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,

    0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,

    0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,

    0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL

};



static const uint8_t blake2b_sigma[12][16] =

crypto/ec/curve448/curve448.c

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
static const curve448_scalar_t precomputed_scalarmul_adjustment = {

    {

        {

            SC_LIMB(0xc873d6d54a7bb0cf), SC_LIMB(0xe933d8d723a70aad),

            SC_LIMB(0xbb124b65129c96fd), SC_LIMB(0x00000008335dc163)

            SC_LIMB(0xc873d6d54a7bb0cfULL), SC_LIMB(0xe933d8d723a70aadULL),

            SC_LIMB(0xbb124b65129c96fdULL), SC_LIMB(0x00000008335dc163ULL)

        }

    }

};

crypto/ec/curve448/curve448_tables.c

+1423 −415

File changed.

Preview size limit exceeded, changes collapsed.

crypto/ec/curve448/f_generic.c

+3 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
#include "field.h"



static const gf MODULUS = {

    FIELD_LITERAL(0xffffffffffffff, 0xffffffffffffff, 0xffffffffffffff,

                  0xffffffffffffff, 0xfffffffffffffe, 0xffffffffffffff,

                  0xffffffffffffff, 0xffffffffffffff)

    FIELD_LITERAL(0xffffffffffffffULL, 0xffffffffffffffULL, 0xffffffffffffffULL,

                  0xffffffffffffffULL, 0xfffffffffffffeULL, 0xffffffffffffffULL,

                  0xffffffffffffffULL, 0xffffffffffffffULL)

};



/* Serialize to wire format. */

crypto/ec/curve448/scalar.c

+9 −9
Original line number Diff line number Diff line
@@ -14,24 +14,24 @@ 
#include "word.h"

#include "point_448.h"



static const c448_word_t MONTGOMERY_FACTOR = (c448_word_t) 0x3bd440fae918bc5;

static const c448_word_t MONTGOMERY_FACTOR = (c448_word_t) 0x3bd440fae918bc5ULL;

static const curve448_scalar_t sc_p = {

    {

        {

            SC_LIMB(0x2378c292ab5844f3), SC_LIMB(0x216cc2728dc58f55),

            SC_LIMB(0xc44edb49aed63690), SC_LIMB(0xffffffff7cca23e9),

            SC_LIMB(0xffffffffffffffff), SC_LIMB(0xffffffffffffffff),

            SC_LIMB(0x3fffffffffffffff)

            SC_LIMB(0x2378c292ab5844f3ULL), SC_LIMB(0x216cc2728dc58f55ULL),

            SC_LIMB(0xc44edb49aed63690ULL), SC_LIMB(0xffffffff7cca23e9ULL),

            SC_LIMB(0xffffffffffffffffULL), SC_LIMB(0xffffffffffffffffULL),

            SC_LIMB(0x3fffffffffffffffULL)

        }

    }

}, sc_r2 = {

    {

        {



            SC_LIMB(0xe3539257049b9b60), SC_LIMB(0x7af32c4bc1b195d9),

            SC_LIMB(0x0d66de2388ea1859), SC_LIMB(0xae17cf725ee4d838),

            SC_LIMB(0x1a9cc14ba3c47c44), SC_LIMB(0x2052bcb7e4d070af),

            SC_LIMB(0x3402a939f823b729)

            SC_LIMB(0xe3539257049b9b60ULL), SC_LIMB(0x7af32c4bc1b195d9ULL),

            SC_LIMB(0x0d66de2388ea1859ULL), SC_LIMB(0xae17cf725ee4d838ULL),

            SC_LIMB(0x1a9cc14ba3c47c44ULL), SC_LIMB(0x2052bcb7e4d070afULL),

            SC_LIMB(0x3402a939f823b729ULL)

        }

    }

};