From 7ca3ea22c1773633644b6255731bf80e76133358 Mon Sep 17 00:00:00 2001 From: TJ Saunders Date: Thu, 9 Jun 2016 14:52:04 -0700 Subject: [PATCH] Reorder the setter arguments to more consistently match that of other APIs, per review comments. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Richard Levitte Reviewed-by: Emilia Käsper Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1193) --- crypto/dsa/dsa_asn1.c | 2 +- crypto/ec/ec_asn1.c | 2 +- doc/crypto/DSA_SIG_new.pod | 2 +- doc/crypto/ECDSA_SIG_new.pod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c index b19bfaff50..f2818f3ab6 100644 --- a/crypto/dsa/dsa_asn1.c +++ b/crypto/dsa/dsa_asn1.c @@ -32,7 +32,7 @@ void DSA_SIG_get0(BIGNUM **pr, BIGNUM **ps, const DSA_SIG *sig) *ps = sig->s; } -int DSA_SIG_set0(BIGNUM *r, BIGNUM *s, DSA_SIG *sig) +int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s) { BN_clear_free(sig->r); BN_clear_free(sig->s); diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index 89cc67d8aa..9bc4ca7b27 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -1180,7 +1180,7 @@ void ECDSA_SIG_get0(BIGNUM **pr, BIGNUM **ps, const ECDSA_SIG *sig) *ps = sig->s; } -int ECDSA_SIG_set0(BIGNUM *r, BIGNUM *s, ECDSA_SIG *sig) +int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) { BN_clear_free(sig->r); BN_clear_free(sig->s); diff --git a/doc/crypto/DSA_SIG_new.pod b/doc/crypto/DSA_SIG_new.pod index 68694f078a..345c02c56d 100644 --- a/doc/crypto/DSA_SIG_new.pod +++ b/doc/crypto/DSA_SIG_new.pod @@ -11,7 +11,7 @@ DSA_SIG_new, DSA_SIG_free - allocate and free DSA signature objects DSA_SIG *DSA_SIG_new(void); void DSA_SIG_free(DSA_SIG *a); void DSA_SIG_get0(BIGNUM **pr, BIGNUM **ps, const DSA_SIG *sig); - int DSA_SIG_set0(BIGNUM *r, BIGNUM *s, DSA_SIG *sig); + int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s); =head1 DESCRIPTION diff --git a/doc/crypto/ECDSA_SIG_new.pod b/doc/crypto/ECDSA_SIG_new.pod index fbcf6ee235..d3e181dbc4 100644 --- a/doc/crypto/ECDSA_SIG_new.pod +++ b/doc/crypto/ECDSA_SIG_new.pod @@ -14,7 +14,7 @@ algorithm (ECDSA) functions ECDSA_SIG *ECDSA_SIG_new(void); void ECDSA_SIG_free(ECDSA_SIG *sig); void ECDSA_SIG_get0(BIGNUM **pr, BIGNUM **ps, const ECDSA_SIG *sig); - int ECDSA_SIG_set0(BIGNUM *r, BIGNUM *s, ECDSA_SIG *sig); + int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s); int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp); ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, long len); int ECDSA_size(const EC_KEY *eckey); -- 2.34.1