diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-06-16 21:53:29 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-06-16 21:53:29 +0200 |
| commit | 73ba24014b8cc937302e82b82d8af22def9c1048 (patch) | |
| tree | 64314785d800ad59efa6aa927aed96387e5add0f | |
| parent | 3ea42fbb8c882738bb3cbe752ac30bd9ae4fbaef (diff) | |
| download | gnutls-73ba24014b8cc937302e82b82d8af22def9c1048.tar.gz | |
doc update
| -rw-r--r-- | lib/x509/pkcs7.c | 9 | ||||
| -rw-r--r-- | lib/x509/x509_ext.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c index 5ab06b1b05..3f61a80cfe 100644 --- a/lib/x509/pkcs7.c +++ b/lib/x509/pkcs7.c @@ -273,9 +273,7 @@ gnutls_pkcs7_import(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * data, * gnutls_pkcs7_get_crt_raw2: * @pkcs7: should contain a gnutls_pkcs7_t type * @indx: contains the index of the certificate to extract - * @certificate: the contents of the certificate will be copied - * there (may be null) - * @certificate_size: should hold the size of the certificate + * @cert: will hold the contents of the certificate; must be deallocated with gnutls_free() * * This function will return a certificate of the PKCS7 or RFC2630 * certificate set. @@ -817,7 +815,7 @@ static int figure_pkcs7_sigdata(gnutls_pkcs7_t pkcs7, const char *root, /** * gnutls_pkcs7_verify_direct: * @pkcs7: should contain a #gnutls_pkcs7_t type - * @signer: the certificate believe to have signed the structure + * @signer: the certificate believed to have signed the structure * @idx: the index of the signature info to check * @data: The data to be verified or %NULL * @flags: Zero or an OR list of #gnutls_certificate_verify_flags @@ -1862,7 +1860,8 @@ static int write_attributes(ASN1_TYPE c2, const char *root, const gnutls_datum_t /** * gnutls_pkcs7_sign: * @pkcs7: should contain a #gnutls_pkcs7_t type - * @signer: the certificate believe to have signed the structure + * @signer: the certificate to sign the structure + * @signer_key: the key to sign the structure * @data: The data to be signed or %NULL if the data are already embedded * @signed_attrs: Any additional attributes to be included in the signed ones (or %NULL) * @unsigned_attrs: Any additional attributes to be included in the unsigned ones (or %NULL) diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c index db0e0a10fc..b4230b21a2 100644 --- a/lib/x509/x509_ext.c +++ b/lib/x509/x509_ext.c @@ -3124,7 +3124,7 @@ int _gnutls_x509_decode_ext(const gnutls_datum_t *der, gnutls_x509_ext_st *out) /** * gnutls_x509_othername_to_virtual: * @oid: The othername object identifier - * @data: The othername data + * @othername: The othername data * @virt_type: GNUTLS_SAN_OTHERNAME_XXX * @virt: allocated printable data * |