@@ -623,72 +623,72 @@ int secp256k1_ec_pubkey_negate(const secp256k1_context* ctx, secp256k1_pubkey *p
623
623
}
624
624
625
625
626
- static int secp256k1_ec_seckey_tweak_add_helper (secp256k1_scalar * sec , const unsigned char * tweak ) {
626
+ static int secp256k1_ec_seckey_tweak_add_helper (secp256k1_scalar * sec , const unsigned char * tweak32 ) {
627
627
secp256k1_scalar term ;
628
628
int overflow = 0 ;
629
629
int ret = 0 ;
630
630
631
- secp256k1_scalar_set_b32 (& term , tweak , & overflow );
631
+ secp256k1_scalar_set_b32 (& term , tweak32 , & overflow );
632
632
ret = (!overflow ) & secp256k1_eckey_privkey_tweak_add (sec , & term );
633
633
secp256k1_scalar_clear (& term );
634
634
return ret ;
635
635
}
636
636
637
- int secp256k1_ec_seckey_tweak_add (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak ) {
637
+ int secp256k1_ec_seckey_tweak_add (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak32 ) {
638
638
secp256k1_scalar sec ;
639
639
int ret = 0 ;
640
640
VERIFY_CHECK (ctx != NULL );
641
641
ARG_CHECK (seckey != NULL );
642
- ARG_CHECK (tweak != NULL );
642
+ ARG_CHECK (tweak32 != NULL );
643
643
644
644
ret = secp256k1_scalar_set_b32_seckey (& sec , seckey );
645
- ret &= secp256k1_ec_seckey_tweak_add_helper (& sec , tweak );
645
+ ret &= secp256k1_ec_seckey_tweak_add_helper (& sec , tweak32 );
646
646
secp256k1_scalar_cmov (& sec , & secp256k1_scalar_zero , !ret );
647
647
secp256k1_scalar_get_b32 (seckey , & sec );
648
648
649
649
secp256k1_scalar_clear (& sec );
650
650
return ret ;
651
651
}
652
652
653
- int secp256k1_ec_privkey_tweak_add (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak ) {
654
- return secp256k1_ec_seckey_tweak_add (ctx , seckey , tweak );
653
+ int secp256k1_ec_privkey_tweak_add (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak32 ) {
654
+ return secp256k1_ec_seckey_tweak_add (ctx , seckey , tweak32 );
655
655
}
656
656
657
- static int secp256k1_ec_pubkey_tweak_add_helper (const secp256k1_ecmult_context * ecmult_ctx , secp256k1_ge * p , const unsigned char * tweak ) {
657
+ static int secp256k1_ec_pubkey_tweak_add_helper (const secp256k1_ecmult_context * ecmult_ctx , secp256k1_ge * p , const unsigned char * tweak32 ) {
658
658
secp256k1_scalar term ;
659
659
int overflow = 0 ;
660
- secp256k1_scalar_set_b32 (& term , tweak , & overflow );
660
+ secp256k1_scalar_set_b32 (& term , tweak32 , & overflow );
661
661
return !overflow && secp256k1_eckey_pubkey_tweak_add (ecmult_ctx , p , & term );
662
662
}
663
663
664
- int secp256k1_ec_pubkey_tweak_add (const secp256k1_context * ctx , secp256k1_pubkey * pubkey , const unsigned char * tweak ) {
664
+ int secp256k1_ec_pubkey_tweak_add (const secp256k1_context * ctx , secp256k1_pubkey * pubkey , const unsigned char * tweak32 ) {
665
665
secp256k1_ge p ;
666
666
int ret = 0 ;
667
667
VERIFY_CHECK (ctx != NULL );
668
668
ARG_CHECK (secp256k1_ecmult_context_is_built (& ctx -> ecmult_ctx ));
669
669
ARG_CHECK (pubkey != NULL );
670
- ARG_CHECK (tweak != NULL );
670
+ ARG_CHECK (tweak32 != NULL );
671
671
672
672
ret = secp256k1_pubkey_load (ctx , & p , pubkey );
673
673
memset (pubkey , 0 , sizeof (* pubkey ));
674
- ret = ret && secp256k1_ec_pubkey_tweak_add_helper (& ctx -> ecmult_ctx , & p , tweak );
674
+ ret = ret && secp256k1_ec_pubkey_tweak_add_helper (& ctx -> ecmult_ctx , & p , tweak32 );
675
675
if (ret ) {
676
676
secp256k1_pubkey_save (pubkey , & p );
677
677
}
678
678
679
679
return ret ;
680
680
}
681
681
682
- int secp256k1_ec_seckey_tweak_mul (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak ) {
682
+ int secp256k1_ec_seckey_tweak_mul (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak32 ) {
683
683
secp256k1_scalar factor ;
684
684
secp256k1_scalar sec ;
685
685
int ret = 0 ;
686
686
int overflow = 0 ;
687
687
VERIFY_CHECK (ctx != NULL );
688
688
ARG_CHECK (seckey != NULL );
689
- ARG_CHECK (tweak != NULL );
689
+ ARG_CHECK (tweak32 != NULL );
690
690
691
- secp256k1_scalar_set_b32 (& factor , tweak , & overflow );
691
+ secp256k1_scalar_set_b32 (& factor , tweak32 , & overflow );
692
692
ret = secp256k1_scalar_set_b32_seckey (& sec , seckey );
693
693
ret &= (!overflow ) & secp256k1_eckey_privkey_tweak_mul (& sec , & factor );
694
694
secp256k1_scalar_cmov (& sec , & secp256k1_scalar_zero , !ret );
@@ -699,21 +699,21 @@ int secp256k1_ec_seckey_tweak_mul(const secp256k1_context* ctx, unsigned char *s
699
699
return ret ;
700
700
}
701
701
702
- int secp256k1_ec_privkey_tweak_mul (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak ) {
703
- return secp256k1_ec_seckey_tweak_mul (ctx , seckey , tweak );
702
+ int secp256k1_ec_privkey_tweak_mul (const secp256k1_context * ctx , unsigned char * seckey , const unsigned char * tweak32 ) {
703
+ return secp256k1_ec_seckey_tweak_mul (ctx , seckey , tweak32 );
704
704
}
705
705
706
- int secp256k1_ec_pubkey_tweak_mul (const secp256k1_context * ctx , secp256k1_pubkey * pubkey , const unsigned char * tweak ) {
706
+ int secp256k1_ec_pubkey_tweak_mul (const secp256k1_context * ctx , secp256k1_pubkey * pubkey , const unsigned char * tweak32 ) {
707
707
secp256k1_ge p ;
708
708
secp256k1_scalar factor ;
709
709
int ret = 0 ;
710
710
int overflow = 0 ;
711
711
VERIFY_CHECK (ctx != NULL );
712
712
ARG_CHECK (secp256k1_ecmult_context_is_built (& ctx -> ecmult_ctx ));
713
713
ARG_CHECK (pubkey != NULL );
714
- ARG_CHECK (tweak != NULL );
714
+ ARG_CHECK (tweak32 != NULL );
715
715
716
- secp256k1_scalar_set_b32 (& factor , tweak , & overflow );
716
+ secp256k1_scalar_set_b32 (& factor , tweak32 , & overflow );
717
717
ret = !overflow && secp256k1_pubkey_load (ctx , & p , pubkey );
718
718
memset (pubkey , 0 , sizeof (* pubkey ));
719
719
if (ret ) {
0 commit comments