remove redundant ERR_load_... declarations

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

diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 9d72647808f109acd92b4eb842cc192f40b5c9f4..377a76799be18648bfc4210e575e0f5f7094fbae 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -65,16 +65,17 @@
 #ifndef HEADER_DSA_H
 #define HEADER_DSA_H
 
 #ifndef HEADER_DSA_H
 #define HEADER_DSA_H
 

-#ifdef NO_DSA
+#ifdef OPENSSL_NO_DSA

 #error DSA is disabled.
 #endif
 
 #error DSA is disabled.
 #endif
 

-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO

 #include <openssl/bio.h>
 #endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
 #include <openssl/bio.h>
 #endif
 #include <openssl/bn.h>
 #include <openssl/crypto.h>

-#ifndef NO_DH
+#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DH

 # include <openssl/dh.h>
 #endif
 
 # include <openssl/dh.h>
 #endif
 


@@ -133,11 +134,9 @@ struct dsa_st
        char *method_mont_p;
        int references;
        CRYPTO_EX_DATA ex_data;
        char *method_mont_p;
        int references;
        CRYPTO_EX_DATA ex_data;

-#if 0
-       DSA_METHOD *meth;
-#else
-       struct engine_st *engine;
-#endif
+       const DSA_METHOD *meth;
+       /* functional reference if 'meth' is ENGINE-provided */
+       ENGINE *engine;

        };
 
 #define DSAparams_dup(x) (DSA *)ASN1_dup((int (*)())i2d_DSAparams, \
        };
 
 #define DSAparams_dup(x) (DSA *)ASN1_dup((int (*)())i2d_DSAparams, \


@@ -163,20 +162,15 @@ int       DSA_do_verify(const unsigned char *dgst,int dgst_len,
 
 const DSA_METHOD *DSA_OpenSSL(void);
 
 
 const DSA_METHOD *DSA_OpenSSL(void);
 

-void        DSA_set_default_openssl_method(const DSA_METHOD *);
-const DSA_METHOD *DSA_get_default_openssl_method(void);
-#if 0
-const DSA_METHOD *DSA_set_method(DSA *dsa, DSA_METHOD *);
-#else
-int DSA_set_method(DSA *dsa, struct engine_st *engine);
-#endif
+void   DSA_set_default_method(const DSA_METHOD *);
+const DSA_METHOD *DSA_get_default_method(void);
+int    DSA_set_method(DSA *dsa, const DSA_METHOD *);

 
 DSA *  DSA_new(void);
 
 DSA *  DSA_new(void);

-#if 0
-DSA *  DSA_new_method(DSA_METHOD *meth);
-#else
-DSA *  DSA_new_method(struct engine_st *engine);
-#endif
+DSA *  DSA_new_method(ENGINE *engine);
+void   DSA_free (DSA *r);
+/* "up" the DSA object's reference count */
+int    DSA_up_ref(DSA *r);

 int    DSA_size(const DSA *);
        /* next 4 return -1 on error */
 int    DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);
 int    DSA_size(const DSA *);
        /* next 4 return -1 on error */
 int    DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);


@@ -184,14 +178,11 @@ int       DSA_sign(int type,const unsigned char *dgst,int dlen,
                unsigned char *sig, unsigned int *siglen, DSA *dsa);
 int    DSA_verify(int type,const unsigned char *dgst,int dgst_len,
                const unsigned char *sigbuf, int siglen, DSA *dsa);
                unsigned char *sig, unsigned int *siglen, DSA *dsa);
 int    DSA_verify(int type,const unsigned char *dgst,int dgst_len,
                const unsigned char *sigbuf, int siglen, DSA *dsa);

-void   DSA_free (DSA *r);

 int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int DSA_set_ex_data(DSA *d, int idx, void *arg);
 void *DSA_get_ex_data(DSA *d, int idx);
 
 int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int DSA_set_ex_data(DSA *d, int idx, void *arg);
 void *DSA_get_ex_data(DSA *d, int idx);
 

-void   ERR_load_DSA_strings(void );
-

 DSA *  d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
 DSA *  d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
 DSA *  d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
 DSA *  d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
 DSA *  d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
 DSA *  d2i_DSAparams(DSA **a, const unsigned char **pp, long length);


@@ -204,11 +195,11 @@ int       i2d_DSAPublicKey(const DSA *a, unsigned char **pp);
 int    i2d_DSAPrivateKey(const DSA *a, unsigned char **pp);
 int    i2d_DSAparams(const DSA *a,unsigned char **pp);
 
 int    i2d_DSAPrivateKey(const DSA *a, unsigned char **pp);
 int    i2d_DSAparams(const DSA *a,unsigned char **pp);
 

-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO

 int    DSAparams_print(BIO *bp, const DSA *x);
 int    DSA_print(BIO *bp, const DSA *x, int off);
 #endif
 int    DSAparams_print(BIO *bp, const DSA *x);
 int    DSA_print(BIO *bp, const DSA *x, int off);
 #endif

-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API

 int    DSAparams_print_fp(FILE *fp, const DSA *x);
 int    DSA_print_fp(FILE *bp, const DSA *x, int off);
 #endif
 int    DSAparams_print_fp(FILE *fp, const DSA *x);
 int    DSA_print_fp(FILE *bp, const DSA *x, int off);
 #endif


@@ -219,7 +210,7 @@ int DSA_print_fp(FILE *bp, const DSA *x, int off);
 #define DSA_is_prime(n, callback, cb_arg) \
        BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
 
 #define DSA_is_prime(n, callback, cb_arg) \
        BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
 

-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH

 /* Convert DSA structure (key or just parameters) into DH structure
  * (be careful to avoid small subgroup attacks when using this!) */
 DH *DSA_dup_DH(const DSA *r);
 /* Convert DSA structure (key or just parameters) into DH structure
  * (be careful to avoid small subgroup attacks when using this!) */
 DH *DSA_dup_DH(const DSA *r);


@@ -229,6 +220,7 @@ DH *DSA_dup_DH(const DSA *r);
 /* 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.
  */
 /* 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_DSA_strings(void);

 
 /* Error codes for the DSA functions. */
 
 
 /* Error codes for the DSA functions. */
 


@@ -250,9 +242,9 @@ DH *DSA_dup_DH(const DSA *r);
 
 /* Reason codes. */
 #define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE               100
 
 /* Reason codes. */
 #define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE               100

+#define DSA_R_MISSING_PARAMETERS                        101

 
 #ifdef  __cplusplus
 }
 #endif
 #endif
 
 #ifdef  __cplusplus
 }
 #endif
 #endif

-