Remove unused prototype.

This commit is contained in:
Tomas Mraz 2016-11-04 15:36:21 +01:00
parent f655917cf7
commit 648a4e2db0

View File

@ -11530,9 +11530,9 @@ diff -up openssl-1.1.0/include/openssl/dh.h.fips openssl-1.1.0/include/openssl/d
# define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PARAMETER_ENCODING_ERROR 105
# define DH_R_PEER_KEY_ERROR 111 # define DH_R_PEER_KEY_ERROR 111
# define DH_R_SHARED_INFO_ERROR 113 # define DH_R_SHARED_INFO_ERROR 113
diff -up openssl-1.1.0/include/openssl/dsa.h.fips openssl-1.1.0/include/openssl/dsa.h diff -up openssl-1.1.0b/include/openssl/dsa.h.fips openssl-1.1.0b/include/openssl/dsa.h
--- openssl-1.1.0/include/openssl/dsa.h.fips 2016-08-25 17:29:22.000000000 +0200 --- openssl-1.1.0b/include/openssl/dsa.h.fips 2016-09-26 11:46:07.000000000 +0200
+++ openssl-1.1.0/include/openssl/dsa.h 2016-09-08 11:37:38.746460186 +0200 +++ openssl-1.1.0b/include/openssl/dsa.h 2016-11-04 15:34:25.224751847 +0100
@@ -36,6 +36,7 @@ extern "C" { @@ -36,6 +36,7 @@ extern "C" {
# endif # endif
@ -11553,22 +11553,7 @@ diff -up openssl-1.1.0/include/openssl/dsa.h.fips openssl-1.1.0/include/openssl/
* Rabin-Miller * Rabin-Miller
*/ */
# define DSA_is_prime(n, callback, cb_arg) \ # define DSA_is_prime(n, callback, cb_arg) \
@@ -162,6 +163,14 @@ int DSA_print_fp(FILE *bp, const DSA *x, @@ -241,8 +242,11 @@ int ERR_load_DSA_strings(void);
DH *DSA_dup_DH(const DSA *r);
# endif
+# ifdef OPENSSL_FIPS
+int FIPS_dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
+ const EVP_MD *evpmd,
+ const unsigned char *seed_in,
+ size_t seed_len, int *counter_ret,
+ unsigned long *h_ret, BN_GENCB *cb);
+# endif
+
# define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \
EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \
EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, nbits, NULL)
@@ -241,8 +250,11 @@ int ERR_load_DSA_strings(void);
/* Function codes. */ /* Function codes. */
# define DSA_F_DSAPARAMS_PRINT 100 # define DSA_F_DSAPARAMS_PRINT 100
# define DSA_F_DSAPARAMS_PRINT_FP 101 # define DSA_F_DSAPARAMS_PRINT_FP 101
@ -11580,7 +11565,7 @@ diff -up openssl-1.1.0/include/openssl/dsa.h.fips openssl-1.1.0/include/openssl/
# define DSA_F_DSA_DO_SIGN 112 # define DSA_F_DSA_DO_SIGN 112
# define DSA_F_DSA_DO_VERIFY 113 # define DSA_F_DSA_DO_VERIFY 113
# define DSA_F_DSA_METH_DUP 127 # define DSA_F_DSA_METH_DUP 127
@@ -269,9 +281,12 @@ int ERR_load_DSA_strings(void); @@ -269,9 +273,12 @@ int ERR_load_DSA_strings(void);
# define DSA_R_DECODE_ERROR 104 # define DSA_R_DECODE_ERROR 104
# define DSA_R_INVALID_DIGEST_TYPE 106 # define DSA_R_INVALID_DIGEST_TYPE 106
# define DSA_R_INVALID_PARAMETERS 112 # define DSA_R_INVALID_PARAMETERS 112