diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2011-05-03 20:44:58 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2011-05-03 20:44:58 -0500 |
| commit | 48e79d6a80c1ef67fae3f8fd45d753be5cb58ea4 (patch) | |
| tree | b5a2879697c54e52eed58e24fdac7e31b15766ad /lisp/net/network-stream.el | |
| parent | ef80fc093a3b13ee9c1575c54b7831bc9cf2ef8b (diff) | |
| download | emacs-48e79d6a80c1ef67fae3f8fd45d753be5cb58ea4.tar.gz emacs-48e79d6a80c1ef67fae3f8fd45d753be5cb58ea4.tar.bz2 emacs-48e79d6a80c1ef67fae3f8fd45d753be5cb58ea4.zip | |
Use CL-style keyword arguments for `gnutls-negotiate' and allow :keylist and :crlfiles arguments.
* lisp/net/gnutls.el (gnutls-negotiate): Use CL-style keyword arguments
instead of positional arguments. Allow :keylist and :crlfiles
arguments.
(open-gnutls-stream): Call it.
* lisp/net/network-stream.el (network-stream-open-starttls): Adjust to
call `gnutls-negotiate' with :process and :hostname arguments.
Diffstat (limited to 'lisp/net/network-stream.el')
| -rw-r--r-- | lisp/net/network-stream.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 2071f790656..f3cfd7d058f 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -45,9 +45,7 @@ (require 'tls) (require 'starttls) -(declare-function gnutls-negotiate "gnutls" - (proc type host &optional priority-string trustfiles keyfiles - verify-flags verify-error verify-hostname-error)) +(declare-function gnutls-negotiate "gnutls" (&rest spec)) ;;;###autoload (defun open-network-stream (name buffer host service &rest parameters) @@ -203,7 +201,7 @@ asynchronously, if possible." (network-stream-command stream starttls-command eoc)) ;; The server said it was OK to begin STARTTLS negotiations. (if (fboundp 'open-gnutls-stream) - (gnutls-negotiate stream nil host) + (gnutls-negotiate :process stream :hostname host) (unless (starttls-negotiate stream) (delete-process stream))) (if (memq (process-status stream) '(open run)) |