diff options
author | Ilya Etingof <etingof@gmail.com> | 2019-04-25 08:36:39 +0200 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2019-04-25 08:36:39 +0200 |
commit | 3d59f9af2158b2acd63dd213dad427f8e17dec16 (patch) | |
tree | cd47974029b23f69d8d2997cb818d8b770507265 /pyasn1_modules/rfc4108.py | |
parent | 96bde16ef7049ac675189ab41d0bbb7982d732cf (diff) | |
download | pyasn1-modules-3d59f9af2158b2acd63dd213dad427f8e17dec16.tar.gz |
PEP8 latest additions
Diffstat (limited to 'pyasn1_modules/rfc4108.py')
-rw-r--r-- | pyasn1_modules/rfc4108.py | 58 |
1 files changed, 43 insertions, 15 deletions
diff --git a/pyasn1_modules/rfc4108.py b/pyasn1_modules/rfc4108.py index 9a7f190..243f1fb 100644 --- a/pyasn1_modules/rfc4108.py +++ b/pyasn1_modules/rfc4108.py @@ -13,7 +13,11 @@ # -from pyasn1.type import univ, char, namedtype, namedval, tag, constraint, useful +from pyasn1.type import constraint +from pyasn1.type import namedtype +from pyasn1.type import namedval +from pyasn1.type import tag +from pyasn1.type import univ from pyasn1_modules import rfc5652 @@ -23,6 +27,7 @@ MAX = float('inf') class HardwareSerialEntry(univ.Choice): pass + HardwareSerialEntry.componentType = namedtype.NamedTypes( namedtype.NamedType('all', univ.Null()), namedtype.NamedType('single', univ.OctetString()), @@ -30,13 +35,14 @@ HardwareSerialEntry.componentType = namedtype.NamedTypes( namedtype.NamedType('low', univ.OctetString()), namedtype.NamedType('high', univ.OctetString()) )) - ) + ) ) class HardwareModules(univ.Sequence): pass + HardwareModules.componentType = namedtype.NamedTypes( namedtype.NamedType('hwType', univ.ObjectIdentifier()), namedtype.NamedType('hwSerialEntries', univ.SequenceOf(componentType=HardwareSerialEntry())) @@ -46,16 +52,17 @@ HardwareModules.componentType = namedtype.NamedTypes( class CommunityIdentifier(univ.Choice): pass + CommunityIdentifier.componentType = namedtype.NamedTypes( namedtype.NamedType('communityOID', univ.ObjectIdentifier()), namedtype.NamedType('hwModuleList', HardwareModules()) ) - class PreferredPackageIdentifier(univ.Sequence): pass + PreferredPackageIdentifier.componentType = namedtype.NamedTypes( namedtype.NamedType('fwPkgID', univ.ObjectIdentifier()), namedtype.NamedType('verNum', univ.Integer().subtype(subtypeSpec=constraint.ValueRangeConstraint(0, MAX))) @@ -65,6 +72,7 @@ PreferredPackageIdentifier.componentType = namedtype.NamedTypes( class PreferredOrLegacyPackageIdentifier(univ.Choice): pass + PreferredOrLegacyPackageIdentifier.componentType = namedtype.NamedTypes( namedtype.NamedType('preferred', PreferredPackageIdentifier()), namedtype.NamedType('legacy', univ.OctetString()) @@ -74,6 +82,7 @@ PreferredOrLegacyPackageIdentifier.componentType = namedtype.NamedTypes( class CurrentFWConfig(univ.Sequence): pass + CurrentFWConfig.componentType = namedtype.NamedTypes( namedtype.OptionalNamedType('fwPkgType', univ.Integer()), namedtype.NamedType('fwPkgName', PreferredOrLegacyPackageIdentifier()) @@ -83,8 +92,10 @@ CurrentFWConfig.componentType = namedtype.NamedTypes( class PreferredOrLegacyStalePackageIdentifier(univ.Choice): pass + PreferredOrLegacyStalePackageIdentifier.componentType = namedtype.NamedTypes( - namedtype.NamedType('preferredStaleVerNum', univ.Integer().subtype(subtypeSpec=constraint.ValueRangeConstraint(0, MAX))), + namedtype.NamedType('preferredStaleVerNum', + univ.Integer().subtype(subtypeSpec=constraint.ValueRangeConstraint(0, MAX))), namedtype.NamedType('legacyStaleVersion', univ.OctetString()) ) @@ -92,6 +103,7 @@ PreferredOrLegacyStalePackageIdentifier.componentType = namedtype.NamedTypes( class FirmwarePackageLoadErrorCode(univ.Enumerated): pass + FirmwarePackageLoadErrorCode.namedValues = namedval.NamedValues( ('decodeFailure', 1), ('badContentInfo', 2), @@ -137,11 +149,11 @@ class VendorLoadErrorCode(univ.Integer): pass - # Wrapped Firmware Key Unsigned Attribute and Object Identifiers id_aa_wrappedFirmwareKey = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.39') + class WrappedFirmwareKey(rfc5652.EnvelopedData): pass @@ -150,9 +162,11 @@ class WrappedFirmwareKey(rfc5652.EnvelopedData): id_aa_firmwarePackageInfo = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.42') + class FirmwarePackageInfo(univ.Sequence): pass + FirmwarePackageInfo.componentType = namedtype.NamedTypes( namedtype.OptionalNamedType('fwPkgType', univ.Integer()), namedtype.OptionalNamedType('dependencies', univ.SequenceOf(componentType=PreferredOrLegacyPackageIdentifier())) @@ -160,41 +174,44 @@ FirmwarePackageInfo.componentType = namedtype.NamedTypes( FirmwarePackageInfo.sizeSpec = univ.Sequence.sizeSpec + constraint.ValueSizeConstraint(1, 2) - # Community Identifiers Signed Attribute and Object Identifier id_aa_communityIdentifiers = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.40') + class CommunityIdentifiers(univ.SequenceOf): pass -CommunityIdentifiers.componentType = CommunityIdentifier() +CommunityIdentifiers.componentType = CommunityIdentifier() # Implemented Compression Algorithms Signed Attribute and Object Identifier id_aa_implCompressAlgs = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.43') + class ImplementedCompressAlgorithms(univ.SequenceOf): pass -ImplementedCompressAlgorithms.componentType = univ.ObjectIdentifier() +ImplementedCompressAlgorithms.componentType = univ.ObjectIdentifier() # Implemented Cryptographic Algorithms Signed Attribute and Object Identifier id_aa_implCryptoAlgs = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.38') + class ImplementedCryptoAlgorithms(univ.SequenceOf): pass -ImplementedCryptoAlgorithms.componentType = univ.ObjectIdentifier() +ImplementedCryptoAlgorithms.componentType = univ.ObjectIdentifier() # Decrypt Key Identifier Signed Attribute and Object Identifier id_aa_decryptKeyID = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.37') + class DecryptKeyIdentifier(univ.OctetString): pass @@ -203,19 +220,22 @@ class DecryptKeyIdentifier(univ.OctetString): id_aa_targetHardwareIDs = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.36') + class TargetHardwareIdentifiers(univ.SequenceOf): pass -TargetHardwareIdentifiers.componentType = univ.ObjectIdentifier() +TargetHardwareIdentifiers.componentType = univ.ObjectIdentifier() # Firmware Package Identifier Signed Attribute and Object Identifier id_aa_firmwarePackageID = univ.ObjectIdentifier('1.2.840.113549.1.9.16.2.35') + class FirmwarePackageIdentifier(univ.Sequence): pass + FirmwarePackageIdentifier.componentType = namedtype.NamedTypes( namedtype.NamedType('name', PreferredOrLegacyPackageIdentifier()), namedtype.OptionalNamedType('stale', PreferredOrLegacyStalePackageIdentifier()) @@ -227,16 +247,18 @@ FirmwarePackageIdentifier.componentType = namedtype.NamedTypes( class FWErrorVersion(univ.Integer): pass + FWErrorVersion.namedValues = namedval.NamedValues( ('v1', 1) ) - id_ct_firmwareLoadError = univ.ObjectIdentifier('1.2.840.113549.1.9.16.1.18') + class FirmwarePackageLoadError(univ.Sequence): pass + FirmwarePackageLoadError.componentType = namedtype.NamedTypes( namedtype.DefaultedNamedType('version', FWErrorVersion().subtype(value='v1')), namedtype.NamedType('hwType', univ.ObjectIdentifier()), @@ -244,7 +266,8 @@ FirmwarePackageLoadError.componentType = namedtype.NamedTypes( namedtype.NamedType('errorCode', FirmwarePackageLoadErrorCode()), namedtype.OptionalNamedType('vendorErrorCode', VendorLoadErrorCode()), namedtype.OptionalNamedType('fwPkgName', PreferredOrLegacyPackageIdentifier()), - namedtype.OptionalNamedType('config', univ.SequenceOf(componentType=CurrentFWConfig()).subtype(implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))) + namedtype.OptionalNamedType('config', univ.SequenceOf(componentType=CurrentFWConfig()).subtype( + implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))) ) @@ -253,30 +276,33 @@ FirmwarePackageLoadError.componentType = namedtype.NamedTypes( class FWReceiptVersion(univ.Integer): pass + FWReceiptVersion.namedValues = namedval.NamedValues( ('v1', 1) ) - id_ct_firmwareLoadReceipt = univ.ObjectIdentifier('1.2.840.113549.1.9.16.1.17') + class FirmwarePackageLoadReceipt(univ.Sequence): pass + FirmwarePackageLoadReceipt.componentType = namedtype.NamedTypes( namedtype.DefaultedNamedType('version', FWReceiptVersion().subtype(value='v1')), namedtype.NamedType('hwType', univ.ObjectIdentifier()), namedtype.NamedType('hwSerialNum', univ.OctetString()), namedtype.NamedType('fwPkgName', PreferredOrLegacyPackageIdentifier()), namedtype.OptionalNamedType('trustAnchorKeyID', univ.OctetString()), - namedtype.OptionalNamedType('decryptKeyID', univ.OctetString().subtype(implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))) + namedtype.OptionalNamedType('decryptKeyID', univ.OctetString().subtype( + implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))) ) - # Firmware Package Content Type and Object Identifier id_ct_firmwarePackage = univ.ObjectIdentifier('1.2.840.113549.1.9.16.1.16') + class FirmwarePkgData(univ.OctetString): pass @@ -285,9 +311,11 @@ class FirmwarePkgData(univ.OctetString): id_on_hardwareModuleName = univ.ObjectIdentifier('1.3.6.1.5.5.7.8.4') + class HardwareModuleName(univ.Sequence): pass + HardwareModuleName.componentType = namedtype.NamedTypes( namedtype.NamedType('hwType', univ.ObjectIdentifier()), namedtype.NamedType('hwSerialNum', univ.OctetString()) |