Skip to content

Commit 623dcd6

Browse files
committed
ssh/ciphersuite: Add missing encryption algorithms
1 parent ca5a3d4 commit 623dcd6

File tree

2 files changed

+44
-0
lines changed

2 files changed

+44
-0
lines changed

cryptoparser/common/algorithm.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ class KeyExchange(enum.Enum):
124124
name='Rivest–Shamir–Adleman (RSA)',
125125
forward_secret=False
126126
)
127+
SNTRUP_X25519 = KeyExchangeParams(
128+
name='Streamlined NTRU Prime coupled with X25519',
129+
forward_secret=False
130+
)
127131
SRP = KeyExchangeParams(
128132
name='Secure Remote Password (SRP)',
129133
forward_secret=False

cryptoparser/ssh/ciphersuite.py

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,6 +1130,16 @@ class SshKexAlgorithm(StringEnumParsable, enum.Enum):
11301130
kex=KeyExchange.RSA,
11311131
key_size=2048,
11321132
)
1133+
SNTRUP4591761X25519_SHA512_TINYSSH_ORG = KexAlgorithmParams(
1134+
code='sntrup4591761x25519-sha512@tinyssh.org',
1135+
kex=KeyExchange.SNTRUP_X25519,
1136+
key_size=10000,
1137+
)
1138+
SNTRUP761X25519_SHA512_OPENSSH_COM = KexAlgorithmParams(
1139+
code='sntrup761x25519-sha512@openssh.com',
1140+
kex=KeyExchange.SNTRUP_X25519,
1141+
key_size=9264,
1142+
)
11331143

11341144

11351145
class SshHostKeyAlgorithm(StringEnumParsable, enum.Enum):
@@ -1173,6 +1183,26 @@ class SshHostKeyAlgorithm(StringEnumParsable, enum.Enum):
11731183
key_type=SshHostKeyType.KEY,
11741184
authentication=Authentication.ECDSA,
11751185
)
1186+
SK_ECDSA_SHA2_NISTP256_OPENSSH_COM = HostKeyAlgorithmParams(
1187+
code='sk-ecdsa-sha2-nistp256@openssh.com',
1188+
key_type=SshHostKeyType.KEY,
1189+
authentication=Authentication.ECDSA,
1190+
)
1191+
SK_ECDSA_SHA2_NISTP256_CERT_V01_OPENSSH_COM = HostKeyAlgorithmParams(
1192+
code='sk-ecdsa-sha2-nistp256-cert-v01@openssh.com',
1193+
key_type=SshHostKeyType.CERTIFICATE,
1194+
authentication=Authentication.ECDSA,
1195+
)
1196+
SK_SSH_ED25519_OPENSSH_COM = HostKeyAlgorithmParams(
1197+
code='sk-ssh-ed25519@openssh.com',
1198+
key_type=SshHostKeyType.KEY,
1199+
authentication=Authentication.EDDSA,
1200+
)
1201+
SK_SSH_ED25519_CERT_V01_OPENSSH_COM = HostKeyAlgorithmParams(
1202+
code='sk-ssh-ed25519-cert-v01@openssh.com',
1203+
key_type=SshHostKeyType.CERTIFICATE,
1204+
authentication=Authentication.EDDSA,
1205+
)
11761206
SSH_RSA_CERT_V00_OPENSSH_COM = HostKeyAlgorithmParams(
11771207
code='ssh-rsa-cert-v00@openssh.com',
11781208
key_type=SshHostKeyType.CERTIFICATE,
@@ -1183,6 +1213,16 @@ class SshHostKeyAlgorithm(StringEnumParsable, enum.Enum):
11831213
key_type=SshHostKeyType.CERTIFICATE,
11841214
authentication=Authentication.RSA,
11851215
)
1216+
SSH_RSA_SHA2_256_CERT_V01_OPENSSH_COM = HostKeyAlgorithmParams(
1217+
code='ssh-rsa-sha2-256-cert-v01@openssh.com',
1218+
key_type=SshHostKeyType.CERTIFICATE,
1219+
authentication=Authentication.RSA,
1220+
)
1221+
SSH_RSA_SHA2_512_CERT_V01_OPENSSH_COM = HostKeyAlgorithmParams(
1222+
code='ssh-rsa-sha2-512-cert-v01@openssh.com',
1223+
key_type=SshHostKeyType.CERTIFICATE,
1224+
authentication=Authentication.RSA,
1225+
)
11861226
SSH_DSS_CERT_V00_OPENSSH_COM = HostKeyAlgorithmParams(
11871227
code='ssh-dss-cert-v00@openssh.com',
11881228
key_type=SshHostKeyType.CERTIFICATE,

0 commit comments

Comments
 (0)