[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/async-dns a2d6d79 5/7: Use gnutls-serv instead of
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] feature/async-dns a2d6d79 5/7: Use gnutls-serv instead of openssh |
Date: |
Tue, 09 Feb 2016 05:09:42 +0000 |
branch: feature/async-dns
commit a2d6d79c952e1cbb3387fb33ead9b3ddee880a21
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Use gnutls-serv instead of openssh
* test/lisp/net/network-stream-tests.el (make-tls-server): Use
gnutls-serv instead of openssh.
---
test/lisp/net/network-stream-tests.el | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test/lisp/net/network-stream-tests.el
b/test/lisp/net/network-stream-tests.el
index ad7c1fc..9d9d561 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -156,23 +156,23 @@
(delete-process server)))
(defun make-tls-server ()
- (start-process "openssl" (generate-new-buffer "*tls*") "openssl"
- "s_server" "-key" "lisp/net/key.pem"
- "-cert" "lisp/net/cert.pem"
- "-accept" "44330"
- "-www"))
+ (start-process "gnutls" (generate-new-buffer "*tls*")
+ "gnutls-serv" "--http"
+ "--x509keyfile" "lisp/net/key.pem"
+ "--x509certfile" "lisp/net/cert.pem"
+ "--port" "44330"))
(ert-deftest connect-to-tls ()
- (skip-unless (executable-find "openssl"))
+ (skip-unless (executable-find "gnutls-serv"))
(skip-unless (gnutls-available-p))
(let ((server (make-tls-server))
(times 0)
proc status)
(sleep-for 1)
(with-current-buffer (process-buffer server)
- (message "openssl: %s" (buffer-string)))
+ (message "gnutls-serv: %s" (buffer-string)))
- ;; It takes a while for openssl to start.
+ ;; It takes a while for gnutls-serv to start.
(while (and (null (ignore-errors
(setq proc (make-network-process
:name "bar"
- [Emacs-diffs] feature/async-dns updated (12702b3 -> 51d728c), Lars Ingebrigtsen, 2016/02/09
- [Emacs-diffs] feature/async-dns 92acfb9 1/7: Add network tests, Lars Ingebrigtsen, 2016/02/09
- [Emacs-diffs] feature/async-dns 51d728c 7/7: src/process.c Correctly convert AF_INET6 addresses, Lars Ingebrigtsen, 2016/02/09
- [Emacs-diffs] feature/async-dns d7e2238 2/7: Add more network tests, Lars Ingebrigtsen, 2016/02/09
- [Emacs-diffs] feature/async-dns 04913cc 4/7: Skip TLS tests if we don't have openssl, Lars Ingebrigtsen, 2016/02/09
- [Emacs-diffs] feature/async-dns 71f2245 6/7: Add an IPv6 test, Lars Ingebrigtsen, 2016/02/09
- [Emacs-diffs] feature/async-dns a2d6d79 5/7: Use gnutls-serv instead of openssh,
Lars Ingebrigtsen <=
- [Emacs-diffs] feature/async-dns ea87d91 3/7: Add a TLS connection test, Lars Ingebrigtsen, 2016/02/09