Commit b3c58675 authored by Billy Brumley's avatar Billy Brumley Committed by Matt Caswell
Browse files

fix: BN_swap mishandles flags (1.1.0) 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6101)
parent ba1cf1b1

crypto/bn/bn_lib.c

+7 −4
Original line number Diff line number Diff line
@@ -385,6 +385,11 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b) 
    return (a);

}



#define FLAGS_DATA(flags) ((flags) & (BN_FLG_STATIC_DATA \

                                    | BN_FLG_CONSTTIME   \

                                    | BN_FLG_SECURE))

#define FLAGS_STRUCT(flags) ((flags) & (BN_FLG_MALLOCED))



void BN_swap(BIGNUM *a, BIGNUM *b)

{

    int flags_old_a, flags_old_b;
@@ -412,10 +417,8 @@ void BN_swap(BIGNUM *a, BIGNUM *b) 
    b->dmax = tmp_dmax;

    b->neg = tmp_neg;



    a->flags =

        (flags_old_a & BN_FLG_MALLOCED) | (flags_old_b & BN_FLG_STATIC_DATA);

    b->flags =

        (flags_old_b & BN_FLG_MALLOCED) | (flags_old_a & BN_FLG_STATIC_DATA);

    a->flags = FLAGS_STRUCT(flags_old_a) | FLAGS_DATA(flags_old_b);

    b->flags = FLAGS_STRUCT(flags_old_b) | FLAGS_DATA(flags_old_a);

    bn_check_top(a);

    bn_check_top(b);

}