bn_nist.c: fix strict-aliasing compiler warning.

diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index 86bb0429f3e817e8ebf51504bd5eaa9523b71756..cf6013a6099b1f7577ddf7f8f8525d51d69c147d 100644 (file)
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c
@@ -366,7 +366,6 @@ static void nist_cp_bn(BN_ULONG *buf, BN_ULONG *a, int top)
 # endif
 #endif /* BN_BITS2 != 64 */
 
 # endif
 #endif /* BN_BITS2 != 64 */
 

-

 #define nist_set_192(to, from, a1, a2, a3) \
        { \
        bn_cp_64(to, 0, from, (a3) - 3) \
 #define nist_set_192(to, from, a1, a2, a3) \
        { \
        bn_cp_64(to, 0, from, (a3) - 3) \


@@ -380,8 +379,11 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        int      top = a->top, i;
        int      carry;
        register BN_ULONG *r_d, *a_d = a->d;
        int      top = a->top, i;
        int      carry;
        register BN_ULONG *r_d, *a_d = a->d;

-       BN_ULONG buf[BN_NIST_192_TOP],
-                c_d[BN_NIST_192_TOP],
+       union   {
+               BN_ULONG        bn[BN_NIST_192_TOP];
+               unsigned int    ui[BN_NIST_192_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)];
+               } buf;
+       BN_ULONG c_d[BN_NIST_192_TOP],

                *res;
        PTR_SIZE_INT mask;
        static const BIGNUM _bignum_nist_p_192_sqr = {
                *res;
        PTR_SIZE_INT mask;
        static const BIGNUM _bignum_nist_p_192_sqr = {


@@ -414,13 +416,13 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        else
                r_d = a_d;
 
        else
                r_d = a_d;
 

-       nist_cp_bn_0(buf, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP, BN_NIST_192_TOP);
+       nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP, BN_NIST_192_TOP);

 
 #if defined(NIST_INT64)
        {
        NIST_INT64              acc;    /* accumulator */
        unsigned int            *rp=(unsigned int *)r_d;
 
 #if defined(NIST_INT64)
        {
        NIST_INT64              acc;    /* accumulator */
        unsigned int            *rp=(unsigned int *)r_d;

-       const unsigned int      *bp=(const unsigned int *)buf;
+       const unsigned int      *bp=(const unsigned int *)buf.ui;

 
        acc  = rp[0];   acc += bp[3*2-6];
                        acc += bp[5*2-6]; rp[0] = (unsigned int)acc; acc >>= 32;
 
        acc  = rp[0];   acc += bp[3*2-6];
                        acc += bp[5*2-6]; rp[0] = (unsigned int)acc; acc >>= 32;


@@ -448,11 +450,11 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        {
        BN_ULONG t_d[BN_NIST_192_TOP];
 
        {
        BN_ULONG t_d[BN_NIST_192_TOP];
 

-       nist_set_192(t_d, buf, 0, 3, 3);
+       nist_set_192(t_d, buf.bn, 0, 3, 3);

        carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
        carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);

-       nist_set_192(t_d, buf, 4, 4, 0);
+       nist_set_192(t_d, buf.bn, 4, 4, 0);

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);

-       nist_set_192(t_d, buf, 5, 5, 5)
+       nist_set_192(t_d, buf.bn, 5, 5, 5)

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
        }
 #endif
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
        }
 #endif


@@ -651,8 +653,11 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        int     i, top = a->top;
        int     carry = 0;
        register BN_ULONG *a_d = a->d, *r_d;
        int     i, top = a->top;
        int     carry = 0;
        register BN_ULONG *a_d = a->d, *r_d;

-       BN_ULONG buf[BN_NIST_256_TOP],
-                c_d[BN_NIST_256_TOP],
+       union   {
+               BN_ULONG bn[BN_NIST_256_TOP];
+               unsigned int ui[BN_NIST_256_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)];
+               } buf;
+       BN_ULONG c_d[BN_NIST_256_TOP],

                *res;
        PTR_SIZE_INT mask;
        union { bn_addsub_f f; PTR_SIZE_INT p; } u;
                *res;
        PTR_SIZE_INT mask;
        union { bn_addsub_f f; PTR_SIZE_INT p; } u;


@@ -686,13 +691,13 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        else
                r_d = a_d;
 
        else
                r_d = a_d;
 

-       nist_cp_bn_0(buf, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP, BN_NIST_256_TOP);
+       nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP, BN_NIST_256_TOP);

 
 #if defined(NIST_INT64)
        {
        NIST_INT64              acc;    /* accumulator */
        unsigned int            *rp=(unsigned int *)r_d;
 
 #if defined(NIST_INT64)
        {
        NIST_INT64              acc;    /* accumulator */
        unsigned int            *rp=(unsigned int *)r_d;

-       const unsigned int      *bp=(const unsigned int *)buf;
+       const unsigned int      *bp=(const unsigned int *)buf.ui;

 
        acc = rp[0];    acc += bp[8-8];
                        acc += bp[9-8];
 
        acc = rp[0];    acc += bp[8-8];
                        acc += bp[9-8];


@@ -764,9 +769,9 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        BN_ULONG t_d[BN_NIST_256_TOP];
 
        /*S1*/
        BN_ULONG t_d[BN_NIST_256_TOP];
 
        /*S1*/

-       nist_set_256(t_d, buf, 15, 14, 13, 12, 11, 0, 0, 0);
+       nist_set_256(t_d, buf.bn, 15, 14, 13, 12, 11, 0, 0, 0);

        /*S2*/
        /*S2*/

-       nist_set_256(c_d, buf, 0, 15, 14, 13, 12, 0, 0, 0);
+       nist_set_256(c_d, buf.bn, 0, 15, 14, 13, 12, 0, 0, 0);

        carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
        /* left shift */
                {
        carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
        /* left shift */
                {


@@ -784,22 +789,22 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                }
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*S3*/
                }
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*S3*/

-       nist_set_256(t_d, buf, 15, 14, 0, 0, 0, 10, 9, 8);
+       nist_set_256(t_d, buf.bn, 15, 14, 0, 0, 0, 10, 9, 8);

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*S4*/
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*S4*/

-       nist_set_256(t_d, buf, 8, 13, 15, 14, 13, 11, 10, 9);
+       nist_set_256(t_d, buf.bn, 8, 13, 15, 14, 13, 11, 10, 9);

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D1*/
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D1*/

-       nist_set_256(t_d, buf, 10, 8, 0, 0, 0, 13, 12, 11);
+       nist_set_256(t_d, buf.bn, 10, 8, 0, 0, 0, 13, 12, 11);

        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D2*/
        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D2*/

-       nist_set_256(t_d, buf, 11, 9, 0, 0, 15, 14, 13, 12);
+       nist_set_256(t_d, buf.bn, 11, 9, 0, 0, 15, 14, 13, 12);

        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D3*/
        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D3*/

-       nist_set_256(t_d, buf, 12, 0, 10, 9, 8, 15, 14, 13);
+       nist_set_256(t_d, buf.bn, 12, 0, 10, 9, 8, 15, 14, 13);

        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D4*/
        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
        /*D4*/

-       nist_set_256(t_d, buf, 13, 0, 11, 10, 9, 0, 15, 14);
+       nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14);

        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
 
        }
        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
 
        }


@@ -851,8 +856,11 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        int     i, top = a->top;
        int     carry = 0;
        register BN_ULONG *r_d, *a_d = a->d;
        int     i, top = a->top;
        int     carry = 0;
        register BN_ULONG *r_d, *a_d = a->d;

-       BN_ULONG buf[BN_NIST_384_TOP],
-                c_d[BN_NIST_384_TOP],
+       union   {
+               BN_ULONG bn[BN_NIST_384_TOP];
+               unsigned int ui[BN_NIST_384_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)];
+               } buf;
+       BN_ULONG c_d[BN_NIST_384_TOP],

                *res;
        PTR_SIZE_INT mask;
        union { bn_addsub_f f; PTR_SIZE_INT p; } u;
                *res;
        PTR_SIZE_INT mask;
        union { bn_addsub_f f; PTR_SIZE_INT p; } u;


@@ -887,13 +895,13 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        else
                r_d = a_d;
 
        else
                r_d = a_d;
 

-       nist_cp_bn_0(buf, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP, BN_NIST_384_TOP);
+       nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP, BN_NIST_384_TOP);

 
 #if defined(NIST_INT64)
        {
        NIST_INT64              acc;    /* accumulator */
        unsigned int            *rp=(unsigned int *)r_d;
 
 #if defined(NIST_INT64)
        {
        NIST_INT64              acc;    /* accumulator */
        unsigned int            *rp=(unsigned int *)r_d;

-       const unsigned int      *bp=(const unsigned int *)buf;
+       const unsigned int      *bp=(const unsigned int *)buf.ui;

 
        acc = rp[0];    acc += bp[12-12];
                        acc += bp[21-12];
 
        acc = rp[0];    acc += bp[12-12];
                        acc += bp[21-12];


@@ -980,7 +988,7 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        BN_ULONG t_d[BN_NIST_384_TOP];
 
        /*S1*/
        BN_ULONG t_d[BN_NIST_384_TOP];
 
        /*S1*/

-       nist_set_256(t_d, buf, 0, 0, 0, 0, 0, 23-4, 22-4, 21-4);
+       nist_set_256(t_d, buf.bn, 0, 0, 0, 0, 0, 23-4, 22-4, 21-4);

                /* left shift */
                {
                register BN_ULONG *ap,t,c;
                /* left shift */
                {
                register BN_ULONG *ap,t,c;


@@ -997,27 +1005,27 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
        carry = (int)bn_add_words(r_d+(128/BN_BITS2), r_d+(128/BN_BITS2), 
                t_d, BN_NIST_256_TOP);
        /*S2 */
        carry = (int)bn_add_words(r_d+(128/BN_BITS2), r_d+(128/BN_BITS2), 
                t_d, BN_NIST_256_TOP);
        /*S2 */

-       carry += (int)bn_add_words(r_d, r_d, buf, BN_NIST_384_TOP);
+       carry += (int)bn_add_words(r_d, r_d, buf.bn, BN_NIST_384_TOP);

        /*S3*/
        /*S3*/

-       nist_set_384(t_d,buf,20,19,18,17,16,15,14,13,12,23,22,21);
+       nist_set_384(t_d,buf.bn,20,19,18,17,16,15,14,13,12,23,22,21);

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*S4*/
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*S4*/

-       nist_set_384(t_d,buf,19,18,17,16,15,14,13,12,20,0,23,0);
+       nist_set_384(t_d,buf.bn,19,18,17,16,15,14,13,12,20,0,23,0);

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*S5*/
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*S5*/

-       nist_set_384(t_d, buf,0,0,0,0,23,22,21,20,0,0,0,0);
+       nist_set_384(t_d, buf.bn,0,0,0,0,23,22,21,20,0,0,0,0);

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*S6*/
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*S6*/

-       nist_set_384(t_d,buf,0,0,0,0,0,0,23,22,21,0,0,20);
+       nist_set_384(t_d,buf.bn,0,0,0,0,0,0,23,22,21,0,0,20);

        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*D1*/
        carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*D1*/

-       nist_set_384(t_d,buf,22,21,20,19,18,17,16,15,14,13,12,23);
+       nist_set_384(t_d,buf.bn,22,21,20,19,18,17,16,15,14,13,12,23);

        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*D2*/
        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*D2*/

-       nist_set_384(t_d,buf,0,0,0,0,0,0,0,23,22,21,20,0);
+       nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,22,21,20,0);

        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*D3*/
        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
        /*D3*/

-       nist_set_384(t_d,buf,0,0,0,0,0,0,0,23,23,0,0,0);
+       nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,23,0,0,0);

        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
 
        }
        carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
 
        }