Skip to content

Commit aebfdb0

Browse files
jonasnickroqqit
authored andcommitted
[secp256k1] Make position of * in pointer declarations in include/ consistent
Summary: This is a backport of [[bitcoin-core/secp256k1#1252 | secp256k1#1252]] Test Plan: ``` cmake .. -GNinja -DSECP256K1_ENABLE_DEV_MODE=1 ninja check-secp256k1` ``` Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D19840
1 parent d52ec80 commit aebfdb0

7 files changed

Lines changed: 87 additions & 87 deletions

File tree

src/secp256k1/include/secp256k1.h

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ SECP256K1_API void secp256k1_selftest(void);
281281
* Do not create a new context object for each operation, as construction and
282282
* randomization can take non-negligible time.
283283
*/
284-
SECP256K1_API secp256k1_context* secp256k1_context_create(
284+
SECP256K1_API secp256k1_context *secp256k1_context_create(
285285
unsigned int flags
286286
) SECP256K1_WARN_UNUSED_RESULT;
287287

@@ -297,8 +297,8 @@ SECP256K1_API secp256k1_context* secp256k1_context_create(
297297
* Returns: a newly created context object.
298298
* Args: ctx: an existing context to copy (not secp256k1_context_static)
299299
*/
300-
SECP256K1_API secp256k1_context* secp256k1_context_clone(
301-
const secp256k1_context* ctx
300+
SECP256K1_API secp256k1_context *secp256k1_context_clone(
301+
const secp256k1_context *ctx
302302
) SECP256K1_ARG_NONNULL(1) SECP256K1_WARN_UNUSED_RESULT;
303303

304304
/** Destroy a secp256k1 context object (created in dynamically allocated memory).
@@ -316,7 +316,7 @@ SECP256K1_API secp256k1_context* secp256k1_context_clone(
316316
* (i.e., not secp256k1_context_static).
317317
*/
318318
SECP256K1_API void secp256k1_context_destroy(
319-
secp256k1_context* ctx
319+
secp256k1_context *ctx
320320
) SECP256K1_ARG_NONNULL(1);
321321

322322
/** Set a callback function to be called when an illegal argument is passed to
@@ -340,8 +340,8 @@ SECP256K1_API void secp256k1_context_destroy(
340340
* USE_EXTERNAL_DEFAULT_CALLBACKS is defined, which is the case if the build
341341
* has been configured with --enable-external-default-callbacks. Then the
342342
* following two symbols must be provided to link against:
343-
* - void secp256k1_default_illegal_callback_fn(const char* message, void* data);
344-
* - void secp256k1_default_error_callback_fn(const char* message, void* data);
343+
* - void secp256k1_default_illegal_callback_fn(const char *message, void *data);
344+
* - void secp256k1_default_error_callback_fn(const char *message, void *data);
345345
* The library can call these default handlers even before a proper callback data
346346
* pointer could have been set using secp256k1_context_set_illegal_callback or
347347
* secp256k1_context_set_error_callback, e.g., when the creation of a context
@@ -357,9 +357,9 @@ SECP256K1_API void secp256k1_context_destroy(
357357
* See also secp256k1_context_set_error_callback.
358358
*/
359359
SECP256K1_API void secp256k1_context_set_illegal_callback(
360-
secp256k1_context* ctx,
361-
void (*fun)(const char* message, void* data),
362-
const void* data
360+
secp256k1_context *ctx,
361+
void (*fun)(const char *message, void *data),
362+
const void *data
363363
) SECP256K1_ARG_NONNULL(1);
364364

365365
/** Set a callback function to be called when an internal consistency check
@@ -385,9 +385,9 @@ SECP256K1_API void secp256k1_context_set_illegal_callback(
385385
* See also secp256k1_context_set_illegal_callback.
386386
*/
387387
SECP256K1_API void secp256k1_context_set_error_callback(
388-
secp256k1_context* ctx,
389-
void (*fun)(const char* message, void* data),
390-
const void* data
388+
secp256k1_context *ctx,
389+
void (*fun)(const char *message, void *data),
390+
const void *data
391391
) SECP256K1_ARG_NONNULL(1);
392392

393393
/** Create a secp256k1 scratch space object.
@@ -397,8 +397,8 @@ SECP256K1_API void secp256k1_context_set_error_callback(
397397
* In: size: amount of memory to be available as scratch space. Some extra
398398
* (<100 bytes) will be allocated for extra accounting.
399399
*/
400-
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT secp256k1_scratch_space* secp256k1_scratch_space_create(
401-
const secp256k1_context* ctx,
400+
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT secp256k1_scratch_space *secp256k1_scratch_space_create(
401+
const secp256k1_context *ctx,
402402
size_t size
403403
) SECP256K1_ARG_NONNULL(1);
404404

@@ -409,8 +409,8 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT secp256k1_scratch_space* secp256k1_sc
409409
* scratch: space to destroy
410410
*/
411411
SECP256K1_API void secp256k1_scratch_space_destroy(
412-
const secp256k1_context* ctx,
413-
secp256k1_scratch_space* scratch
412+
const secp256k1_context *ctx,
413+
secp256k1_scratch_space *scratch
414414
) SECP256K1_ARG_NONNULL(1);
415415

416416
/** Parse a variable-length public key into the pubkey object.
@@ -428,8 +428,8 @@ SECP256K1_API void secp256k1_scratch_space_destroy(
428428
* byte 0x06 or 0x07) format public keys.
429429
*/
430430
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_parse(
431-
const secp256k1_context* ctx,
432-
secp256k1_pubkey* pubkey,
431+
const secp256k1_context *ctx,
432+
secp256k1_pubkey *pubkey,
433433
const unsigned char *input,
434434
size_t inputlen
435435
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
@@ -450,10 +450,10 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_parse(
450450
* compressed format, otherwise SECP256K1_EC_UNCOMPRESSED.
451451
*/
452452
SECP256K1_API int secp256k1_ec_pubkey_serialize(
453-
const secp256k1_context* ctx,
453+
const secp256k1_context *ctx,
454454
unsigned char *output,
455455
size_t *outputlen,
456-
const secp256k1_pubkey* pubkey,
456+
const secp256k1_pubkey *pubkey,
457457
unsigned int flags
458458
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
459459

@@ -467,9 +467,9 @@ SECP256K1_API int secp256k1_ec_pubkey_serialize(
467467
* pubkey2: second public key to compare
468468
*/
469469
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_cmp(
470-
const secp256k1_context* ctx,
471-
const secp256k1_pubkey* pubkey1,
472-
const secp256k1_pubkey* pubkey2
470+
const secp256k1_context *ctx,
471+
const secp256k1_pubkey *pubkey1,
472+
const secp256k1_pubkey *pubkey2
473473
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
474474

475475
/** Parse an ECDSA signature in compact (64 bytes) format.
@@ -488,8 +488,8 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_cmp(
488488
* any message and public key.
489489
*/
490490
SECP256K1_API int secp256k1_ecdsa_signature_parse_compact(
491-
const secp256k1_context* ctx,
492-
secp256k1_ecdsa_signature* sig,
491+
const secp256k1_context *ctx,
492+
secp256k1_ecdsa_signature *sig,
493493
const unsigned char *input64
494494
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
495495

@@ -509,8 +509,8 @@ SECP256K1_API int secp256k1_ecdsa_signature_parse_compact(
509509
* guaranteed to fail for every message and public key.
510510
*/
511511
SECP256K1_API int secp256k1_ecdsa_signature_parse_der(
512-
const secp256k1_context* ctx,
513-
secp256k1_ecdsa_signature* sig,
512+
const secp256k1_context *ctx,
513+
secp256k1_ecdsa_signature *sig,
514514
const unsigned char *input,
515515
size_t inputlen
516516
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
@@ -527,10 +527,10 @@ SECP256K1_API int secp256k1_ecdsa_signature_parse_der(
527527
* In: sig: a pointer to an initialized signature object
528528
*/
529529
SECP256K1_API int secp256k1_ecdsa_signature_serialize_der(
530-
const secp256k1_context* ctx,
530+
const secp256k1_context *ctx,
531531
unsigned char *output,
532532
size_t *outputlen,
533-
const secp256k1_ecdsa_signature* sig
533+
const secp256k1_ecdsa_signature *sig
534534
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
535535

536536
/** Serialize an ECDSA signature in compact (64 byte) format.
@@ -543,9 +543,9 @@ SECP256K1_API int secp256k1_ecdsa_signature_serialize_der(
543543
* See secp256k1_ecdsa_signature_parse_compact for details about the encoding.
544544
*/
545545
SECP256K1_API int secp256k1_ecdsa_signature_serialize_compact(
546-
const secp256k1_context* ctx,
546+
const secp256k1_context *ctx,
547547
unsigned char *output64,
548-
const secp256k1_ecdsa_signature* sig
548+
const secp256k1_ecdsa_signature *sig
549549
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
550550

551551
/** Verify an ECDSA signature.
@@ -574,7 +574,7 @@ SECP256K1_API int secp256k1_ecdsa_signature_serialize_compact(
574574
* For details, see the comments for that function.
575575
*/
576576
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ecdsa_verify(
577-
const secp256k1_context* ctx,
577+
const secp256k1_context *ctx,
578578
const secp256k1_ecdsa_signature *sig,
579579
const unsigned char *msghash32,
580580
const secp256k1_pubkey *pubkey
@@ -622,7 +622,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ecdsa_verify(
622622
* secp256k1_ecdsa_signature_normalize must be called before verification.
623623
*/
624624
SECP256K1_API int secp256k1_ecdsa_signature_normalize(
625-
const secp256k1_context* ctx,
625+
const secp256k1_context *ctx,
626626
secp256k1_ecdsa_signature *sigout,
627627
const secp256k1_ecdsa_signature *sigin
628628
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(3);
@@ -655,7 +655,7 @@ SECP256K1_API extern const secp256k1_nonce_function secp256k1_nonce_function_def
655655
* secp256k1_ecdsa_signature_normalize for more details.
656656
*/
657657
SECP256K1_API int secp256k1_ecdsa_sign(
658-
const secp256k1_context* ctx,
658+
const secp256k1_context *ctx,
659659
secp256k1_ecdsa_signature *sig,
660660
const unsigned char *msghash32,
661661
const unsigned char *seckey,
@@ -676,7 +676,7 @@ SECP256K1_API int secp256k1_ecdsa_sign(
676676
* In: seckey: pointer to a 32-byte secret key.
677677
*/
678678
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_seckey_verify(
679-
const secp256k1_context* ctx,
679+
const secp256k1_context *ctx,
680680
const unsigned char *seckey
681681
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2);
682682

@@ -689,7 +689,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_seckey_verify(
689689
* In: seckey: pointer to a 32-byte secret key.
690690
*/
691691
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_create(
692-
const secp256k1_context* ctx,
692+
const secp256k1_context *ctx,
693693
secp256k1_pubkey *pubkey,
694694
const unsigned char *seckey
695695
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
@@ -705,14 +705,14 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_create(
705705
* seckey will be set to some unspecified value.
706706
*/
707707
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_seckey_negate(
708-
const secp256k1_context* ctx,
708+
const secp256k1_context *ctx,
709709
unsigned char *seckey
710710
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2);
711711

712712
/** Same as secp256k1_ec_seckey_negate, but DEPRECATED. Will be removed in
713713
* future versions. */
714714
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_negate(
715-
const secp256k1_context* ctx,
715+
const secp256k1_context *ctx,
716716
unsigned char *seckey
717717
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2)
718718
SECP256K1_DEPRECATED("Use secp256k1_ec_seckey_negate instead");
@@ -724,7 +724,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_negate(
724724
* In/Out: pubkey: pointer to the public key to be negated.
725725
*/
726726
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_negate(
727-
const secp256k1_context* ctx,
727+
const secp256k1_context *ctx,
728728
secp256k1_pubkey *pubkey
729729
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2);
730730

@@ -744,15 +744,15 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_negate(
744744
* is negligible (around 1 in 2^128).
745745
*/
746746
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_seckey_tweak_add(
747-
const secp256k1_context* ctx,
747+
const secp256k1_context *ctx,
748748
unsigned char *seckey,
749749
const unsigned char *tweak32
750750
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
751751

752752
/** Same as secp256k1_ec_seckey_tweak_add, but DEPRECATED. Will be removed in
753753
* future versions. */
754754
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_tweak_add(
755-
const secp256k1_context* ctx,
755+
const secp256k1_context *ctx,
756756
unsigned char *seckey,
757757
const unsigned char *tweak32
758758
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3)
@@ -772,7 +772,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_tweak_add(
772772
* is negligible (around 1 in 2^128).
773773
*/
774774
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_tweak_add(
775-
const secp256k1_context* ctx,
775+
const secp256k1_context *ctx,
776776
secp256k1_pubkey *pubkey,
777777
const unsigned char *tweak32
778778
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
@@ -791,15 +791,15 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_tweak_add(
791791
* is negligible (around 1 in 2^128).
792792
*/
793793
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_seckey_tweak_mul(
794-
const secp256k1_context* ctx,
794+
const secp256k1_context *ctx,
795795
unsigned char *seckey,
796796
const unsigned char *tweak32
797797
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
798798

799799
/** Same as secp256k1_ec_seckey_tweak_mul, but DEPRECATED. Will be removed in
800800
* future versions. */
801801
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_tweak_mul(
802-
const secp256k1_context* ctx,
802+
const secp256k1_context *ctx,
803803
unsigned char *seckey,
804804
const unsigned char *tweak32
805805
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3)
@@ -817,7 +817,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_tweak_mul(
817817
* is negligible (around 1 in 2^128).
818818
*/
819819
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_tweak_mul(
820-
const secp256k1_context* ctx,
820+
const secp256k1_context *ctx,
821821
secp256k1_pubkey *pubkey,
822822
const unsigned char *tweak32
823823
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
@@ -855,7 +855,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_tweak_mul(
855855
* enhanced protection against side-channel leakage currently.
856856
*/
857857
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_context_randomize(
858-
secp256k1_context* ctx,
858+
secp256k1_context *ctx,
859859
const unsigned char *seed32
860860
) SECP256K1_ARG_NONNULL(1);
861861

@@ -869,9 +869,9 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_context_randomize(
869869
* n: the number of public keys to add together (must be at least 1).
870870
*/
871871
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_combine(
872-
const secp256k1_context* ctx,
872+
const secp256k1_context *ctx,
873873
secp256k1_pubkey *out,
874-
const secp256k1_pubkey * const * ins,
874+
const secp256k1_pubkey * const *ins,
875875
size_t n
876876
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
877877

@@ -892,7 +892,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_combine(
892892
* msglen: length of the message array
893893
*/
894894
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_tagged_sha256(
895-
const secp256k1_context* ctx,
895+
const secp256k1_context *ctx,
896896
unsigned char *hash32,
897897
const unsigned char *tag,
898898
size_t taglen,

src/secp256k1/include/secp256k1_ecdh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ SECP256K1_API extern const secp256k1_ecdh_hash_function secp256k1_ecdh_hash_func
4848
* (can be NULL for secp256k1_ecdh_hash_function_sha256).
4949
*/
5050
SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_ecdh(
51-
const secp256k1_context* ctx,
51+
const secp256k1_context *ctx,
5252
unsigned char *output,
5353
const secp256k1_pubkey *pubkey,
5454
const unsigned char *seckey,

0 commit comments

Comments
 (0)