From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 27 Jan 2014 13:18:30 +0000 (+0100)
Subject: compile missing file
X-Git-Tag: gnutls_3_3_0pre0~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67cb925a07f7a5f8a3fa389e4f4c56d0be2a80df;p=thirdparty%2Fgnutls.git

compile missing file
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0f06652804..2d70ede73f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -75,7 +75,7 @@ COBJECTS = gnutls_range.c gnutls_record.c \
 	gnutls_global.c gnutls_constate.c gnutls_anon_cred.c		\
 	pkix_asn1_tab.c gnutls_asn1_tab.c				\
 	gnutls_mem.c gnutls_ui.c vasprintf.c vasprintf.h		\
-	gnutls_sig.c gnutls_ecc.c gnutls_alert.c	\
+	gnutls_sig.c gnutls_ecc.c gnutls_alert.c gnutls_privkey_raw.c	\
 	system.c gnutls_str.c gnutls_state.c gnutls_x509.c		\
 	gnutls_rsa_export.c gnutls_helper.c gnutls_supplemental.c	\
 	random.c crypto-api.c gnutls_privkey.c gnutls_pcert.c		\
diff --git a/lib/abstract_int.h b/lib/abstract_int.h
index e6524bc2ea..780ad016b3 100644
--- a/lib/abstract_int.h
+++ b/lib/abstract_int.h
@@ -108,4 +108,7 @@ const mac_entry_st *_gnutls_dsa_q_to_hash(gnutls_pk_algorithm_t algo,
 					  const gnutls_pk_params_st *
 					  params, unsigned int *hash_len);
 
+int
+_gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params);
+
 #endif
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 7dab15037c..3853db2121 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -162,7 +162,7 @@ privkey_to_pubkey(gnutls_pk_algorithm_t pk,
 
 /* Returns the public key of the private key (if possible)
  */
-static int
+int
 _gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params)
 {
 	int ret;
diff --git a/lib/gnutls_privkey_raw.c b/lib/gnutls_privkey_raw.c
index 62816caa28..0d001a0bd1 100644
--- a/lib/gnutls_privkey_raw.c
+++ b/lib/gnutls_privkey_raw.c
@@ -224,7 +224,7 @@ gnutls_x509_privkey_t xkey;
 	return 0;
 
 error:
-	gnutls_x509_privkey_deinit(&xkey);
+	gnutls_x509_privkey_deinit(xkey);
 	return ret;
 }
 
@@ -274,7 +274,7 @@ gnutls_x509_privkey_t xkey;
 	return 0;
 
 error:
-	gnutls_x509_privkey_deinit(&xkey);
+	gnutls_x509_privkey_deinit(xkey);
 	return ret;
 }
 
@@ -324,7 +324,7 @@ gnutls_x509_privkey_t xkey;
 	return 0;
 
 error:
-	gnutls_x509_privkey_deinit(&xkey);
+	gnutls_x509_privkey_deinit(xkey);
 	return ret;
 }