summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorArtyom Poptsov <poptsov.artyom@gmail.com>2014-05-31 18:10:08 +0400
committerArtyom Poptsov <poptsov.artyom@gmail.com>2014-05-31 18:10:08 +0400
commit20184b7c861e1aaa6567ba74063c61cc05c6c7ce (patch)
tree0844dbb1b5d7dc99aacce3163d675f2bf2b825da /examples
parentMerge branch 'master' into libssh06 (diff)
downloadguile-ssh-20184b7c861e1aaa6567ba74063c61cc05c6c7ce.tar.gz
Use new libssh 0.6 API for handling of public key fingerprints
Use new libssh 0.6 API for handling of public key fingerprints. Update TCs and documentation. * examples/sssh.scm.in (main): Update. * examples/echo/client.scm.in (main): Update. * ssh/session-func.c (guile_ssh_get_server_public_key): New procedure. (guile_ssh_get_public_key_hash): Change arguments. Move to `ssh/key-func.c'. All callers updated. * ssh/session.scm (bytevector->hex-string): Move to `ssh/key.scm'. (get-server-public-key): New procedure. * ssh/key-func.c (guile_ssh_get_public_key_hash): New procedure. * ssh/key.scm (get-public-key-hash, bytevector->hex-string): New procedures. * tests/client-server.scm ("get-public-key-hash"): Check md5 and sha1 fingerprints. * doc/api-sessions.texi (Sessions): Add documentation for `get-server-public-key'. Move `get-public-key-hash', `bytevector->hex-string' to `doc/api-keys.texi'. * doc/api-keys.texi (Keys): Update. * NEWS: Update.
Diffstat (limited to 'examples')
-rw-r--r--examples/echo/client.scm.in5
-rw-r--r--examples/sssh.scm.in3
2 files changed, 5 insertions, 3 deletions
diff --git a/examples/echo/client.scm.in b/examples/echo/client.scm.in
index 28d58d8..6a6a6b3 100644
--- a/examples/echo/client.scm.in
+++ b/examples/echo/client.scm.in
@@ -134,9 +134,10 @@ Options:
(case (authenticate-server session)
((not-known)
- (let ((hash (get-public-key-hash session)))
+ (let* ((pubkey (get-server-public-key session))
+ (hash (get-public-key-hash pubkey 'sha1)))
(display "The server is unknown. Please check MD5 sum:\n")
- (format #t " ~a~%" (bytevector->hex-string hash)))))
+ (format #t " ~a~%" hash))))
(let ((private-key (get-prvkey session identity-file)))
diff --git a/examples/sssh.scm.in b/examples/sssh.scm.in
index 3257615..cd3a0f5 100644
--- a/examples/sssh.scm.in
+++ b/examples/sssh.scm.in
@@ -175,7 +175,8 @@ Options:
((ok) (print-debug " ok\n"))
((not-known) (display " The server is unknown. Please check MD5.\n")))
- (let ((hash (get-public-key-hash session)))
+ (let* ((pubkey (get-server-public-key session))
+ (hash (get-public-key-hash pubkey 'md5)))
(format-debug " MD5 hash: ~a~%" (bytevector->hex-string hash)))
(print-debug "5. userauth-autopubkey!\n")