Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebased from Phil #614

Merged
merged 2 commits into from
Nov 30, 2023
Merged

rebased from Phil #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f01cd57
rebased from Phil
SmithSamuelM Nov 30, 2023
34c0865
fixed test_kever
SmithSamuelM Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/keri/core/coring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,13 +423,14 @@ class MatterCodex:
X25519_Private: str = 'O' # X25519 private decryption key converted from Ed25519
X25519_Cipher_Seed: str = 'P' # X25519 sealed box 124 char b64 Cipher of 44 char qb64 Seed
ECDSA_256r1_Seed: str = "Q" # ECDSA secp256r1 256 bit random Seed for private key
Trait3: str = 'R' # Trait as 3 char B64 encoded like 'DND'
Bext3: str = 'R' # Bext3 3 B64 encoded chars for Packet Type, SemVer, Trait like 'DND'
Large: str = 'S' # Large 5 byte b2 number
Tall: str = 'T' # Tall 11 byte b2 number
Great: str = 'U' # Great 14 byte b2 number
Vast: str = 'V' # Vast 17 byte b2 number
Tag1: str = 'W' # Tag as one char (bytes) field map label
Tag2: str = 'X' # Tag as two char (bytes) field map label
Tag1: str = 'W' # Tag1 as one char (bytes) field map label lead size 1
Tag2: str = 'X' # Tag2 as two char (bytes) field map label lead size 0
Bext7: str = 'Y' # Bext7 7 B64 encoded chars for packet kind and version KERIVVV
Salt_128: str = '0A' # 128 bit random salt or 128 bit number (see Huge)
Ed25519_Sig: str = '0B' # Ed25519 signature.
ECDSA_256k1_Sig: str = '0C' # ECDSA secp256k1 signature.
Expand All @@ -439,8 +440,8 @@ class MatterCodex:
SHA2_512: str = '0G' # SHA2 512 bit digest self-addressing derivation.
Long: str = '0H' # Long 4 byte b2 number
ECDSA_256r1_Sig: str = '0I' # ECDSA secp256r1 signature.
Version: str = '0J' # Base64 encoded CESR native msg protocol version 0JKERIBB KERI1.1
Trait2: str = '0K' # Trait as 2 char B64 encoded like 'EO'
Bext2: str = '0J' # Bext2 2 B64 encoded chars for trait like 'EO' CESR native msg protocol version
Bext6: str = '0K' # Bext6 6 B64 encoded chars for protocol kind version like KERIVV (KERI 1.1) or KKKVVV (KERI 1.1.0)
ECDSA_256k1N: str = '1AAA' # ECDSA secp256k1 verification key non-transferable, basic derivation.
ECDSA_256k1: str = '1AAB' # ECDSA public verification or encryption key, basic derivation
Ed448N: str = '1AAC' # Ed448 non-transferable prefix public signing verification key. Basic derivation.
Expand Down Expand Up @@ -786,6 +787,7 @@ class Matter:
'V': Sizage(hs=1, ss=0, fs=24, ls=0),
'W': Sizage(hs=1, ss=0, fs=4, ls=1),
'X': Sizage(hs=1, ss=0, fs=4, ls=0),
'Y': Sizage(hs=1, ss=0, fs=8, ls=0),
'0A': Sizage(hs=2, ss=0, fs=24, ls=0),
'0B': Sizage(hs=2, ss=0, fs=88, ls=0),
'0C': Sizage(hs=2, ss=0, fs=88, ls=0),
Expand All @@ -795,8 +797,8 @@ class Matter:
'0G': Sizage(hs=2, ss=0, fs=88, ls=0),
'0H': Sizage(hs=2, ss=0, fs=8, ls=0),
'0I': Sizage(hs=2, ss=0, fs=88, ls=0),
'0J': Sizage(hs=2, ss=0, fs=8, ls=0),
'0K': Sizage(hs=2, ss=0, fs=4, ls=0),
'0J': Sizage(hs=2, ss=0, fs=4, ls=0),
'0K': Sizage(hs=2, ss=0, fs=8, ls=0),
'1AAA': Sizage(hs=4, ss=0, fs=48, ls=0),
'1AAB': Sizage(hs=4, ss=0, fs=48, ls=0),
'1AAC': Sizage(hs=4, ss=0, fs=80, ls=0),
Expand Down Expand Up @@ -830,6 +832,7 @@ class Matter:
'9AAC': Sizage(hs=4, ss=4, fs=None, ls=2),
}


# Bards table maps first code char. converted to binary sextext of hard size,
# hs. Used for ._bexfil.
Bards = ({codeB64ToB2(c): hs for c, hs in Hards.items()})
Expand Down
16 changes: 9 additions & 7 deletions tests/core/test_coring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,14 @@ def test_matter():
'X25519_Private': 'O',
'X25519_Cipher_Seed': 'P',
'ECDSA_256r1_Seed': 'Q',
'Trait3': 'R',
'Bext3': 'R',
'Large': 'S',
'Tall': 'T',
'Great': 'U',
'Vast': 'V',
'Tag1': 'W',
'Tag2': 'X',
'Bext7': 'Y',
'Salt_128': '0A',
'Ed25519_Sig': '0B',
'ECDSA_256k1_Sig': '0C',
Expand All @@ -381,8 +382,8 @@ def test_matter():
'SHA2_512': '0G',
'Long': '0H',
'ECDSA_256r1_Sig': '0I',
'Version': '0J',
'Trait2': '0K',
'Bext2': '0J',
'Bext6': '0K',
'ECDSA_256k1N': '1AAA',
'ECDSA_256k1': '1AAB',
'Ed448N': '1AAC',
Expand Down Expand Up @@ -413,9 +414,10 @@ def test_matter():
'X25519_Cipher_L2': '6C',
'X25519_Cipher_Big_L0': '7AAC',
'X25519_Cipher_Big_L1': '8AAC',
'X25519_Cipher_Big_L2': '9AAC',
'X25519_Cipher_Big_L2': '9AAC'
}


assert Matter.Codex == MtrDex

# first character of code with hard size of code
Expand Down Expand Up @@ -456,6 +458,7 @@ def test_matter():
'V': Sizage(hs=1, ss=0, fs=24, ls=0),
'W': Sizage(hs=1, ss=0, fs=4, ls=1),
'X': Sizage(hs=1, ss=0, fs=4, ls=0),
'Y': Sizage(hs=1, ss=0, fs=8, ls=0),
'0A': Sizage(hs=2, ss=0, fs=24, ls=0),
'0B': Sizage(hs=2, ss=0, fs=88, ls=0),
'0C': Sizage(hs=2, ss=0, fs=88, ls=0),
Expand All @@ -465,8 +468,8 @@ def test_matter():
'0G': Sizage(hs=2, ss=0, fs=88, ls=0),
'0H': Sizage(hs=2, ss=0, fs=8, ls=0),
'0I': Sizage(hs=2, ss=0, fs=88, ls=0),
'0J': Sizage(hs=2, ss=0, fs=8, ls=0),
'0K': Sizage(hs=2, ss=0, fs=4, ls=0),
'0J': Sizage(hs=2, ss=0, fs=4, ls=0),
'0K': Sizage(hs=2, ss=0, fs=8, ls=0),
'1AAA': Sizage(hs=4, ss=0, fs=48, ls=0),
'1AAB': Sizage(hs=4, ss=0, fs=48, ls=0),
'1AAC': Sizage(hs=4, ss=0, fs=80, ls=0),
Expand Down Expand Up @@ -500,7 +503,6 @@ def test_matter():
'9AAC': Sizage(hs=4, ss=4, fs=None, ls=2)
}


assert Matter.Sizes['A'].hs == 1 # hard size
assert Matter.Sizes['A'].ss == 0 # soft size
assert Matter.Sizes['A'].fs == 44 # full size
Expand Down
Loading
Loading