diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tex/ex3.tex | 30 | ||||
| -rw-r--r-- | doc/tex/serv1.tex | 2 |
2 files changed, 18 insertions, 14 deletions
diff --git a/doc/tex/ex3.tex b/doc/tex/ex3.tex index d6b451ddad..6eec57ddc6 100644 --- a/doc/tex/ex3.tex +++ b/doc/tex/ex3.tex @@ -1,17 +1,19 @@ \begin{verbatim} #define PRINTX(x,y) if (y[0]!=0) printf(" - %s %s\n", x, y) -#define PRINT_DN(X) PRINTX( "CN:", x509_info->X.common_name); \ - PRINTX( "OU:", x509_info->X.organizational_unit_name); \ - PRINTX( "O:", x509_info->X.organization); \ - PRINTX( "L:", x509_info->X.locality_name); \ - PRINTX( "S:", x509_info->X.state_or_province_name); \ - PRINTX( "C:", x509_info->X.country); +#define PRINT_DN(X) PRINTX( "CN:", X->common_name); \ + PRINTX( "OU:", X->organizational_unit_name); \ + PRINTX( "O:", X->organization); \ + PRINTX( "L:", X->locality_name); \ + PRINTX( "S:", X->state_or_province_name); \ + PRINTX( "C:", X->country); \ + PRINTX( "SAN:", gnutls_x509pki_client_get_subject_alt_name(x509_info)) int print_info(GNUTLS_STATE state) { const char *tmp; const X509PKI_CLIENT_AUTH_INFO *x509_info; + const gnutls_DN* dn; /* print the key exchange's algorithm name */ @@ -23,7 +25,7 @@ int print_info(GNUTLS_STATE state) if (gnutls_get_auth_info_type(state) == GNUTLS_X509PKI) { x509_info = gnutls_get_auth_info(state); if (x509_info != NULL) { - switch (x509_info->peer_certificate_status) { + switch ( gnutls_x509pki_client_get_peer_certificate_status(x509_info)) { case GNUTLS_CERT_NOT_TRUSTED: printf("- Peer's X509 Certificate was NOT verified\n"); break; @@ -40,15 +42,17 @@ int print_info(GNUTLS_STATE state) } } - } - printf(" - Certificate info:\n"); - printf(" - Certificate version: #%d\n", x509_info->peer_certificate_version); + printf(" - Certificate info:\n"); + printf(" - Certificate version: #%d\n", gnutls_x509pki_client_get_peer_certificate_version(x509_info)); - PRINT_DN(peer_dn); + dn = gnutls_x509pki_client_get_peer_dn( x509_info); + PRINT_DN(dn); - printf(" - Certificate Issuer's info:\n"); - PRINT_DN(issuer_dn); + printf(" - Certificate Issuer's info:\n"); + dn = gnutls_x509pki_client_get_issuer_dn( x509_info); + PRINT_DN(dn); + } tmp = gnutls_version_get_name(gnutls_get_current_version(state)); printf("- Version: %s\n", tmp); diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex index c605ab435b..0cbdd96f5e 100644 --- a/doc/tex/serv1.tex +++ b/doc/tex/serv1.tex @@ -77,7 +77,7 @@ void print_info(GNUTLS_STATE state) srp_info = gnutls_get_auth_info(state); if (srp_info != NULL) printf("\n- User '%s' connected\n", - srp_info->username); + gnutls_srp_server_get_username(srp_info)); } /* print state information */ tmp = gnutls_version_get_name(gnutls_get_current_version(state)); |