aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gnutls.c28
1 files changed, 13 insertions, 15 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index d43534b5ae1..5f412b50042 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -894,7 +894,7 @@ emacs_gnutls_handle_error (gnutls_session_t session, int err)
894} 894}
895 895
896/* convert an integer error to a Lisp_Object; it will be either a 896/* convert an integer error to a Lisp_Object; it will be either a
897 known symbol like `gnutls_e_interrupted' and `gnutls_e_again' or 897 known symbol like 'gnutls_e_interrupted' and 'gnutls_e_again' or
898 simply the integer value of the error. GNUTLS_E_SUCCESS is mapped 898 simply the integer value of the error. GNUTLS_E_SUCCESS is mapped
899 to Qt. */ 899 to Qt. */
900static Lisp_Object 900static Lisp_Object
@@ -1529,7 +1529,7 @@ returned as the :certificate entry. */)
1529} 1529}
1530 1530
1531/* Initialize global GnuTLS state to defaults. 1531/* Initialize global GnuTLS state to defaults.
1532 Call `gnutls-global-deinit' when GnuTLS usage is no longer needed. 1532 Call 'gnutls-global-deinit' when GnuTLS usage is no longer needed.
1533 Return zero on success. */ 1533 Return zero on success. */
1534Lisp_Object 1534Lisp_Object
1535emacs_gnutls_global_init (void) 1535emacs_gnutls_global_init (void)
@@ -1560,7 +1560,7 @@ gnutls_ip_address_p (char *string)
1560 1560
1561# if 0 1561# if 0
1562/* Deinitialize global GnuTLS state. 1562/* Deinitialize global GnuTLS state.
1563 See also `gnutls-global-init'. */ 1563 See also 'gnutls-global-init'. */
1564static Lisp_Object 1564static Lisp_Object
1565emacs_gnutls_global_deinit (void) 1565emacs_gnutls_global_deinit (void)
1566{ 1566{
@@ -2470,11 +2470,10 @@ The KEY can be specified as a buffer or string or in other ways (see
2470Info node `(elisp)Format of GnuTLS Cryptography Inputs'). The KEY 2470Info node `(elisp)Format of GnuTLS Cryptography Inputs'). The KEY
2471will be wiped after use if it's a string. 2471will be wiped after use if it's a string.
2472 2472
2473The IV and INPUT and the optional AEAD_AUTH can be specified as a 2473The IV and INPUT and the optional AEAD_AUTH can also be specified as a
2474buffer or string or in other ways (see Info node `(elisp)Format of 2474buffer or string or in other ways.
2475GnuTLS Cryptography Inputs').
2476 2475
2477The alist of symmetric ciphers can be obtained with `gnutls-ciphers`. 2476The alist of symmetric ciphers can be obtained with `gnutls-ciphers'.
2478The CIPHER may be a string or symbol matching a key in that alist, or 2477The CIPHER may be a string or symbol matching a key in that alist, or
2479a plist with the :cipher-id numeric property, or the number itself. 2478a plist with the :cipher-id numeric property, or the number itself.
2480 2479
@@ -2497,11 +2496,10 @@ The KEY can be specified as a buffer or string or in other ways (see
2497Info node `(elisp)Format of GnuTLS Cryptography Inputs'). The KEY 2496Info node `(elisp)Format of GnuTLS Cryptography Inputs'). The KEY
2498will be wiped after use if it's a string. 2497will be wiped after use if it's a string.
2499 2498
2500The IV and INPUT and the optional AEAD_AUTH can be specified as a 2499The IV and INPUT and the optional AEAD_AUTH can also be specified as a
2501buffer or string or in other ways (see Info node `(elisp)Format of 2500buffer or string or in other ways.
2502GnuTLS Cryptography Inputs').
2503 2501
2504The alist of symmetric ciphers can be obtained with `gnutls-ciphers`. 2502The alist of symmetric ciphers can be obtained with `gnutls-ciphers'.
2505The CIPHER may be a string or symbol matching a key in that alist, or 2503The CIPHER may be a string or symbol matching a key in that alist, or
2506a plist with the `:cipher-id' numeric property, or the number itself. 2504a plist with the `:cipher-id' numeric property, or the number itself.
2507 2505
@@ -2592,10 +2590,10 @@ The KEY can be specified as a buffer or string or in other ways (see
2592Info node `(elisp)Format of GnuTLS Cryptography Inputs'). The KEY 2590Info node `(elisp)Format of GnuTLS Cryptography Inputs'). The KEY
2593will be wiped after use if it's a string. 2591will be wiped after use if it's a string.
2594 2592
2595The INPUT can be specified as a buffer or string or in other 2593The INPUT can also be specified as a buffer or string or in other
2596ways (see Info node `(elisp)Format of GnuTLS Cryptography Inputs'). 2594ways.
2597 2595
2598The alist of MAC algorithms can be obtained with `gnutls-macs`. The 2596The alist of MAC algorithms can be obtained with `gnutls-macs'. The
2599HASH-METHOD may be a string or symbol matching a key in that alist, or 2597HASH-METHOD may be a string or symbol matching a key in that alist, or
2600a plist with the `:mac-algorithm-id' numeric property, or the number 2598a plist with the `:mac-algorithm-id' numeric property, or the number
2601itself. */) 2599itself. */)
@@ -2690,7 +2688,7 @@ Return nil on error.
2690The INPUT can be specified as a buffer or string or in other 2688The INPUT can be specified as a buffer or string or in other
2691ways (see Info node `(elisp)Format of GnuTLS Cryptography Inputs'). 2689ways (see Info node `(elisp)Format of GnuTLS Cryptography Inputs').
2692 2690
2693The alist of digest algorithms can be obtained with `gnutls-digests`. 2691The alist of digest algorithms can be obtained with `gnutls-digests'.
2694The DIGEST-METHOD may be a string or symbol matching a key in that 2692The DIGEST-METHOD may be a string or symbol matching a key in that
2695alist, or a plist with the `:digest-algorithm-id' numeric property, or 2693alist, or a plist with the `:digest-algorithm-id' numeric property, or
2696the number itself. */) 2694the number itself. */)