diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/algorithms.h | 6 | ||||
| -rw-r--r-- | lib/auth.h | 2 | ||||
| -rw-r--r-- | lib/includes/gnutls/gnutls.h.in | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/algorithms.h b/lib/algorithms.h index 67902290be..7479a3f00c 100644 --- a/lib/algorithms.h +++ b/lib/algorithms.h @@ -38,7 +38,7 @@ #define HAVE_UNKNOWN_SIGAID(aid) ((aid)->id[0] == 255 && (aid)->id[1] == 255) /* Functions for version handling. */ -const version_entry_st *version_to_entry(gnutls_protocol_t c); +const version_entry_st *version_to_entry(gnutls_protocol_t version); const version_entry_st *_gnutls_version_lowest(gnutls_session_t session); gnutls_protocol_t _gnutls_version_max(gnutls_session_t session); int _gnutls_version_priority(gnutls_session_t session, @@ -295,7 +295,7 @@ _gnutls_kx_supports_pk_usage(gnutls_kx_algorithm_t kx_algorithm, enum encipher_type { CIPHER_ENCRYPT = 0, CIPHER_SIGN = 1, CIPHER_IGN }; enum encipher_type _gnutls_kx_encipher_type(gnutls_kx_algorithm_t - algorithm); + kx_algorithm); /* Functions for sign algorithms. */ @@ -319,7 +319,7 @@ struct gnutls_sign_entry_st { typedef struct gnutls_sign_entry_st gnutls_sign_entry_st; const gnutls_sign_entry_st *_gnutls_sign_to_entry(gnutls_sign_algorithm_t sign); -const gnutls_sign_entry_st *_gnutls_pk_to_sign_entry(gnutls_pk_algorithm_t, gnutls_digest_algorithm_t); +const gnutls_sign_entry_st *_gnutls_pk_to_sign_entry(gnutls_pk_algorithm_t pk, gnutls_digest_algorithm_t hash); const gnutls_sign_entry_st *_gnutls_oid_to_sign_entry(const char *oid); bool _gnutls_sign_is_secure2(const gnutls_sign_entry_st *se, unsigned int flags); diff --git a/lib/auth.h b/lib/auth.h index 0674e1807b..a61acd09ee 100644 --- a/lib/auth.h +++ b/lib/auth.h @@ -54,7 +54,7 @@ typedef struct mod_auth_st_int { } mod_auth_st; const void *_gnutls_get_cred(gnutls_session_t session, - gnutls_credentials_type_t kx); + gnutls_credentials_type_t type); const void *_gnutls_get_kx_cred(gnutls_session_t session, gnutls_kx_algorithm_t algo); int _gnutls_auth_info_set(gnutls_session_t session, diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in index 6c92600de6..d65318bbbc 100644 --- a/lib/includes/gnutls/gnutls.h.in +++ b/lib/includes/gnutls/gnutls.h.in @@ -998,7 +998,7 @@ const char * gnutls_ecc_curve_get_oid(gnutls_ecc_curve_t curve) __GNUTLS_CONST__; const char * - gnutls_group_get_name(gnutls_group_t curve) __GNUTLS_CONST__; + gnutls_group_get_name(gnutls_group_t group) __GNUTLS_CONST__; int gnutls_ecc_curve_get_size(gnutls_ecc_curve_t curve) __GNUTLS_CONST__; @@ -1043,8 +1043,8 @@ const char * const char * gnutls_sign_get_name(gnutls_sign_algorithm_t algorithm) __GNUTLS_CONST__; -const char * - gnutls_sign_get_oid(gnutls_sign_algorithm_t algorithm) __GNUTLS_CONST__; + +const char *gnutls_sign_get_oid(gnutls_sign_algorithm_t sign) __GNUTLS_CONST__; size_t gnutls_cipher_get_key_size(gnutls_cipher_algorithm_t algorithm) __GNUTLS_CONST__; |