From ae2e7489b143da620457ebf5fd0a89cd716243e6 Mon Sep 17 00:00:00 2001 From: vladdd Date: Thu, 10 Oct 2013 13:56:35 -0400 Subject: [PATCH] Add new keytype schema in formats.py --- tuf/formats.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tuf/formats.py b/tuf/formats.py index 6a58737f..8a51cb60 100755 --- a/tuf/formats.py +++ b/tuf/formats.py @@ -153,6 +153,10 @@ public=SCHEMA.AnyString(), private=SCHEMA.AnyString()) +# Supported TUF key types. +KEYTYPE_SCHEMA = SCHEMA.OneOf( + [SCHEMA.String('rsa'), SCHEMA.String('ed25519')]) + # A generic key. All TUF keys should be saved to metadata files in this format. KEY_SCHEMA = SCHEMA.Object( object_name='key', @@ -164,7 +168,7 @@ # Supported key types: 'rsa', 'ed25519'. ANYKEY_SCHEMA = SCHEMA.Object( object_name='anykey', - keytype=SCHEMA.OneOf([SCHEMA.String('rsa'), SCHEMA.String('ed25519')]), + keytype=KEYTYPE_SCHEMA, keyid=KEYID_SCHEMA, keyval=KEYVAL_SCHEMA)