No point constifying an int.

[openssl.git] / crypto / ecdsa / ecdsa.h

diff --git a/crypto/ecdsa/ecdsa.h b/crypto/ecdsa/ecdsa.h
index ca1ca64aac7088d3222717c47155b2a2804b5445..8dbe872d646a1a54f1796fd9c927063ddba455d1 100644 (file)
--- a/crypto/ecdsa/ecdsa.h
+++ b/crypto/ecdsa/ecdsa.h
@@ -99,7 +99,7 @@ typedef struct ecdsa_method
 struct ecdsa_st
 {
        int version;
-       int write_params;
+       point_conversion_form_t conversion_form;
 
        EC_GROUP *group;
 
@@ -126,25 +126,25 @@ void        ECDSA_SIG_free(ECDSA_SIG *a);
 int      i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **pp);
 ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **v, const unsigned char **pp, long length);
 
-ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, const int dgst_len, ECDSA *ecdsa);
-int      ECDSA_do_verify(const unsigned char *dgst, const int dgst_len, ECDSA_SIG *sig, ECDSA* ecdsa);
+ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dgst_len, ECDSA *ecdsa);
+int      ECDSA_do_verify(const unsigned char *dgst, int dgst_len, ECDSA_SIG *sig, ECDSA* ecdsa);
 int      ECDSA_generate_key(ECDSA *ecdsa);
 int      ECDSA_check_key(ECDSA *ecdsa);
 
 const ECDSA_METHOD *ECDSA_OpenSSL(void);
 
 void     ECDSA_set_default_method(const ECDSA_METHOD *);
-const ECDSA_METHOD *ECDSA_get_default_openssl_method(void);
+const ECDSA_METHOD *ECDSA_get_default_method(void);
 int      ECDSA_set_method(ECDSA *, const ECDSA_METHOD *);
 
-ECDSA    *ECDSA_new();
+ECDSA    *ECDSA_new(void);
 ECDSA    *ECDSA_new_method(ENGINE *engine);
 int      ECDSA_size(const ECDSA *);
 int      ECDSA_sign_setup(ECDSA *ecdsa, BN_CTX *ctx, BIGNUM **kinv, BIGNUM **rp);
 int      ECDSA_sign(int type, const unsigned char *dgst, int dgst_len, unsigned char *sig, 
                     unsigned int *siglen, ECDSA *ecdsa);
 int      ECDSA_verify(int type, const unsigned char *dgst, int dgst_len, const unsigned char *sig,
-                      const int sig_len, ECDSA *ecdsa);
+                      int sig_len, ECDSA *ecdsa);
 int      ECDSA_up_ref(ECDSA *ecdsa);
 void     ECDSA_free(ECDSA *a);
 int      ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
@@ -164,6 +164,15 @@ int        ECDSA_print_fp(FILE *fp, const ECDSA *x, int off);
 void   ECDSA_set_parameter_flags(ECDSA *, int);
 int    ECDSA_get_parameter_flags(const ECDSA*);
 
+/* The ECDSA_{set|get}_conversion_type() functions set/get the
+ * conversion form for ec-points (see ec.h) in a ECDSA-structure */
+void   ECDSA_set_conversion_form(ECDSA *, const point_conversion_form_t);
+point_conversion_form_t ECDSA_get_conversion_form(const ECDSA *);
+/* The ECDSA_{set|get}_default_conversion_form() functions set/get the 
+ * default conversion form */
+void   ECDSA_set_default_conversion_form(const point_conversion_form_t);
+point_conversion_form_t ECDSA_get_default_conversion_form(void);
+
 /* the basic de- and encode functions ( see ecs_asn1.c ) */
 ECDSA   *d2i_ECDSAParameters(ECDSA **a, const unsigned char **in, long len);
 int     i2d_ECDSAParameters(ECDSA *a, unsigned char **out);
@@ -171,8 +180,14 @@ int     i2d_ECDSAParameters(ECDSA *a, unsigned char **out);
 ECDSA   *d2i_ECDSAPrivateKey(ECDSA **a, const unsigned char **in, long len);
 int     i2d_ECDSAPrivateKey(ECDSA *a, unsigned char **out);
 
-ECDSA   *d2i_ECDSAPublicKey(ECDSA **a, const unsigned char **in, long len);
-int     i2d_ECDSAPublicKey(ECDSA *a, unsigned char **out);
+/* ECDSAPublicKey_set_octet_string() sets the public key in the ECDSA-structure.
+ * (*a) must be a pointer to a ECDSA-structure with (*a)->group not zero 
+ * (e.g. a ECDSA-structure with a valid EC_GROUP-structure) */
+ECDSA  *ECDSAPublicKey_set_octet_string(ECDSA **a, const unsigned char **in, long len);
+/* ECDSAPublicKey_get_octet_string() returns the length of the octet string encoding
+ * of the public key. If out != NULL then the function returns in *out 
+ * a pointer to the octet string */
+int    ECDSAPublicKey_get_octet_string(ECDSA *a, unsigned char **out);
 
 
 #define ECDSAParameters_dup(x) (ECDSA *)ASN1_dup((int (*)())i2d_ECDSAParameters, \
@@ -190,6 +205,7 @@ int     i2d_ECDSAPublicKey(ECDSA *a, unsigned char **out);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_ECDSA_strings(void);
 
 /* Error codes for the ECDSA functions. */