[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-39-g02265a2
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-39-g02265a2 |
|
Date: |
Sat, 24 Mar 2012 00:35:46 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=02265a2401032ef33421629a9426f17e350bd3ac
The branch, master has been updated
via 02265a2401032ef33421629a9426f17e350bd3ac (commit)
via fb0e42ca0d68d18545c39a054ee62106906fa3de (commit)
from d27445d8deb4ec6fcb85394d8628c756284d33ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02265a2401032ef33421629a9426f17e350bd3ac
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 24 01:35:23 2012 +0100
even more cleanups
commit fb0e42ca0d68d18545c39a054ee62106906fa3de
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 24 01:27:54 2012 +0100
more cleanups
-----------------------------------------------------------------------
Summary of changes:
lib/auth/cert.c | 15 +++++++--------
lib/auth/cert.h | 6 +++---
lib/auth/dhe.c | 32 ++++++++++++++++----------------
lib/auth/rsa.c | 8 ++++----
lib/auth/rsa_export.c | 8 ++++----
lib/auth/srp_rsa.c | 4 ++--
lib/gnutls_auth.h | 8 ++++----
lib/gnutls_handshake.c | 4 ++--
lib/gnutls_int.h | 2 +-
lib/gnutls_kx.c | 30 +++++++++++++++---------------
lib/gnutls_kx.h | 4 ++--
lib/gnutls_sig.c | 16 ++++++++--------
lib/gnutls_sig.h | 4 ++--
lib/gnutls_ui.c | 2 +-
14 files changed, 71 insertions(+), 72 deletions(-)
diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index d26fb6e..f8f55be 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -791,9 +791,8 @@ cleanup:
}
-/* Generate client certificate
+/* Generate certificate message
*/
-
static int
_gnutls_gen_x509_crt (gnutls_session_t session, gnutls_buffer_st * data)
{
@@ -1408,7 +1407,7 @@ cleanup:
#endif
int
-_gnutls_proc_certificate (gnutls_session_t session,
+_gnutls_proc_crt (gnutls_session_t session,
uint8_t * data, size_t data_size)
{
int ret;
@@ -1573,13 +1572,13 @@ _gnutls_proc_cert_cert_req (gnutls_session_t session,
uint8_t * data,
/* We should reply with a certificate message,
* even if we have no certificate to send.
*/
- session->key->certificate_requested = 1;
+ session->key->crt_requested = 1;
return 0;
}
int
-_gnutls_gen_cert_client_cert_vrfy (gnutls_session_t session,
+_gnutls_gen_cert_client_crt_vrfy (gnutls_session_t session,
gnutls_buffer_st * data)
{
int ret;
@@ -1603,7 +1602,7 @@ _gnutls_gen_cert_client_cert_vrfy (gnutls_session_t
session,
if (apr_cert_list_length > 0)
{
if ((ret =
- _gnutls_handshake_sign_cert_vrfy (session,
+ _gnutls_handshake_sign_crt_vrfy (session,
&apr_cert_list[0],
apr_pkey, &signature)) < 0)
{
@@ -1661,7 +1660,7 @@ cleanup:
}
int
-_gnutls_proc_cert_client_cert_vrfy (gnutls_session_t session,
+_gnutls_proc_cert_client_crt_vrfy (gnutls_session_t session,
uint8_t * data, size_t data_size)
{
int size, ret;
@@ -1724,7 +1723,7 @@ _gnutls_proc_cert_client_cert_vrfy (gnutls_session_t
session,
}
if ((ret =
- _gnutls_handshake_verify_cert_vrfy (session, &peer_cert, &sig,
+ _gnutls_handshake_verify_crt_vrfy (session, &peer_cert, &sig,
sign_algo)) < 0)
{
gnutls_assert ();
diff --git a/lib/auth/cert.h b/lib/auth/cert.h
index c64bf2e..fd4e5a4 100644
--- a/lib/auth/cert.h
+++ b/lib/auth/cert.h
@@ -124,11 +124,11 @@ void _gnutls_free_rsa_info (rsa_info_st * rsa);
/* AUTH X509 functions */
int _gnutls_gen_cert_server_crt (gnutls_session_t, gnutls_buffer_st *);
int _gnutls_gen_cert_client_crt (gnutls_session_t, gnutls_buffer_st *);
-int _gnutls_gen_cert_client_cert_vrfy (gnutls_session_t, gnutls_buffer_st *);
+int _gnutls_gen_cert_client_crt_vrfy (gnutls_session_t, gnutls_buffer_st *);
int _gnutls_gen_cert_server_cert_req (gnutls_session_t, gnutls_buffer_st *);
int _gnutls_proc_cert_cert_req (gnutls_session_t, uint8_t *, size_t);
-int _gnutls_proc_cert_client_cert_vrfy (gnutls_session_t, uint8_t *, size_t);
-int _gnutls_proc_certificate (gnutls_session_t, uint8_t *, size_t);
+int _gnutls_proc_cert_client_crt_vrfy (gnutls_session_t, uint8_t *, size_t);
+int _gnutls_proc_crt (gnutls_session_t, uint8_t *, size_t);
int _gnutls_get_selected_cert (gnutls_session_t session,
gnutls_pcert_st ** apr_cert_list,
int *apr_cert_list_length,
diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c
index 659ee98..4fb59d4 100644
--- a/lib/auth/dhe.c
+++ b/lib/auth/dhe.c
@@ -49,14 +49,14 @@ const mod_auth_st ecdhe_ecdsa_auth_struct = {
_gnutls_gen_cert_client_crt,
gen_dhe_server_kx,
_gnutls_gen_ecdh_common_client_kx, /* This is the only different */
- _gnutls_gen_cert_client_cert_vrfy,
+ _gnutls_gen_cert_client_crt_vrfy,
_gnutls_gen_cert_server_cert_req,
- _gnutls_proc_certificate,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
+ _gnutls_proc_crt,
proc_dhe_server_kx,
proc_dhe_client_kx,
- _gnutls_proc_cert_client_cert_vrfy,
+ _gnutls_proc_cert_client_crt_vrfy,
_gnutls_proc_cert_cert_req
};
@@ -66,14 +66,14 @@ const mod_auth_st ecdhe_rsa_auth_struct = {
_gnutls_gen_cert_client_crt,
gen_dhe_server_kx,
_gnutls_gen_ecdh_common_client_kx, /* This is the only different */
- _gnutls_gen_cert_client_cert_vrfy,
+ _gnutls_gen_cert_client_crt_vrfy,
_gnutls_gen_cert_server_cert_req,
- _gnutls_proc_certificate,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
+ _gnutls_proc_crt,
proc_dhe_server_kx,
proc_dhe_client_kx,
- _gnutls_proc_cert_client_cert_vrfy,
+ _gnutls_proc_cert_client_crt_vrfy,
_gnutls_proc_cert_cert_req
};
@@ -83,14 +83,14 @@ const mod_auth_st dhe_rsa_auth_struct = {
_gnutls_gen_cert_client_crt,
gen_dhe_server_kx,
_gnutls_gen_dh_common_client_kx,
- _gnutls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */
+ _gnutls_gen_cert_client_crt_vrfy, /* gen client cert vrfy */
_gnutls_gen_cert_server_cert_req, /* server cert request */
- _gnutls_proc_certificate,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
+ _gnutls_proc_crt,
proc_dhe_server_kx,
proc_dhe_client_kx,
- _gnutls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */
+ _gnutls_proc_cert_client_crt_vrfy, /* proc client cert vrfy */
_gnutls_proc_cert_cert_req /* proc server cert request */
};
@@ -100,14 +100,14 @@ const mod_auth_st dhe_dss_auth_struct = {
_gnutls_gen_cert_client_crt,
gen_dhe_server_kx,
_gnutls_gen_dh_common_client_kx,
- _gnutls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */
+ _gnutls_gen_cert_client_crt_vrfy, /* gen client cert vrfy */
_gnutls_gen_cert_server_cert_req, /* server cert request */
- _gnutls_proc_certificate,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
+ _gnutls_proc_crt,
proc_dhe_server_kx,
proc_dhe_client_kx,
- _gnutls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */
+ _gnutls_proc_cert_client_crt_vrfy, /* proc client cert vrfy */
_gnutls_proc_cert_cert_req /* proc server cert request */
};
diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c
index 8658d4a..77a61f9 100644
--- a/lib/auth/rsa.c
+++ b/lib/auth/rsa.c
@@ -50,14 +50,14 @@ const mod_auth_st rsa_auth_struct = {
_gnutls_gen_cert_client_crt,
NULL, /* gen server kx */
_gnutls_gen_rsa_client_kx,
- _gnutls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */
+ _gnutls_gen_cert_client_crt_vrfy, /* gen client cert vrfy */
_gnutls_gen_cert_server_cert_req, /* server cert request */
- _gnutls_proc_certificate,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
+ _gnutls_proc_crt,
NULL, /* proc server kx */
proc_rsa_client_kx, /* proc client kx */
- _gnutls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */
+ _gnutls_proc_cert_client_crt_vrfy, /* proc client cert vrfy */
_gnutls_proc_cert_cert_req /* proc server cert request */
};
diff --git a/lib/auth/rsa_export.c b/lib/auth/rsa_export.c
index fce5789..f93211d 100644
--- a/lib/auth/rsa_export.c
+++ b/lib/auth/rsa_export.c
@@ -54,14 +54,14 @@ const mod_auth_st rsa_export_auth_struct = {
_gnutls_gen_cert_client_crt,
gen_rsa_export_server_kx,
_gnutls_gen_rsa_client_kx,
- _gnutls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */
+ _gnutls_gen_cert_client_crt_vrfy, /* gen client cert vrfy */
_gnutls_gen_cert_server_cert_req, /* server cert request */
- _gnutls_proc_certificate,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
+ _gnutls_proc_crt,
proc_rsa_export_server_kx,
proc_rsa_export_client_kx, /* proc client kx */
- _gnutls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */
+ _gnutls_proc_cert_client_crt_vrfy, /* proc client cert vrfy */
_gnutls_proc_cert_cert_req /* proc server cert request */
};
diff --git a/lib/auth/srp_rsa.c b/lib/auth/srp_rsa.c
index 3a3649f..135b762 100644
--- a/lib/auth/srp_rsa.c
+++ b/lib/auth/srp_rsa.c
@@ -52,7 +52,7 @@ const mod_auth_st srp_rsa_auth_struct = {
NULL,
NULL,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
NULL, /* certificate */
proc_srp_cert_server_kx,
_gnutls_proc_srp_client_kx,
@@ -69,7 +69,7 @@ const mod_auth_st srp_dss_auth_struct = {
NULL,
NULL,
- _gnutls_proc_certificate,
+ _gnutls_proc_crt,
NULL, /* certificate */
proc_srp_cert_server_kx,
_gnutls_proc_srp_client_kx,
diff --git a/lib/gnutls_auth.h b/lib/gnutls_auth.h
index d431442..51ffb35 100644
--- a/lib/gnutls_auth.h
+++ b/lib/gnutls_auth.h
@@ -32,8 +32,8 @@ typedef struct mod_auth_st_int
int (*gnutls_generate_client_certificate) (gnutls_session_t,
gnutls_buffer_st*);
int (*gnutls_generate_server_kx) (gnutls_session_t, gnutls_buffer_st*);
int (*gnutls_generate_client_kx) (gnutls_session_t, gnutls_buffer_st*);
/* used in SRP */
- int (*gnutls_generate_client_cert_vrfy) (gnutls_session_t, gnutls_buffer_st
*);
- int (*gnutls_generate_server_certificate_request) (gnutls_session_t,
+ int (*gnutls_generate_client_crt_vrfy) (gnutls_session_t, gnutls_buffer_st
*);
+ int (*gnutls_generate_server_crt_request) (gnutls_session_t,
gnutls_buffer_st *);
int (*gnutls_process_server_certificate) (gnutls_session_t, uint8_t *,
@@ -42,8 +42,8 @@ typedef struct mod_auth_st_int
size_t);
int (*gnutls_process_server_kx) (gnutls_session_t, uint8_t *, size_t);
int (*gnutls_process_client_kx) (gnutls_session_t, uint8_t *, size_t);
- int (*gnutls_process_client_cert_vrfy) (gnutls_session_t, uint8_t *, size_t);
- int (*gnutls_process_server_certificate_request) (gnutls_session_t,
+ int (*gnutls_process_client_crt_vrfy) (gnutls_session_t, uint8_t *, size_t);
+ int (*gnutls_process_server_crt_request) (gnutls_session_t,
uint8_t *, size_t);
} mod_auth_st;
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index f0ceb7b..f2331d0 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2510,7 +2510,7 @@ _gnutls_handshake_client (gnutls_session_t session)
*/
if (session->internals.resumed == RESUME_FALSE) /* if we are not
resuming */
- ret = _gnutls_recv_server_certificate_request (session);
+ ret = _gnutls_recv_server_crt_request (session);
STATE = STATE5;
IMED_RET ("recv server certificate request message", ret, 1);
@@ -2794,7 +2794,7 @@ _gnutls_handshake_server (gnutls_session_t session)
/* Send certificate request - if requested to */
if (session->internals.resumed == RESUME_FALSE)
ret =
- _gnutls_send_server_certificate_request (session, AGAIN (STATE5));
+ _gnutls_send_server_crt_request (session, AGAIN (STATE5));
STATE = STATE5;
IMED_RET ("send server cert request", ret, 0);
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 23349dd..e9c617d 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -396,7 +396,7 @@ struct gnutls_key_st
auth_cred_st *cred; /* used to specify keys/certificates etc */
- int certificate_requested;
+ int crt_requested;
/* some ciphersuites use this
* to provide client authentication.
* 1 if client auth was requested
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c
index 6ab71c9..c38de18 100644
--- a/lib/gnutls_kx.c
+++ b/lib/gnutls_kx.c
@@ -204,13 +204,13 @@ cleanup:
* client.
*/
int
-_gnutls_send_server_certificate_request (gnutls_session_t session, int again)
+_gnutls_send_server_crt_request (gnutls_session_t session, int again)
{
gnutls_buffer_st data;
int ret = 0;
if (session->internals.
- auth_struct->gnutls_generate_server_certificate_request == NULL)
+ auth_struct->gnutls_generate_server_crt_request == NULL)
return 0;
if (session->internals.send_cert_req <= 0)
@@ -222,7 +222,7 @@ _gnutls_send_server_certificate_request (gnutls_session_t
session, int again)
{
ret =
session->internals.
- auth_struct->gnutls_generate_server_certificate_request (session,
+ auth_struct->gnutls_generate_server_crt_request (session,
&data);
if (ret < 0)
@@ -299,15 +299,15 @@ _gnutls_send_client_certificate_verify (gnutls_session_t
session, int again)
/* if certificate verify is not needed just exit
*/
- if (session->key->certificate_requested == 0)
+ if (session->key->crt_requested == 0)
return 0;
- if (session->internals.auth_struct->gnutls_generate_client_cert_vrfy ==
+ if (session->internals.auth_struct->gnutls_generate_client_crt_vrfy ==
NULL)
{
gnutls_assert ();
- return 0; /* this algorithm does not support
cli_cert_vrfy
+ return 0; /* this algorithm does not support
cli_crt_vrfy
*/
}
@@ -317,7 +317,7 @@ _gnutls_send_client_certificate_verify (gnutls_session_t
session, int again)
{
ret =
session->internals.
- auth_struct->gnutls_generate_client_cert_vrfy (session, &data);
+ auth_struct->gnutls_generate_client_crt_vrfy (session, &data);
if (ret < 0)
{
gnutls_assert();
@@ -350,7 +350,7 @@ _gnutls_send_client_certificate (gnutls_session_t session,
int again)
int ret = 0;
- if (session->key->certificate_requested == 0)
+ if (session->key->crt_requested == 0)
return 0;
if (session->internals.auth_struct->gnutls_generate_client_certificate ==
@@ -493,13 +493,13 @@ _gnutls_recv_server_kx_message (gnutls_session_t session)
}
int
-_gnutls_recv_server_certificate_request (gnutls_session_t session)
+_gnutls_recv_server_crt_request (gnutls_session_t session)
{
gnutls_buffer_st buf;
int ret = 0;
if (session->internals.
- auth_struct->gnutls_process_server_certificate_request != NULL)
+ auth_struct->gnutls_process_server_crt_request != NULL)
{
ret =
@@ -517,7 +517,7 @@ _gnutls_recv_server_certificate_request (gnutls_session_t
session)
ret =
session->internals.
- auth_struct->gnutls_process_server_certificate_request (session,
buf.data,
+ auth_struct->gnutls_process_server_crt_request (session, buf.data,
buf.length);
_gnutls_buffer_clear (&buf);
if (ret < 0)
@@ -644,7 +644,7 @@ _gnutls_recv_client_certificate (gnutls_session_t session)
if (ret == GNUTLS_E_NO_CERTIFICATE_FOUND && optional != 0)
ret = 0;
else
- session->key->certificate_requested = 1;
+ session->key->crt_requested = 1;
cleanup:
_gnutls_buffer_clear(&buf);
@@ -697,11 +697,11 @@ _gnutls_recv_client_certificate_verify_message
(gnutls_session_t session)
int ret = 0;
- if (session->internals.auth_struct->gnutls_process_client_cert_vrfy == NULL)
+ if (session->internals.auth_struct->gnutls_process_client_crt_vrfy == NULL)
return 0;
if (session->internals.send_cert_req == 0 ||
- session->key->certificate_requested == 0)
+ session->key->crt_requested == 0)
{
return 0;
}
@@ -724,7 +724,7 @@ _gnutls_recv_client_certificate_verify_message
(gnutls_session_t session)
ret =
session->internals.
- auth_struct->gnutls_process_client_cert_vrfy (session, buf.data,
+ auth_struct->gnutls_process_client_crt_vrfy (session, buf.data,
buf.length);
cleanup:
diff --git a/lib/gnutls_kx.h b/lib/gnutls_kx.h
index 0ab24eb..e1b34ea 100644
--- a/lib/gnutls_kx.h
+++ b/lib/gnutls_kx.h
@@ -31,7 +31,7 @@ int _gnutls_generate_master (gnutls_session_t session, int
keep_premaster);
int _gnutls_recv_client_certificate (gnutls_session_t session);
int _gnutls_recv_server_certificate (gnutls_session_t session);
int _gnutls_send_client_certificate (gnutls_session_t session, int again);
-int _gnutls_recv_server_certificate_request (gnutls_session_t session);
-int _gnutls_send_server_certificate_request (gnutls_session_t session,
+int _gnutls_recv_server_crt_request (gnutls_session_t session);
+int _gnutls_send_server_crt_request (gnutls_session_t session,
int again);
int _gnutls_recv_client_certificate_verify_message (gnutls_session_t session);
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index d58544b..a5e85bd 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -434,10 +434,10 @@ _gnutls_handshake_verify_data (gnutls_session_t session,
gnutls_pcert_st* cert,
/* Client certificate verify calculations
*/
-/* this is _gnutls_handshake_verify_cert_vrfy for TLS 1.2
+/* this is _gnutls_handshake_verify_crt_vrfy for TLS 1.2
*/
static int
-_gnutls_handshake_verify_cert_vrfy12 (gnutls_session_t session,
+_gnutls_handshake_verify_crt_vrfy12 (gnutls_session_t session,
gnutls_pcert_st* cert,
gnutls_datum_t * signature,
gnutls_sign_algorithm_t sign_algo)
@@ -480,7 +480,7 @@ _gnutls_handshake_verify_cert_vrfy12 (gnutls_session_t
session,
* verify message).
*/
int
-_gnutls_handshake_verify_cert_vrfy (gnutls_session_t session,
+_gnutls_handshake_verify_crt_vrfy (gnutls_session_t session,
gnutls_pcert_st *cert,
gnutls_datum_t * signature,
gnutls_sign_algorithm_t sign_algo)
@@ -497,7 +497,7 @@ _gnutls_handshake_verify_cert_vrfy (gnutls_session_t
session,
if (_gnutls_version_has_selectable_sighash(ver))
- return _gnutls_handshake_verify_cert_vrfy12 (session, cert, signature,
+ return _gnutls_handshake_verify_crt_vrfy12 (session, cert, signature,
sign_algo);
ret =
@@ -571,10 +571,10 @@ _gnutls_handshake_verify_cert_vrfy (gnutls_session_t
session,
}
-/* the same as _gnutls_handshake_sign_cert_vrfy except that it is made for TLS
1.2
+/* the same as _gnutls_handshake_sign_crt_vrfy except that it is made for TLS
1.2
*/
static int
-_gnutls_handshake_sign_cert_vrfy12 (gnutls_session_t session,
+_gnutls_handshake_sign_crt_vrfy12 (gnutls_session_t session,
gnutls_pcert_st* cert, gnutls_privkey_t
pkey,
gnutls_datum_t * signature)
{
@@ -627,7 +627,7 @@ _gnutls_handshake_sign_cert_vrfy12 (gnutls_session_t
session,
* For TLS1.2 returns the signature algorithm used on success, or a negative
error code;
*/
int
-_gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
+_gnutls_handshake_sign_crt_vrfy (gnutls_session_t session,
gnutls_pcert_st* cert, gnutls_privkey_t pkey,
gnutls_datum_t * signature)
{
@@ -640,7 +640,7 @@ _gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
gnutls_pk_algorithm_t pk = gnutls_pubkey_get_pk_algorithm(cert->pubkey,
NULL);
if (_gnutls_version_has_selectable_sighash(ver))
- return _gnutls_handshake_sign_cert_vrfy12 (session, cert, pkey,
+ return _gnutls_handshake_sign_crt_vrfy12 (session, cert, pkey,
signature);
ret =
diff --git a/lib/gnutls_sig.h b/lib/gnutls_sig.h
index 420b273..187ab83 100644
--- a/lib/gnutls_sig.h
+++ b/lib/gnutls_sig.h
@@ -25,7 +25,7 @@
#include <gnutls/abstract.h>
-int _gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
+int _gnutls_handshake_sign_crt_vrfy (gnutls_session_t session,
gnutls_pcert_st* cert,
gnutls_privkey_t pkey,
gnutls_datum_t * signature);
@@ -37,7 +37,7 @@ int _gnutls_handshake_sign_data (gnutls_session_t session,
gnutls_datum_t * signature,
gnutls_sign_algorithm_t * algo);
-int _gnutls_handshake_verify_cert_vrfy (gnutls_session_t session,
+int _gnutls_handshake_verify_crt_vrfy (gnutls_session_t session,
gnutls_pcert_st* cert,
gnutls_datum_t * signature,
gnutls_sign_algorithm_t);
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index 28dcade..ed081a3 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -561,7 +561,7 @@ gnutls_certificate_get_peers (gnutls_session_t
int
gnutls_certificate_client_get_request_status (gnutls_session_t session)
{
- return session->key->certificate_requested;
+ return session->key->crt_requested;
}
/**
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-39-g02265a2,
Nikos Mavrogiannopoulos <=