diff options
-rw-r--r-- | lib/auth_dh_common.c | 4 | ||||
-rw-r--r-- | lib/gnutls_auth.c | 2 | ||||
-rw-r--r-- | lib/gnutls_auth_int.h | 2 | ||||
-rw-r--r-- | lib/gnutls_dh.c | 2 | ||||
-rw-r--r-- | lib/x509/privkey.c | 3 | ||||
-rw-r--r-- | lib/x509/x509.c | 3 |
6 files changed, 9 insertions, 7 deletions
diff --git a/lib/auth_dh_common.c b/lib/auth_dh_common.c index c755094947..ddb61b7176 100644 --- a/lib/auth_dh_common.c +++ b/lib/auth_dh_common.c @@ -75,7 +75,7 @@ int _gnutls_proc_dh_common_client_kx(gnutls_session session, opaque * data, _gnutls_mpi_release(&session->key->client_Y); _gnutls_mpi_release(&session->key->dh_secret); - ret = _gnutls_generate_key(session->key); + ret = _gnutls_generate_session_key(session->key); _gnutls_mpi_release(&session->key->KEY); if (ret < 0) { @@ -143,7 +143,7 @@ int _gnutls_gen_dh_common_client_kx(gnutls_session session, opaque ** data) _gnutls_mpi_release(&session->key->client_p); _gnutls_mpi_release(&session->key->client_g); - ret = _gnutls_generate_key(session->key); + ret = _gnutls_generate_session_key(session->key); _gnutls_mpi_release(&session->key->KEY); if (ret < 0) { diff --git a/lib/gnutls_auth.c b/lib/gnutls_auth.c index afa48c485a..5efe9fa402 100644 --- a/lib/gnutls_auth.c +++ b/lib/gnutls_auth.c @@ -304,7 +304,7 @@ int _gnutls_auth_info_set( gnutls_session session, gnutls_credentials_type type, /* this function will copy an GNUTLS_MPI key to * opaque data. */ -int _gnutls_generate_key(GNUTLS_KEY key) { +int _gnutls_generate_session_key(GNUTLS_KEY key) { size_t tmp; _gnutls_mpi_print( NULL, &tmp, key->KEY); diff --git a/lib/gnutls_auth_int.h b/lib/gnutls_auth_int.h index becdd87505..a225ac1819 100644 --- a/lib/gnutls_auth_int.h +++ b/lib/gnutls_auth_int.h @@ -2,7 +2,7 @@ void gnutls_credentials_clear( gnutls_session session); int gnutls_credentials_set( gnutls_session session, gnutls_credentials_type type, void* cred); const void *_gnutls_get_cred( GNUTLS_KEY key, gnutls_credentials_type kx, int* err); const void *_gnutls_get_kx_cred( gnutls_session session, gnutls_kx_algorithm algo, int *err); -int _gnutls_generate_key(GNUTLS_KEY key); +int _gnutls_generate_session_key(GNUTLS_KEY key); gnutls_credentials_type gnutls_auth_get_type( gnutls_session session); void* _gnutls_get_auth_info( gnutls_session session); int _gnutls_auth_info_set( gnutls_session session, gnutls_credentials_type type, int size, int allow_change); diff --git a/lib/gnutls_dh.c b/lib/gnutls_dh.c index cd030f7984..65617a3e98 100644 --- a/lib/gnutls_dh.c +++ b/lib/gnutls_dh.c @@ -40,7 +40,7 @@ _gnutls_mpi_release(g); */ -#define MAX_BITS 12000 +#define MAX_BITS 18000 /* returns the public value (X), and the secret (ret_x). */ diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index a58d82051b..17cc3c42aa 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -1055,6 +1055,7 @@ opaque algo = GNUTLS_PK_DSA; /** * gnutls_x509_privkey_get_key_id - This function will return a unique ID of the key's parameters * @key: Holds the key + * @flags: should be 0 for now * @output_data: will contain the key ID * @output_data_size: holds the size of output_data (and will be replaced by the actual size of parameters) * @@ -1070,7 +1071,7 @@ opaque algo = GNUTLS_PK_DSA; * 0 on success. * **/ -int gnutls_x509_privkey_get_key_id( gnutls_x509_privkey key, +int gnutls_x509_privkey_get_key_id( gnutls_x509_privkey key, unsigned int flags, unsigned char* output_data, int* output_data_size) { diff --git a/lib/x509/x509.c b/lib/x509/x509.c index c6155123f9..c0b7a6666b 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -1045,6 +1045,7 @@ int gnutls_x509_crt_export( gnutls_x509_crt cert, /** * gnutls_x509_crt_get_key_id - This function will return a unique ID of the public key's parameters * @crt: Holds the certificate + * @flags: should be 0 for now * @output_data: will contain the key ID * @output_data_size: holds the size of output_data (and will be replaced by the actual size of parameters) * @@ -1060,7 +1061,7 @@ int gnutls_x509_crt_export( gnutls_x509_crt cert, * 0 on success. * **/ -int gnutls_x509_crt_get_key_id( gnutls_x509_crt crt, +int gnutls_x509_crt_get_key_id( gnutls_x509_crt crt, unsigned int flags, unsigned char* output_data, int* output_data_size) { GNUTLS_MPI params[MAX_PUBLIC_PARAMS_SIZE]; |