From: Nikos Mavrogiannopoulos Date: Tue, 29 Jan 2002 11:52:09 +0000 (+0000) Subject: Added in CertificateStatus: X-Git-Tag: gnutls_0_3_90~153 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e79ea947fc51eff96017a48ab4cb5ea0e5ae5332;p=thirdparty%2Fgnutls.git Added in CertificateStatus: GNUTLS_CERT_CORRUPTED (replaces GNUTLS_CERT_INVALID) GNUTLS_CERT_REVOKED --- diff --git a/doc/tex/ex1.tex b/doc/tex/ex1.tex index 50e3ee6f3c..ffe7540250 100644 --- a/doc/tex/ex1.tex +++ b/doc/tex/ex1.tex @@ -46,7 +46,7 @@ int main() exit(1); } /* X509 stuff */ - if (gnutls_x509pki_allocate_client_sc(&xcred, 0) < 0) { /* no client private key */ + if (gnutls_certificate_allocate_client_sc(&xcred, 0) < 0) { /* no client private key */ fprintf(stderr, "memory error\n"); exit(1); } @@ -169,7 +169,7 @@ int main() } /* for() */ - gnutls_x509pki_free_client_sc(xcred); + gnutls_certificate_free_client_sc(xcred); gnutls_global_deinit(); diff --git a/doc/tex/ex2.tex b/doc/tex/ex2.tex index ba1b38672a..ca9d9158af 100644 --- a/doc/tex/ex2.tex +++ b/doc/tex/ex2.tex @@ -36,7 +36,7 @@ int main() exit(1); } /* X509 stuff */ - if (gnutls_x509pki_allocate_client_sc(&xcred, 0) < 0) { /* no client private key */ + if (gnutls_certificate_allocate_client_sc(&xcred, 0) < 0) { /* no client private key */ fprintf(stderr, "memory error\n"); exit(1); } @@ -138,7 +138,7 @@ int main() gnutls_deinit(state); - gnutls_x509pki_free_client_sc(xcred); + gnutls_certificate_free_client_sc(xcred); gnutls_global_deinit(); diff --git a/doc/tex/ex3.tex b/doc/tex/ex3.tex index 6de398d079..42f5808526 100644 --- a/doc/tex/ex3.tex +++ b/doc/tex/ex3.tex @@ -54,8 +54,11 @@ int print_info(GNUTLS_STATE state) case GNUTLS_CERT_NONE: printf("- Peer did not send any X509 Certificate.\n"); break; - case GNUTLS_CERT_INVALID: - printf("- Peer's X509 Certificate was invalid\n"); + case GNUTLS_CERT_CORRUPTED: + printf("- Peer's X509 Certificate was corrupt\n"); + break; + case GNUTLS_CERT_REVOKED: + printf("- Peer's X509 Certificate was revoked\n"); break; } diff --git a/doc/tex/serv1.tex b/doc/tex/serv1.tex index 4ecf20be70..6d2315be7c 100644 --- a/doc/tex/serv1.tex +++ b/doc/tex/serv1.tex @@ -61,7 +61,7 @@ GNUTLS_STATE initialize_state() /* request client certificate if any. */ - gnutls_x509pki_server_set_cert_request( state, GNUTLS_CERT_REQUEST); + gnutls_certificate_server_set_request( state, GNUTLS_CERT_REQUEST); return state; } @@ -129,7 +129,7 @@ int main() fprintf(stderr, "global state initialization error\n"); exit(1); } - if (gnutls_x509pki_allocate_server_sc(&x509_cred, 1) < 0) { + if (gnutls_certificate_allocate_server_sc(&x509_cred, 1) < 0) { fprintf(stderr, "memory error\n"); exit(1); } @@ -230,7 +230,7 @@ int main() } close(listen_sd); - gnutls_x509pki_free_server_sc(x509_cred); + gnutls_certificate_free_server_sc(x509_cred); gnutls_srp_free_server_sc(srp_cred); gnutls_global_deinit(); diff --git a/lib/auth_cert.c b/lib/auth_cert.c index 871abd5201..c1671534de 100644 --- a/lib/auth_cert.c +++ b/lib/auth_cert.c @@ -1294,7 +1294,7 @@ int gnutls_x509pki_get_peer_certificate_status(GNUTLS_STATE state) if (verify < 0) { gnutls_assert(); - return GNUTLS_CERT_INVALID; + return GNUTLS_CERT_CORRUPTED; } @@ -1393,7 +1393,7 @@ int gnutls_x509pki_verify_certificate( const gnutls_datum* cert_list, int cert_l if (verify < 0) { gnutls_assert(); - return GNUTLS_CERT_INVALID; + return GNUTLS_CERT_CORRUPTED; } return verify; diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in index 69687917eb..36ff3ee8a8 100644 --- a/lib/gnutls.h.in.in +++ b/lib/gnutls.h.in.in @@ -56,7 +56,10 @@ typedef enum GNUTLS_AlertDescription { GNUTLS_A_CLOSE_NOTIFY, GNUTLS_A_UNEXPECTE GNUTLS_A_NO_RENEGOTIATION=100 } GNUTLS_AlertDescription; -typedef enum GNUTLS_CertificateStatus { GNUTLS_CERT_TRUSTED=1, GNUTLS_CERT_NOT_TRUSTED, GNUTLS_CERT_EXPIRED, GNUTLS_CERT_INVALID, GNUTLS_CERT_NONE } GNUTLS_CertificateStatus; +typedef enum GNUTLS_CertificateStatus { GNUTLS_CERT_TRUSTED=1, GNUTLS_CERT_NOT_TRUSTED, + GNUTLS_CERT_EXPIRED, GNUTLS_CERT_REVOKED, + GNUTLS_CERT_CORRUPTED, GNUTLS_CERT_NONE +} GNUTLS_CertificateStatus; typedef enum GNUTLS_CertificateRequest { GNUTLS_CERT_IGNORE, GNUTLS_CERT_REQUEST=1, GNUTLS_CERT_REQUIRE } GNUTLS_CertificateRequest; typedef enum GNUTLS_CloseRequest { GNUTLS_SHUT_RDWR=0, GNUTLS_SHUT_WR=1 } GNUTLS_CloseRequest; diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index 81c1738614..0e9994ee8c 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -121,7 +121,8 @@ typedef enum AlertDescription { GNUTLS_A_CLOSE_NOTIFY, GNUTLS_A_UNEXPECTED_MESSA typedef enum CertificateStatus { GNUTLS_CERT_TRUSTED=1, GNUTLS_CERT_NOT_TRUSTED, GNUTLS_CERT_EXPIRED, - GNUTLS_CERT_INVALID, GNUTLS_CERT_NONE + GNUTLS_CERT_REVOKED, GNUTLS_CERT_CORRUPTED, + GNUTLS_CERT_NONE } CertificateStatus; #define GNUTLS_CertificateStatus CertificateStatus diff --git a/lib/x509_sig_check.c b/lib/x509_sig_check.c index 08f30142ba..c7fb60fd98 100644 --- a/lib/x509_sig_check.c +++ b/lib/x509_sig_check.c @@ -195,7 +195,7 @@ gnutls_datum tbs; tbs = _gnutls_get_tbs( cert); if (tbs.data==NULL) { gnutls_assert(); - return GNUTLS_CERT_INVALID; + return GNUTLS_CERT_CORRUPTED; } _gnutls_x509_log("X509_VERIFY: CERT[%s]\n", GET_CN(cert->raw)); @@ -232,7 +232,7 @@ gnutls_datum tbs; _gnutls_x509_log( "X509_SIG: PK: %d\n", issuer->subject_pk_algorithm); gnutls_assert(); - return GNUTLS_CERT_INVALID; + return GNUTLS_CERT_CORRUPTED; } diff --git a/src/cli.c b/src/cli.c index 47015f00e7..346556a66a 100644 --- a/src/cli.c +++ b/src/cli.c @@ -133,13 +133,13 @@ int main(int argc, char** argv) } /* X509 stuff */ - if (gnutls_x509pki_allocate_client_sc( &xcred, 2) < 0) { /* space for 2 certificates */ + if (gnutls_certificate_allocate_client_sc( &xcred, 2) < 0) { /* space for 2 certificates */ fprintf(stderr, "memory error\n"); exit(1); } - gnutls_x509pki_set_client_trust_file( xcred, CAFILE, CRLFILE); - gnutls_x509pki_set_client_key_file( xcred, CLICERTFILE1, CLIKEYFILE1); - gnutls_x509pki_set_client_key_file( xcred, CLICERTFILE2, CLIKEYFILE2); + gnutls_x509pki_set_trust_file( xcred, CAFILE, CRLFILE); + gnutls_x509pki_set_key_file( xcred, CLICERTFILE1, CLIKEYFILE1); + gnutls_x509pki_set_key_file( xcred, CLICERTFILE2, CLIKEYFILE2); /* gnutls_x509pki_set_client_cert_callback( xcred, cert_callback); */ /* SRP stuff */ @@ -369,7 +369,7 @@ int main(int argc, char** argv) gnutls_deinit( state); gnutls_srp_free_client_sc( cred); - gnutls_x509pki_free_client_sc( xcred); + gnutls_certificate_free_client_sc( xcred); gnutls_anon_free_client_sc( anon_cred); gnutls_global_deinit(); diff --git a/src/common.h b/src/common.h index 2b3ac21fcb..212d04abf8 100644 --- a/src/common.h +++ b/src/common.h @@ -43,8 +43,8 @@ GNUTLS_KXAlgorithm kx; case GNUTLS_CRD_CERTIFICATE: /* in case of X509 PKI */ - cert_list = gnutls_x509pki_client_get_peer_certificate_list( state, &cert_list_size); - status = gnutls_x509pki_client_get_peer_certificate_status( state); + cert_list = gnutls_x509pki_get_peer_certificate_list( state, &cert_list_size); + status = gnutls_x509pki_get_peer_certificate_status( state); switch( status) { case GNUTLS_CERT_NOT_TRUSTED: @@ -59,7 +59,7 @@ GNUTLS_KXAlgorithm kx; case GNUTLS_CERT_NONE: printf("- Peer did not send any X509 Certificate.\n"); break; - case GNUTLS_CERT_INVALID: + case GNUTLS_CERT_CORRUPTED: printf("- Peer's X509 Certificate was invalid\n"); break; } diff --git a/src/serv.c b/src/serv.c index e4ebbc1b3f..3bbe205546 100644 --- a/src/serv.c +++ b/src/serv.c @@ -104,7 +104,7 @@ GNUTLS_STATE initialize_state(void) gnutls_mac_set_priority(state, mac_priority); - gnutls_x509pki_server_set_cert_request( state, GNUTLS_CERT_REQUEST); + gnutls_certificate_server_set_request( state, GNUTLS_CERT_REQUEST); return state; } @@ -256,22 +256,22 @@ int main(int argc, char **argv) exit(1); } - if (gnutls_x509pki_allocate_server_sc(&x509_cred, 2) < 0) { + if (gnutls_certificate_allocate_server_sc(&x509_cred, 2) < 0) { fprintf(stderr, "memory error\n"); exit(1); } - if (gnutls_x509pki_set_server_trust_file( x509_cred, CAFILE, CRLFILE) < 0) { + if (gnutls_x509pki_set_trust_file( x509_cred, CAFILE, CRLFILE) < 0) { fprintf(stderr, "X509 PARSE ERROR\nDid you have ca.pem?\n"); exit(1); } - if (gnutls_x509pki_set_server_key_file( x509_cred, CERTFILE1, KEYFILE1) < 0) { + if (gnutls_x509pki_set_key_file( x509_cred, CERTFILE1, KEYFILE1) < 0) { fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n"); exit(1); } - if (gnutls_x509pki_set_server_key_file( x509_cred, CERTFILE2, KEYFILE2) < 0) { + if (gnutls_x509pki_set_key_file( x509_cred, CERTFILE2, KEYFILE2) < 0) { fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n"); exit(1); } @@ -405,7 +405,7 @@ int main(int argc, char **argv) } close(listen_sd); - gnutls_x509pki_free_server_sc(x509_cred); + gnutls_certificate_free_server_sc(x509_cred); gnutls_srp_free_server_sc(srp_cred); gnutls_anon_free_server_sc(dh_cred);