summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-05-29 17:26:38 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-05-29 17:27:08 +0200
commit82b83e3769bcb37583d992eabac98c0cbe6acc38 (patch)
tree911643dd65019441335a70a783fe59c8d3b077f0
parent0b8e11a9693e89927dc5d11a03a89626021cf2c1 (diff)
downloadgnutls-82b83e3769bcb37583d992eabac98c0cbe6acc38.tar.gz
revert prototype move
-rw-r--r--lib/includes/gnutls/crypto.h2
-rw-r--r--lib/includes/gnutls/gnutls.h.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 9ef417b437..ff402fc9ce 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -30,7 +30,6 @@ extern "C"
typedef struct api_cipher_hd_st *gnutls_cipher_hd_t;
- size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm);
int gnutls_cipher_init (gnutls_cipher_hd_t * handle,
gnutls_cipher_algorithm_t cipher,
const gnutls_datum_t * key,
@@ -59,7 +58,6 @@ extern "C"
typedef struct hash_hd_st *gnutls_hash_hd_t;
typedef struct hmac_hd_st *gnutls_hmac_hd_t;
- size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm);
size_t gnutls_mac_get_nonce_size (gnutls_mac_algorithm_t algorithm);
int gnutls_hmac_init (gnutls_hmac_hd_t * dig,
gnutls_mac_algorithm_t algorithm, const void *key,
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 1d3769799e..ba4497bd0e 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -834,6 +834,9 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
type);
const char *gnutls_pk_get_name (gnutls_pk_algorithm_t algorithm);
const char *gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm);
+
+ size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm);
+ size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm);
int gnutls_sign_is_secure (gnutls_sign_algorithm_t algorithm);
gnutls_digest_algorithm_t