|
164 | 164 | # http://www.emc.com/emc-plus/rsa-labs/historical/twirl-and-rsa-key-size.htm#table1
|
165 | 165 | RSAKEYBITS_SCHEMA = SCHEMA.Integer(lo=2048)
|
166 | 166 |
|
167 |
| -# The supported ECDSA signature schemes (ecdsa-sha2-nistp256 is supported by |
168 |
| -# default). |
169 |
| -ECDSA_SCHEME_SCHEMA = SCHEMA.OneOf([SCHEMA.String('ecdsa-sha2-nistp256')]) |
| 167 | +# The supported ECDSA signature schemes |
| 168 | +ECDSA_SCHEME_SCHEMA = SCHEMA.RegularExpression(r'ecdsa-sha2-nistp(256|384)') |
170 | 169 |
|
171 | 170 | # A pyca-cryptography signature.
|
172 | 171 | PYCACRYPTOSIGNATURE_SCHEMA = SCHEMA.AnyBytes()
|
|
201 | 200 | # Supported securesystemslib key types.
|
202 | 201 | KEYTYPE_SCHEMA = SCHEMA.OneOf(
|
203 | 202 | [SCHEMA.String('rsa'), SCHEMA.String('ed25519'),
|
204 |
| - SCHEMA.String('ecdsa-sha2-nistp256')]) |
| 203 | + SCHEMA.RegularExpression(r'ecdsa-sha2-nistp(256|384)')]) |
205 | 204 |
|
206 | 205 | # A generic securesystemslib key. All securesystemslib keys should be saved to
|
207 | 206 | # metadata files in this format.
|
|
254 | 253 | # An ECDSA securesystemslib key.
|
255 | 254 | ECDSAKEY_SCHEMA = SCHEMA.Object(
|
256 | 255 | object_name = 'ECDSAKEY_SCHEMA',
|
257 |
| - keytype = SCHEMA.String('ecdsa-sha2-nistp256'), |
| 256 | + keytype = SCHEMA.RegularExpression(r'ecdsa-sha2-nistp(256|384)'), |
258 | 257 | scheme = ECDSA_SCHEME_SCHEMA,
|
259 | 258 | keyid = KEYID_SCHEMA,
|
260 | 259 | keyid_hash_algorithms = SCHEMA.Optional(HASHALGORITHMS_SCHEMA),
|
|
272 | 271 | # An ECDSA signature.
|
273 | 272 | ECDSASIGNATURE_SCHEMA = SCHEMA.AnyBytes()
|
274 | 273 |
|
275 |
| -# Required installation libraries expected by the repository tools and other |
276 |
| -# cryptography modules. |
277 |
| -REQUIRED_LIBRARIES_SCHEMA = SCHEMA.ListOf(SCHEMA.OneOf( |
278 |
| - [SCHEMA.String('general'), SCHEMA.String('ed25519'), SCHEMA.String('rsa'), |
279 |
| - SCHEMA.String('ecdsa-sha2-nistp256')])) |
280 |
| - |
281 | 274 | # Ed25519 signature schemes. The vanilla Ed25519 signature scheme is currently
|
282 | 275 | # supported.
|
283 | 276 | ED25519_SIG_SCHEMA = SCHEMA.OneOf([SCHEMA.String('ed25519')])
|
|
0 commit comments