diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-11-02 08:12:41 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-11-02 08:12:41 +0000 |
| commit | 4355f3c96b1db1d66b17582f94353abfde612760 (patch) | |
| tree | a4ee62cec2598008b4168919cba08a31021d3058 | |
| parent | 3930c5dabaea8c863ee04b751f6a097e54d4b375 (diff) | |
| download | gnutls-4355f3c96b1db1d66b17582f94353abfde612760.tar.gz | |
*** empty log message ***
| -rw-r--r-- | doc/tex/certificate.tex | 3 | ||||
| -rw-r--r-- | doc/tex/library.tex | 2 | ||||
| -rw-r--r-- | includes/gnutls/openpgp.h | 3 | ||||
| -rw-r--r-- | includes/gnutls/x509.h | 18 |
4 files changed, 18 insertions, 8 deletions
diff --git a/doc/tex/certificate.tex b/doc/tex/certificate.tex index 62064e839e..4b178962d0 100644 --- a/doc/tex/certificate.tex +++ b/doc/tex/certificate.tex @@ -59,7 +59,8 @@ is equivalent to the previous one, and will verify the peer's certificate in a T \begin{tabular}{|l|p{9cm}|} \hline -CERT\_INVALID & The certificate is not signed by one of the known authorities. +CERT\_INVALID & The certificate is not signed by one of the known authorities, or +the signature is invalid. \\ \hline CERT\_REVOKED & The certificate has been revoked. diff --git a/doc/tex/library.tex b/doc/tex/library.tex index e045e5bdc7..e6c1621a79 100644 --- a/doc/tex/library.tex +++ b/doc/tex/library.tex @@ -19,7 +19,7 @@ Important features of the \gnutls{} library include: \item Thread safety \item Support for both \tlsI{} and \sslIII{} protocols. \item Support for both {\bf X.509} and {\bf OpenPGP} certificates. -\item Support for handling and verification of certificates +\item Support for handling and verification of certificates. \item Support for {\bf SRP} for \tls{} authentication. \item Support for \tls{} {\bf Extension mechanism}. \item Support for \tls{} {\bf Compression Methods}. diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h index aa0899d70d..e209cf67e7 100644 --- a/includes/gnutls/openpgp.h +++ b/includes/gnutls/openpgp.h @@ -94,6 +94,9 @@ int gnutls_openpgp_key_verify_ring( unsigned int flags, unsigned int * verify /* the output of the verification */); +int gnutls_openpgp_key_verify_self( gnutls_openpgp_key key, + unsigned int flags, unsigned int *verify); + int gnutls_openpgp_key_verify_trustdb( gnutls_openpgp_key key, gnutls_openpgp_trustdb db, diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h index 55a90f9448..a87f2cfa59 100644 --- a/includes/gnutls/x509.h +++ b/includes/gnutls/x509.h @@ -231,14 +231,20 @@ int gnutls_x509_crt_get_fingerprint(gnutls_x509_crt cert, /* Flags for the gnutls_x509_privkey_export_pkcs8() function. */ -typedef enum gnutls_privkey_pkcs8_flags { - GNUTLS_PKCS8_PLAIN=1, /* if set the private key will not +typedef enum gnutls_pkcs_encrypt_flags { + GNUTLS_PKCS_PLAIN=1, /* if set the private key will not * be encrypted. */ - GNUTLS_PKCS8_USE_PKCS12_3DES, - GNUTLS_PKCS8_USE_PKCS12_ARCFOUR, - GNUTLS_PKCS8_USE_PKCS12_RC2_40 -} gnutls_privkey_pkcs8_flags; + GNUTLS_PKCS_USE_PKCS12_3DES=2, + GNUTLS_PKCS_USE_PKCS12_ARCFOUR=4, + GNUTLS_PKCS_USE_PKCS12_RC2_40=8, + GNUTLS_PKCS_USE_PBES2_3DES=16 +} gnutls_pkcs_encrypt_flags; + +#define GNUTLS_PKCS8_PLAIN GNUTLS_PKCS_PLAIN +#define GNUTLS_PKCS8_USE_PKCS12_3DES GNUTLS_PKCS_USE_PKCS12_3DES +#define GNUTLS_PKCS8_USE_PKCS12_ARCFOUR GNUTLS_PKCS_USE_PKCS12_ARCFOUR +#define GNUTLS_PKCS8_USE_PKCS12_RC2_40 GNUTLS_PKCS_USE_PKCS12_RC2_40 int gnutls_x509_privkey_init(gnutls_x509_privkey * key); void gnutls_x509_privkey_deinit(gnutls_x509_privkey key); |