diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-03-30 09:42:09 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-03-30 09:42:09 +0000 |
| commit | 5a197aa0a2cfafaa60db1eb0e24cdaaab45d6ae5 (patch) | |
| tree | 6776327c7f7c6db47e1e1996b2a2f167b0275a0e | |
| parent | 8cf07d970ff9cf216e25fcc3089971c49b091230 (diff) | |
| download | gnutls-5a197aa0a2cfafaa60db1eb0e24cdaaab45d6ae5.tar.gz | |
gnutls_certificate_set_x509_trust_*() now accept single DER certificates
or PEM certificate lists.
| -rw-r--r-- | lib/gnutls_x509.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c index 918ea66dcb..aff90cf076 100644 --- a/lib/gnutls_x509.c +++ b/lib/gnutls_x509.c @@ -1220,7 +1220,7 @@ static int read_ca_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, const char *ca, int c { if (type==GNUTLS_X509_FMT_DER) - return parse_pkcs7_cert_mem( &res->x509_ca_list, &res->x509_ncas, + return parse_der_cert_mem( &res->x509_ca_list, &res->x509_ncas, ca, ca_size); else return parse_pem_cert_mem( &res->x509_ca_list, &res->x509_ncas, @@ -1521,7 +1521,7 @@ opaque *pdata; /** * gnutls_certificate_set_x509_trust_mem - Used to add trusted CAs in a GNUTLS_CERTIFICATE_CREDENTIALS structure * @res: is an &GNUTLS_CERTIFICATE_CREDENTIALS structure. - * @CA: is a list of trusted CAs or a PKCS7 encoded list + * @CA: is a list of trusted CAs or a DER certificate * @CRL: is a list of CRLs (ignored for now) * @type: is DER or PEM * @@ -1546,7 +1546,7 @@ int gnutls_certificate_set_x509_trust_mem(GNUTLS_CERTIFICATE_CREDENTIALS res, co /** * gnutls_certificate_set_x509_trust_file - Used to add trusted CAs in a GNUTLS_CERTIFICATE_CREDENTIALS structure * @res: is an &GNUTLS_CERTIFICATE_CREDENTIALS structure. - * @CAFILE: is a file containing the list of trusted CAs (PKCS7 or PEM list) + * @CAFILE: is a file containing the list of trusted CAs (DER or PEM list) * @CRLFILE: is a file containing CRLs (ignored for now) * @type: is PEM or DER * |