Skip to content

Commit be8023c

Browse files
vcsjonesvcsjones
committed
Rename algos to follow consistency.
1 parent e7f046c commit be8023c

File tree

8 files changed

+53
-53
lines changed

8 files changed

+53
-53
lines changed

‎lib/ssh_data/certificate.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ class Certificate
1212
TYPE_HOST = 2
1313

1414
# Certificate algorithm identifiers
15-
ALGO_RSA = "[email protected]"
16-
ALGO_DSA = "[email protected]"
17-
ALGO_ECDSA256 = "[email protected]"
18-
ALGO_ECDSA384 = "[email protected]"
19-
ALGO_ECDSA521 = "[email protected]"
20-
ALGO_ED25519 = "[email protected]"
21-
ALGO_SK_ECDSA256 = "[email protected]"
22-
ALGO_SK_ED25519 = "[email protected]"
15+
ALGO_RSA = "[email protected]"
16+
ALGO_DSA = "[email protected]"
17+
ALGO_ECDSA256 = "[email protected]"
18+
ALGO_ECDSA384 = "[email protected]"
19+
ALGO_ECDSA521 = "[email protected]"
20+
ALGO_ED25519 = "[email protected]"
21+
ALGO_SKECDSA256 = "[email protected]"
22+
ALGO_SKED25519 = "[email protected]"
2323

2424
ALGOS = [
2525
ALGO_RSA, ALGO_DSA, ALGO_ECDSA256, ALGO_ECDSA384, ALGO_ECDSA521,
26-
ALGO_ED25519, ALGO_SK_ECDSA256, ALGO_SK_ED25519
26+
ALGO_ED25519, ALGO_SKECDSA256, ALGO_SKED25519
2727
]
2828

2929
CRITICAL_OPTION_FORCE_COMMAND = "force-command"

‎lib/ssh_data/encoding.rb‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,25 @@ module Encoding
8181
]
8282

8383
PUBLIC_KEY_ALGO_BY_CERT_ALGO = {
84-
Certificate::ALGO_RSA => PublicKey::ALGO_RSA,
85-
Certificate::ALGO_DSA => PublicKey::ALGO_DSA,
86-
Certificate::ALGO_ECDSA256 => PublicKey::ALGO_ECDSA256,
87-
Certificate::ALGO_ECDSA384 => PublicKey::ALGO_ECDSA384,
88-
Certificate::ALGO_ECDSA521 => PublicKey::ALGO_ECDSA521,
89-
Certificate::ALGO_ED25519 => PublicKey::ALGO_ED25519,
90-
Certificate::ALGO_SK_ECDSA256 => PublicKey::ALGO_SK_ECDSA256,
91-
Certificate::ALGO_SK_ED25519 => PublicKey::ALGO_SK_ED25519,
84+
Certificate::ALGO_RSA => PublicKey::ALGO_RSA,
85+
Certificate::ALGO_DSA => PublicKey::ALGO_DSA,
86+
Certificate::ALGO_ECDSA256 => PublicKey::ALGO_ECDSA256,
87+
Certificate::ALGO_ECDSA384 => PublicKey::ALGO_ECDSA384,
88+
Certificate::ALGO_ECDSA521 => PublicKey::ALGO_ECDSA521,
89+
Certificate::ALGO_ED25519 => PublicKey::ALGO_ED25519,
90+
Certificate::ALGO_SKECDSA256 => PublicKey::ALGO_SKECDSA256,
91+
Certificate::ALGO_SKED25519 => PublicKey::ALGO_SKED25519,
9292
}
9393

9494
CERT_ALGO_BY_PUBLIC_KEY_ALGO = {
95-
PublicKey::ALGO_RSA => Certificate::ALGO_RSA,
96-
PublicKey::ALGO_DSA => Certificate::ALGO_DSA,
97-
PublicKey::ALGO_ECDSA256 => Certificate::ALGO_ECDSA256,
98-
PublicKey::ALGO_ECDSA384 => Certificate::ALGO_ECDSA384,
99-
PublicKey::ALGO_ECDSA521 => Certificate::ALGO_ECDSA521,
100-
PublicKey::ALGO_ED25519 => Certificate::ALGO_ED25519,
101-
PublicKey::ALGO_SK_ECDSA256 => Certificate::ALGO_SK_ECDSA256,
102-
PublicKey::ALGO_SK_ED25519 => Certificate::ALGO_SK_ED25519,
95+
PublicKey::ALGO_RSA => Certificate::ALGO_RSA,
96+
PublicKey::ALGO_DSA => Certificate::ALGO_DSA,
97+
PublicKey::ALGO_ECDSA256 => Certificate::ALGO_ECDSA256,
98+
PublicKey::ALGO_ECDSA384 => Certificate::ALGO_ECDSA384,
99+
PublicKey::ALGO_ECDSA521 => Certificate::ALGO_ECDSA521,
100+
PublicKey::ALGO_ED25519 => Certificate::ALGO_ED25519,
101+
PublicKey::ALGO_SKECDSA256 => Certificate::ALGO_SKECDSA256,
102+
PublicKey::ALGO_SKED25519 => Certificate::ALGO_SKED25519,
103103
}
104104

105105
KEY_FIELDS_BY_PUBLIC_KEY_ALGO = {
@@ -109,8 +109,8 @@ module Encoding
109109
PublicKey::ALGO_ECDSA384 => ECDSA_KEY_FIELDS,
110110
PublicKey::ALGO_ECDSA521 => ECDSA_KEY_FIELDS,
111111
PublicKey::ALGO_ED25519 => ED25519_KEY_FIELDS,
112-
PublicKey::ALGO_SK_ED25519 => SKED25519_KEY_FIELDS,
113-
PublicKey::ALGO_SK_ECDSA256 => SKECDSA_KEY_FIELDS,
112+
PublicKey::ALGO_SKED25519 => SKED25519_KEY_FIELDS,
113+
PublicKey::ALGO_SKECDSA256 => SKECDSA_KEY_FIELDS,
114114
}
115115

116116
KEY_FIELDS_BY_PRIVATE_KEY_ALGO = {

‎lib/ssh_data/error.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module SSHData
2-
Error = Class.new(StandardError)
3-
DecodeError = Class.new(Error)
4-
VerifyError = Class.new(Error)
5-
AlgorithmError = Class.new(Error)
6-
DecryptError = Class.new(Error)
2+
Error = Class.new(StandardError)
3+
DecodeError = Class.new(Error)
4+
VerifyError = Class.new(Error)
5+
AlgorithmError = Class.new(Error)
6+
DecryptError = Class.new(Error)
77
UnsupportedError = Class.new(Error)
88
end

‎lib/ssh_data/public_key.rb‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module SSHData
22
module PublicKey
33
# Public key algorithm identifiers
4-
ALGO_RSA = "ssh-rsa"
5-
ALGO_DSA = "ssh-dss"
6-
ALGO_ECDSA256 = "ecdsa-sha2-nistp256"
7-
ALGO_ECDSA384 = "ecdsa-sha2-nistp384"
8-
ALGO_ECDSA521 = "ecdsa-sha2-nistp521"
9-
ALGO_ED25519 = "ssh-ed25519"
10-
ALGO_SK_ED25519 = "[email protected]"
11-
ALGO_SK_ECDSA256 = "[email protected]"
4+
ALGO_RSA = "ssh-rsa"
5+
ALGO_DSA = "ssh-dss"
6+
ALGO_ECDSA256 = "ecdsa-sha2-nistp256"
7+
ALGO_ECDSA384 = "ecdsa-sha2-nistp384"
8+
ALGO_ECDSA521 = "ecdsa-sha2-nistp521"
9+
ALGO_ED25519 = "ssh-ed25519"
10+
ALGO_SKED25519 = "[email protected]"
11+
ALGO_SKECDSA256 = "[email protected]"
1212

1313
# RSA SHA2 *signature* algorithms used with ALGO_RSA keys.
1414
# https://tools.ietf.org/html/draft-rsa-dsa-sha2-256-02
@@ -17,7 +17,7 @@ module PublicKey
1717

1818
ALGOS = [
1919
ALGO_RSA, ALGO_DSA, ALGO_ECDSA256, ALGO_ECDSA384, ALGO_ECDSA521,
20-
ALGO_ED25519, ALGO_SK_ECDSA256, ALGO_SK_ED25519
20+
ALGO_ED25519, ALGO_SKECDSA256, ALGO_SKED25519
2121
]
2222

2323
# Parse an OpenSSH public key in authorized_keys format (see sshd(8) manual
@@ -66,9 +66,9 @@ def self.from_data(data)
6666
ECDSA.new(**data)
6767
when ALGO_ED25519
6868
ED25519.new(**data)
69-
when ALGO_SK_ED25519
69+
when ALGO_SKED25519
7070
SKED25519.new(**data)
71-
when ALGO_SK_ECDSA256
71+
when ALGO_SKECDSA256
7272
SKECDSA.new(**data)
7373
else
7474
raise DecodeError, "unkown algo: #{data[:algo].inspect}"

‎lib/ssh_data/public_key/skecdsa.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class SKECDSA < ECDSA
88
}
99

1010
def self.check_algorithm!(algo, curve)
11-
unless algo == ALGO_SK_ECDSA256
11+
unless algo == ALGO_SKECDSA256
1212
raise DecodeError, "bad algorithm: #{algo.inspect}"
1313
end
1414

‎lib/ssh_data/public_key/sked25519.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def initialize(algo:, pk:, application:)
99
end
1010

1111
def self.algorithm_identifier
12-
ALGO_SK_ED25519
12+
ALGO_SKED25519
1313
end
1414

1515
def rfc4253

‎spec/certificate_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,15 @@
268268
test_cases << [
269269
:skecdsa_leaf_for_rsa_ca, # name
270270
"skecdsa_leaf_for_rsa_ca-cert.pub", # fixture
271-
SSHData::Certificate::ALGO_SK_ECDSA256, # algo
271+
SSHData::Certificate::ALGO_SKECDSA256, # algo
272272
SSHData::PublicKey::SKECDSA, # public key type
273273
SSHData::PublicKey::RSA # ca key type
274274
]
275275

276276
test_cases << [
277277
:sked25519_leaf_for_rsa_ca, # name
278278
"sked25519_leaf_for_rsa_ca-cert.pub", # fixture
279-
SSHData::Certificate::ALGO_SK_ED25519, # algo
279+
SSHData::Certificate::ALGO_SKED25519, # algo
280280
SSHData::PublicKey::SKED25519, # public key type
281281
SSHData::PublicKey::RSA # ca key type
282282
]

‎spec/public_key/sked25519_spec.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,42 @@
66

77
let(:msg) { "hello, world!" }
88
let(:raw_sig) { signing_key.sign(msg) }
9-
let(:sig) { SSHData::Encoding.encode_signature(SSHData::PublicKey::ALGO_SK_ED25519, raw_sig) }
9+
let(:sig) { SSHData::Encoding.encode_signature(SSHData::PublicKey::ALGO_SKED25519, raw_sig) }
1010
let(:application) { "ssh:" }
1111

1212
let(:openssh_key) { SSHData::PublicKey.parse_openssh(fixture("sked25519_leaf_for_rsa_ca.pub")) }
1313

1414
subject do
1515
described_class.new(
16-
algo: SSHData::PublicKey::ALGO_SK_ED25519,
16+
algo: SSHData::PublicKey::ALGO_SKED25519,
1717
pk: verify_key.to_bytes,
1818
application: application
1919
)
2020
end
2121

2222
it "is equal to keys with the same params" do
2323
expect(subject).to eq(described_class.new(
24-
algo: SSHData::PublicKey::ALGO_SK_ED25519,
24+
algo: SSHData::PublicKey::ALGO_SKED25519,
2525
pk: verify_key.to_bytes,
2626
application: application
2727
))
2828
end
2929

3030
it "isnt equal to keys with different params" do
3131
expect(subject).not_to eq(described_class.new(
32-
algo: SSHData::PublicKey::ALGO_SK_ED25519,
32+
algo: SSHData::PublicKey::ALGO_SKED25519,
3333
pk: verify_key.to_bytes.reverse,
3434
application: application
3535
))
3636
expect(subject).not_to eq(described_class.new(
37-
algo: SSHData::PublicKey::ALGO_SK_ED25519,
37+
algo: SSHData::PublicKey::ALGO_SKED25519,
3838
pk: verify_key.to_bytes,
3939
application: "something else"
4040
))
4141
end
4242

4343
it "has an algo" do
44-
expect(subject.algo).to eq(SSHData::PublicKey::ALGO_SK_ED25519)
44+
expect(subject.algo).to eq(SSHData::PublicKey::ALGO_SKED25519)
4545
end
4646

4747
it "has parameters" do

0 commit comments

Comments
 (0)