diff options
| author | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2015-10-29 10:18:13 +0300 |
|---|---|---|
| committer | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2015-10-29 10:18:13 +0300 |
| commit | 22d494d71cdd4541068fafbd0d1ba492b21503c3 (patch) | |
| tree | 6924a3c91982f30f41ec5290acf1e598c9651b04 /tests/key.scm | |
| parent | tests/key.scm: Use (tests common) module (diff) | |
| download | guile-ssh-22d494d71cdd4541068fafbd0d1ba492b21503c3.tar.gz | |
tests/key.scm: Use keyfiles from (tests common)
* tests/key.scm: Use keyfiles from (tests common). Cleanup.
("private-key-from-file", "public-key-from-file"): Update.
Diffstat (limited to 'tests/key.scm')
| -rw-r--r-- | tests/key.scm | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/tests/key.scm b/tests/key.scm index 797d414..4ae71ad 100644 --- a/tests/key.scm +++ b/tests/key.scm @@ -36,36 +36,28 @@ (or (not %openssl?) test)) - -(define %rsa-private-key-file (format #f "~a/tests/rsakey" %topdir)) -(define %dsa-private-key-file (format #f "~a/tests/dsakey" %topdir)) -(define %ecdsa-private-key-file (format #f "~a/tests/ecdsakey" %topdir)) -(define %rsa-public-key-file (format #f "~a/tests/rsakey.pub" %topdir)) -(define %dsa-public-key-file (format #f "~a/tests/dsakey.pub" %topdir)) -(define %ecdsa-public-key-file (format #f "~a/tests/ecdsakey.pub" %topdir)) - (test-begin "key") (test-assert "private-key-from-file" - (and (private-key-from-file %rsa-private-key-file) - (private-key-from-file %dsa-private-key-file) + (and (private-key-from-file %rsakey) + (private-key-from-file %dsakey) (when-openssl - (private-key-from-file %ecdsa-private-key-file)))) + (private-key-from-file %ecdsakey)))) (test-assert "public-key-from-file" - (and (public-key-from-file %rsa-public-key-file) - (public-key-from-file %dsa-public-key-file) + (and (public-key-from-file %rsakey-pub) + (public-key-from-file %dsakey-pub) (when-openssl - (public-key-from-file %ecdsa-public-key-file)))) + (public-key-from-file %ecdsakey-pub)))) -(define *rsa-key* (private-key-from-file %rsa-private-key-file)) -(define *dsa-key* (private-key-from-file %dsa-private-key-file)) +(define *rsa-key* (private-key-from-file %rsakey)) +(define *dsa-key* (private-key-from-file %dsakey)) (define *ecdsa-key* (when-openssl - (private-key-from-file %ecdsa-private-key-file))) -(define *rsa-pub-key* (public-key-from-file %rsa-public-key-file)) -(define *dsa-pub-key* (public-key-from-file %dsa-public-key-file)) + (private-key-from-file %ecdsakey))) +(define *rsa-pub-key* (public-key-from-file %rsakey-pub)) +(define *dsa-pub-key* (public-key-from-file %dsakey-pub)) (define *ecdsa-pub-key* (when-openssl - (public-key-from-file %ecdsa-public-key-file))) + (public-key-from-file %ecdsakey-pub))) (test-assert "key?" (and (not (key? "not a key")) |