Commit e1e7dc50 authored by Andy Polyakov's avatar Andy Polyakov Committed by Matt Caswell
Browse files

ec/ecp_nistz256.c: harmonize with latest indent script. 



Conflicts:
	crypto/ec/ecp_nistz256.c

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent cc4cd821

crypto/ec/ecp_nistz256.c

+59 −60
Original line number Diff line number Diff line
@@ -303,17 +303,17 @@ static void ecp_nistz256_point_add(P256_POINT * r, 


    /* We encode infinity as (0,0), which is not on the curve,

     * so it is OK. */

    in1infty = in1_x[0] | in1_x[1] | in1_x[2] | in1_x[3] |

               in1_y[0] | in1_y[1] | in1_y[2] | in1_y[3];

    in1infty = (in1_x[0] | in1_x[1] | in1_x[2] | in1_x[3] |

                in1_y[0] | in1_y[1] | in1_y[2] | in1_y[3]);

    if (P256_LIMBS == 8)

        in1infty |= in1_x[4] | in1_x[5] | in1_x[6] | in1_x[7] |

                    in1_y[4] | in1_y[5] | in1_y[6] | in1_y[7];

        in1infty |= (in1_x[4] | in1_x[5] | in1_x[6] | in1_x[7] |

                     in1_y[4] | in1_y[5] | in1_y[6] | in1_y[7]);



    in2infty = in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] |

               in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3];

    in2infty = (in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] |

                in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3]);

    if (P256_LIMBS == 8)

        in2infty |= in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] |

                    in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7];

        in2infty |= (in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] |

                     in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7]);



    in1infty = is_zero(in1infty);

    in2infty = is_zero(in2infty);
@@ -402,17 +402,17 @@ static void ecp_nistz256_point_add_affine(P256_POINT * r, 


    /* In affine representation we encode infty as (0,0),

     * which is not on the curve, so it is OK */

    in1infty = in1_x[0] | in1_x[1] | in1_x[2] | in1_x[3] |

               in1_y[0] | in1_y[1] | in1_y[2] | in1_y[3];

    in1infty = (in1_x[0] | in1_x[1] | in1_x[2] | in1_x[3] |

                in1_y[0] | in1_y[1] | in1_y[2] | in1_y[3]);

    if (P256_LIMBS == 8)

        in1infty |= in1_x[4] | in1_x[5] | in1_x[6] | in1_x[7] |

                    in1_y[4] | in1_y[5] | in1_y[6] | in1_y[7];

        in1infty |= (in1_x[4] | in1_x[5] | in1_x[6] | in1_x[7] |

                     in1_y[4] | in1_y[5] | in1_y[6] | in1_y[7]);



    in2infty = in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] |

               in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3];

    in2infty = (in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] |

                in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3]);

    if (P256_LIMBS == 8)

        in2infty |= in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] |

                    in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7];

        in2infty |= (in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] |

                     in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7]);



    in1infty = is_zero(in1infty);

    in2infty = is_zero(in2infty);
@@ -891,8 +891,7 @@ static void booth_recode_w7(unsigned char *sign, 
 * significantly speeding up point multiplication for a fixed value. */

static void ecp_nistz256_avx2_mul_g(P256_POINT *r,

                                    unsigned char p_str[33],

                                    const

                                    P256_POINT_AFFINE(*preComputedTable)[64])

                                    const P256_POINT_AFFINE(*preComputedTable)[64])

{

    const unsigned int window_size = 7;

    const unsigned int mask = (1 << (window_size + 1)) - 1;