@@ -65,6 +65,7 @@ pub const ONE_KEY: SecretKey = SecretKey([0, 0, 0, 0, 0, 0, 0, 0,
65
65
66
66
/// A Secp256k1 public key, used for verification of signatures
67
67
#[ derive( Copy , Clone , PartialEq , Eq , Debug , Hash ) ]
68
+ #[ repr( transparent) ]
68
69
pub struct PublicKey ( ffi:: PublicKey ) ;
69
70
70
71
impl fmt:: LowerHex for PublicKey {
@@ -364,14 +365,26 @@ impl PublicKey {
364
365
/// the result would be the point at infinity, i.e. we are adding this point
365
366
/// to its own negation
366
367
pub fn combine ( & self , other : & PublicKey ) -> Result < PublicKey , Error > {
368
+ PublicKey :: combine_keys ( & [ self , other] )
369
+ }
370
+
371
+ /// Adds the keys in the provided slice together, returning the sum. Returns
372
+ /// an error if the result would be the point at infinity, i.e. we are adding
373
+ /// a point to its own negation
374
+ pub fn combine_keys ( keys : & [ & PublicKey ] ) -> Result < PublicKey , Error > {
375
+ use core:: mem:: transmute;
376
+ use core:: i32:: MAX ;
377
+
378
+ debug_assert ! ( keys. len( ) < MAX as usize ) ;
367
379
unsafe {
368
380
let mut ret = ffi:: PublicKey :: new ( ) ;
369
- let ptrs = [ self . as_c_ptr ( ) , other. as_c_ptr ( ) ] ;
381
+ let ptrs : & [ * const ffi:: PublicKey ] =
382
+ transmute :: < & [ & PublicKey ] , & [ * const ffi:: PublicKey ] > ( keys) ;
370
383
if ffi:: secp256k1_ec_pubkey_combine (
371
384
ffi:: secp256k1_context_no_precomp,
372
385
& mut ret,
373
386
ptrs. as_c_ptr ( ) ,
374
- 2
387
+ keys . len ( ) as i32
375
388
) == 1
376
389
{
377
390
Ok ( PublicKey ( ret) )
@@ -794,6 +807,29 @@ mod test {
794
807
assert_eq ! ( sum1. unwrap( ) , exp_sum) ;
795
808
}
796
809
810
+ #[ test]
811
+ fn pubkey_combine_keys ( ) {
812
+ let compressed1 = PublicKey :: from_slice (
813
+ & hex ! ( "0241cc121c419921942add6db6482fb36243faf83317c866d2a28d8c6d7089f7ba" ) ,
814
+ ) . unwrap ( ) ;
815
+ let compressed2 = PublicKey :: from_slice (
816
+ & hex ! ( "02e6642fd69bd211f93f7f1f36ca51a26a5290eb2dd1b0d8279a87bb0d480c8443" ) ,
817
+ ) . unwrap ( ) ;
818
+ let compressed3 = PublicKey :: from_slice (
819
+ & hex ! ( "03e74897d8644eb3e5b391ca2ab257aec2080f4d1a95cad57e454e47f021168eb0" )
820
+ ) . unwrap ( ) ;
821
+ let exp_sum = PublicKey :: from_slice (
822
+ & hex ! ( "0252d73a47f66cf341e5651542f0348f452b7c793af62a6d8bff75ade703a451ad" ) ,
823
+ ) . unwrap ( ) ;
824
+
825
+ let sum1 = PublicKey :: combine_keys ( & [ & compressed1, & compressed2, & compressed3] ) ;
826
+ assert ! ( sum1. is_ok( ) ) ;
827
+ let sum2 = PublicKey :: combine_keys ( & [ & compressed1, & compressed2, & compressed3] ) ;
828
+ assert ! ( sum2. is_ok( ) ) ;
829
+ assert_eq ! ( sum1, sum2) ;
830
+ assert_eq ! ( sum1. unwrap( ) , exp_sum) ;
831
+ }
832
+
797
833
#[ test]
798
834
fn pubkey_equal ( ) {
799
835
let pk1 = PublicKey :: from_slice (
0 commit comments