Package: guile-ssh / 0.11.3-2

drop-openssl-ecdsa Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
Disable tests for ecdsa keys.

Upstream bug:

https://github.com/artyom-poptsov/guile-ssh/issues/12

Index: guile-ssh/tests/key.scm
===================================================================
--- guile-ssh.orig/tests/key.scm
+++ guile-ssh/tests/key.scm
@@ -37,15 +37,11 @@
 
 (test-assert-with-log "private-key-from-file"
   (and (private-key-from-file %rsakey)
-       (private-key-from-file %dsakey)
-       (when-openssl
-        (private-key-from-file %ecdsakey))))
+       (private-key-from-file %dsakey)))
 
 (test-assert-with-log "public-key-from-file"
   (and (public-key-from-file %rsakey-pub)
-       (public-key-from-file %dsakey-pub)
-       (when-openssl
-        (public-key-from-file %ecdsakey-pub))))
+       (public-key-from-file %dsakey-pub)))
 
 (define *rsa-key*       (private-key-from-file %rsakey))
 (define *dsa-key*       (private-key-from-file %dsakey))
@@ -60,12 +56,8 @@
   (and (not (key? "not a key"))
        (key? *rsa-key*)
        (key? *dsa-key*)
-       (when-openssl
-        (key? *ecdsa-key*))
        (key? *rsa-pub-key*)
-       (key? *dsa-pub-key*)
-       (when-openssl
-        (key? *ecdsa-pub-key*))))
+       (key? *dsa-pub-key*)))
 
 (test-assert "private-key?"
   (and (private-key? *rsa-key*)
@@ -83,15 +75,11 @@
 
 (test-assert-with-log "private-key->public-key"
   (and (private-key->public-key *rsa-key*)
-       (private-key->public-key *dsa-key*)
-       (when-openssl
-        (private-key->public-key *ecdsa-key*))))
+       (private-key->public-key *dsa-key*)))
 
 (test-assert-with-log "get-key-type"
   (and (eq? 'rsa   (get-key-type *rsa-key*))
-       (eq? 'dss   (get-key-type *dsa-key*))
-       (when-openssl
-        (eq? 'ecdsa (get-key-type *ecdsa-key*)))))
+       (eq? 'dss   (get-key-type *dsa-key*))))
 
 
 (test-assert-with-log "private-key-to-file"
@@ -122,11 +110,6 @@
   (public-key->string *dsa-pub-key*)
   %dsakey-pub-string)
 
-(when-openssl
- (test-equal "public-key->string, ECDSA"
-   (public-key->string *ecdsa-pub-key*)
-   %ecdsakey-pub-string))
-
 
 (test-equal "string->public-key, RSA"
   (public-key->string (string->public-key %rsakey-pub-string 'rsa))
@@ -136,11 +119,6 @@
   (public-key->string (string->public-key %dsakey-pub-string 'dss))
   %dsakey-pub-string)
 
-(when-openssl
- (test-equal "string->public-key, ECDSA"
-   (public-key->string (string->public-key %ecdsakey-pub-string 'ecdsa))
-   %ecdsakey-pub-string))
-
 (test-assert-with-log "string->public-key, RSA, gc test"
   (let ((max-keys 1000))
     (do ((idx 1 (+ idx 1)))
@@ -158,11 +136,7 @@
               (eq? (get-key-type key) 'rsa)))
        (let ((key (make-keypair 'dss 1024)))
          (and (key? key)
-              (eq? (get-key-type key) 'dss)))
-       (when-openssl
-        (let ((key (make-keypair 'ecdsa 256)))
-          (and (key? key)
-               (eq? (get-key-type key) 'ecdsa))))))
+              (eq? (get-key-type key) 'dss)))))
 
 ;;;