tests/key ("encrypted key: RSA", "encrypted key: DSS"): New tests

* tests/key.scm ("encrypted key: RSA", "encrypted key: DSS"): New tests.
* tests/common.scm (%rsakey-encrypted, %dsakey-encrypted): New symbols.
* tests/keys/encrypted-dsa-key, tests/keys/encrypted-dsa-key.pub,
  tests/keys/encrypted-rsa-key, tests/keys/encrypted-rsa-key.pub: Add to the
  repository.
* tests/Makefile.am (EXTRA_DIST): Add new keys.

tests/Makefile.am

@@ -72,6 +72,10 @@ EXTRA_DIST = \
 	keys/rsakey.pub		\
 	keys/encrypted-ecdsa-key	\
 	keys/encrypted-ecdsa-key.pub	\
+	keys/encrypted-rsa-key		\
+	keys/encrypted-rsa-key.pub	\
+	keys/encrypted-dsa-key		\
+	keys/encrypted-dsa-key.pub	\
 	config
 
 ### Compile modules

tests/common.scm

@@ -44,6 +44,8 @@
             %ecdsakey
             %ecdsakey-pub
             %ecdsakey-encrypted
+            %rsakey-encrypted
+            %dsakey-encrypted
 
             ;; Procedures
             sanitize-string
@@ -89,6 +91,8 @@
 (define %ecdsakey-pub (format #f "~a/tests/keys/ecdsakey.pub" %topdir))
 
 (define %ecdsakey-encrypted (format #f "~a/tests/keys/encrypted-ecdsa-key" %topdir))
+(define %rsakey-encrypted   (format #f "~a/tests/keys/encrypted-rsa-key" %topdir))
+(define %dsakey-encrypted   (format #f "~a/tests/keys/encrypted-dsa-key" %topdir))
 
 
 (define (format-log/scm level proc-name message . args)

tests/key.scm

@@ -243,6 +243,19 @@
              (eq? (get-key-type key) 'ecdsa-p256)))))
 
 
+;;; Check reading encrypted keys.
+
+(test-assert-with-log "encrypted key: RSA"
+  (private-key-from-file %rsakey-encrypted
+                         #:auth-callback (lambda (prompt max-len echo? verify? userdata)
+                                           "123")))
+
+(unless-dsa-supported
+ (test-skip "encrypted key: DSS"))
+(test-assert-with-log "encrypted key: DSS"
+  (private-key-from-file %dsakey-encrypted
+                         #:auth-callback (lambda (prompt max-len echo? verify? userdata)
+                                           "123")))
 
 (unless-openssl
  (test-skip "encrypted key: ECDSA"))

tests/keys/encrypted-dsa-key

@@ -0,0 +1,22 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAFO0WEoE
+w2vxZG4WIvWrTTAAAAEAAAAAEAAAGyAAAAB3NzaC1kc3MAAACBAOvV83NIMvJBcaQqZJ4a
+s7Vtkrfrn5eeWTCBZE/Hp85S/Z/qbva/7bdEMGzQXGl45i+fKY7piVE69coY9vC5hXGZiS
+KgRmjGnsgVO8FAsBasSqoOKDDHoTFjaTTRehWMWgMBjqYurXFN5PSqy+YKOtK/QJcUYC5W
+4D2tgJ+inCqXAAAAFQCYRVJ2RmeoPvN6VMSJGKCapgp4jQAAAIBvfFMf9BGEFepn7ElxOx
+fhl3NdVju0/vIiiYTWNp4fsgLjOhfE0M/Em2W5c8TJDkqYmqsFZF+Z07J6dxf6ehq8AI7O
+Ior2g/yovlmCypVgb4PzoQGITAtOXROn+hVgXtbtimW8l+eQr9bf4QDJlzh050pLJ41My5
+lj+x5YtlLMaAAAAIEAm/akPouQjtiyC43D8kCbOtHI9BC2lhysqSASFCyR73uh6dDIJAKq
+qXE0e/6PL6HSCQbrKZSjcvFT4neIVC7xAcvcaT5hNvE1+0MYGCXR1KMByZEeD2SrFa3yQo
+eL5WHeAO+6JsUUIjsxEp72hUMerj3mRC/LWXIUkJoiXPHLd3kAAAIANwz25cmNNxllu2kx
+Eot8dAsiCgbcFHxPl3E9dkNx9FrI+TfNhP9bm0J03JblOdnzptRHIZ4xFgshvdKpTzCHpL
+nQVbW8POmcuZ4yhYvNpJvJTXmkX2MDngjhBAlM3Pte5NiloxQ/V4XQSNfG1RqDFh0AsOH2
+uHrtrrQGzTPB5NG1d7PWfnFO2C2R/DO6fDtg5hCbV0bZSDNmL2Bq1OS5Pwsh9WYUjl/y2M
+ZfSqyBGDsGi36S5eOOm1H42RE8n+r7RMYxi9W1i0vcVlPzGhg6e/sciTUwweL6SkIQDMEW
+5TTnIY3odbXc2ojUg4+KZU/ZWiFSd2cTBXVIZEl+0/ZhO5Xf99oTsBwcOU5q1WfwgRJ2da
+spEEagzlR+mWU4tx7dnTkW4kE1pDWUNl6KD+F+OaxyaLF/oASqvjMR1XMntmgjeB80dsfc
+xw/k/Car1qp+wQyFzybLrJ7UTuWF5Hb3dcDIZ7bQ4kwX/O80mqgPGw2yo7dcTVfyDUOYO4
+TkResvqKQe330IVx+/Q8T0hWTFPH+VeoZrtqnGa3uLQiWR0JZEiRSxKqA77uXG66ZDlqep
+HicbrpWlWfeS657nByfZsbk72BoawgDb2F9wP0PbwwkqKbmxjCJXDD1J4/5KaYwfjg3tfM
+JM6G1mZRcLucxpx6kFjQ9TY15b4DEY3tEqaU4=
+-----END OPENSSH PRIVATE KEY-----

tests/keys/encrypted-dsa-key.pub

@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAOvV83NIMvJBcaQqZJ4as7Vtkrfrn5eeWTCBZE/Hp85S/Z/qbva/7bdEMGzQXGl45i+fKY7piVE69coY9vC5hXGZiSKgRmjGnsgVO8FAsBasSqoOKDDHoTFjaTTRehWMWgMBjqYurXFN5PSqy+YKOtK/QJcUYC5W4D2tgJ+inCqXAAAAFQCYRVJ2RmeoPvN6VMSJGKCapgp4jQAAAIBvfFMf9BGEFepn7ElxOxfhl3NdVju0/vIiiYTWNp4fsgLjOhfE0M/Em2W5c8TJDkqYmqsFZF+Z07J6dxf6ehq8AI7OIor2g/yovlmCypVgb4PzoQGITAtOXROn+hVgXtbtimW8l+eQr9bf4QDJlzh050pLJ41My5lj+x5YtlLMaAAAAIEAm/akPouQjtiyC43D8kCbOtHI9BC2lhysqSASFCyR73uh6dDIJAKqqXE0e/6PL6HSCQbrKZSjcvFT4neIVC7xAcvcaT5hNvE1+0MYGCXR1KMByZEeD2SrFa3yQoeL5WHeAO+6JsUUIjsxEp72hUMerj3mRC/LWXIUkJoiXPHLd3k= Guile-SSH test encrypted key

tests/keys/encrypted-rsa-key

@@ -0,0 +1,39 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+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
+-----END OPENSSH PRIVATE KEY-----

tests/keys/encrypted-rsa-key.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLxXl65L77UGN9xqqCgDi4wb7JMgKrsLA5uNp8FnWN6DRS0DXaymBuxU7pblUAqY752vC6oqJ/EMIfDBM66JJZKwN5IwuHoz7gOyd+FLbAi8wRRVXBnw4Muk+SOyDa/bdOpKLI8iqC//4KCQMA4BGPhb1+R6kSIqNmy5HfPCCYTKN9/Neuvx8bj7OvCLairYlALweU3A4l4LMKN0ujqbWihMKCBLQhaW/Z/6GLN31unocSgvOgDtM5aWB0TWfRTsjKIq6cdzjigt9F3lztiUHm1RRncqn0L+7J/wqiXWFpwbfw2wOELkiBYp1zGTiWzc1bs/DJuhIPK1Ylfini7M9UndXgPMNLOmqgE6UX2K+TlH0YES0Rxqq22AF8JMOg4CtxyBBw2+mk7itwZdWHIKPqL/RyUTu6eqAvkqzij58DXSx+ec8PO6o2hYqf5NVmmUOB4q5nL/rfJxSqdKo0CKXVFIBBacCXHIkdZXFTmM2C92TP1WFCf7GCTLQZLFgP4kU= Guile-SSH test encrypted key