diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-09-25 12:07:10 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-09-26 12:43:18 +0200 |
commit | 7a2f81e178ee9b29090a9cac286f38e9996a389d (patch) | |
tree | 8bde547fd9f08f0c817adaad3759f35d5a52b29d | |
parent | 69b2acc470da85d0364effd9584b4ceea18e8f2d (diff) | |
download | gnutls-7a2f81e178ee9b29090a9cac286f38e9996a389d.tar.gz |
doc: fixed missing function and enumeration parameters
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r-- | lib/includes/gnutls/gnutls.h.in | 5 | ||||
-rw-r--r-- | lib/includes/gnutls/x509.h | 2 | ||||
-rw-r--r-- | lib/openpgp_compat.c | 2 | ||||
-rw-r--r-- | lib/privkey_raw.c | 2 | ||||
-rw-r--r-- | lib/x509/privkey.c | 5 | ||||
-rw-r--r-- | lib/x509/x509.c | 3 |
6 files changed, 15 insertions, 4 deletions
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in index 49990b5f50..ec8d6f4efc 100644 --- a/lib/includes/gnutls/gnutls.h.in +++ b/lib/includes/gnutls/gnutls.h.in @@ -269,6 +269,10 @@ typedef enum { * @GNUTLS_MAC_AEAD: MAC implicit through AEAD cipher. * @GNUTLS_MAC_UMAC_96: The UMAC-96 MAC algorithm. * @GNUTLS_MAC_UMAC_128: The UMAC-128 MAC algorithm. + * @GNUTLS_MAC_SHA3_224: Reserved; unimplemented. + * @GNUTLS_MAC_SHA3_256: Reserved; unimplemented. + * @GNUTLS_MAC_SHA3_384: Reserved; unimplemented. + * @GNUTLS_MAC_SHA3_512: Reserved; unimplemented. * * Enumeration of different Message Authentication Code (MAC) * algorithms. @@ -559,6 +563,7 @@ typedef enum { * @GNUTLS_HANDSHAKE_SUPPLEMENTAL: Supplemental. * @GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC: Change Cipher Spec. * @GNUTLS_HANDSHAKE_CLIENT_HELLO_V2: SSLv2 Client Hello. + * @GNUTLS_HANDSHAKE_ENCRYPTED_EXTENSIONS: Encrypted extensions message. * * Enumeration of different TLS handshake packets. */ diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h index 1573577d96..13b642a840 100644 --- a/lib/includes/gnutls/x509.h +++ b/lib/includes/gnutls/x509.h @@ -1097,7 +1097,7 @@ unsigned gnutls_x509_crt_check_key_purpose(gnutls_x509_crt_t cert, * @GNUTLS_PKCS_PBES2_AES_192: PBES2 AES-192. * @GNUTLS_PKCS_PBES2_AES_256: PBES2 AES-256. * @GNUTLS_PKCS_PBES2_DES: PBES2 single DES. - * @GNUTLS_PKCS_PBES2_DES_MD5: PBES1 with single DES; for compatibility with openssl only. + * @GNUTLS_PKCS_PBES1_DES_MD5: PBES1 with single DES; for compatibility with openssl only. * @GNUTLS_PKCS_PBES2_GOST_TC26Z: PBES2 GOST 28147-89 CFB with TC26-Z S-box. * @GNUTLS_PKCS_PBES2_GOST_CPA: PBES2 GOST 28147-89 CFB with CryptoPro-A S-box. * @GNUTLS_PKCS_PBES2_GOST_CPB: PBES2 GOST 28147-89 CFB with CryptoPro-B S-box. diff --git a/lib/openpgp_compat.c b/lib/openpgp_compat.c index ff43403a7b..2a4679890b 100644 --- a/lib/openpgp_compat.c +++ b/lib/openpgp_compat.c @@ -653,6 +653,7 @@ int gnutls_pubkey_import_openpgp_raw(gnutls_pubkey_t pkey, * @output_data: will contain the key ID * @output_data_size: holds the size of output_data (and will be * replaced by the actual size of parameters) + * @subkey: ignored * * This function is no-op. * @@ -793,6 +794,7 @@ int gnutls_pcert_export_openpgp(gnutls_pcert_st * pcert, /** * gnutls_openpgp_privkey_sign_hash: * @session: is a gnutls session + * @status: is ignored * * This function is no-op. * diff --git a/lib/privkey_raw.c b/lib/privkey_raw.c index 4db22d84b4..6272964128 100644 --- a/lib/privkey_raw.c +++ b/lib/privkey_raw.c @@ -270,6 +270,7 @@ int ret; * @key: Holds the public key * @curve: will hold the curve * @digest: will hold the digest + * @paramset: will hold the GOST parameter set ID * @x: will hold the x coordinate * @y: will hold the y coordinate * @k: will hold the private key @@ -482,6 +483,7 @@ error: * @key: The key * @curve: holds the curve * @digest: holds the digest + * @paramset: holds the GOST parameter set ID * @x: holds the x * @y: holds the y * @k: holds the k diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 562ad418d0..db1279e842 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -1186,7 +1186,8 @@ gnutls_x509_privkey_import_ecc_raw(gnutls_x509_privkey_t key, * gnutls_x509_privkey_import_gost_raw: * @key: The data to store the parsed key * @curve: holds the curve - * @paramset: holds the parameters id + * @digest: will hold the digest + * @paramset: will hold the GOST parameter set ID * @x: holds the x * @y: holds the y * @k: holds the k @@ -1559,7 +1560,7 @@ int gnutls_x509_privkey_export_ecc_raw(gnutls_x509_privkey_t key, * @key: a key * @curve: will hold the curve * @digest: will hold the digest - * @paramset: will hold the parameters id + * @paramset: will hold the GOST parameter set ID * @x: will hold the x coordinate * @y: will hold the y coordinate * @k: will hold the private key diff --git a/lib/x509/x509.c b/lib/x509/x509.c index 4aff55eba9..1880f6acc3 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -3526,7 +3526,8 @@ gnutls_x509_crt_get_pk_ecc_raw(gnutls_x509_crt_t crt, * gnutls_x509_crt_get_pk_gost_raw: * @crt: Holds the certificate * @curve: will hold the curve - * @paramset: will hold paramset + * @digest: will hold the digest + * @paramset: will hold the GOST parameter set ID * @x: will hold x * @y: will hold y * |