Skip to content

Commit

Permalink
use 5 series for codes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasoncolburne
jasoncolburne committed Aug 14, 2023
1 parent cac5384 commit b1186c0
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 17 deletions.
37 changes: 20 additions & 17 deletions src/core/indexer/tables.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ pub mod Codex {
pub const TBD0: &str = "0z"; // Test of Var len label L=N*4 <= 4095 char quadlets includes code
pub const TBD1: &str = "1z"; // Test of index sig lead 1
pub const TBD4: &str = "4z"; // Test of index sig lead 1 big
pub const CRYSTALS_Dilithium3: &str = "1AAA"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium3_Crt: &str = "1AAB"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium5: &str = "1AAC"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium5_Crt: &str = "1AAD"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium3: &str = "5AAA"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium3_Crt: &str = "5AAB"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium5: &str = "5AAC"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium5_Crt: &str = "5AAD"; // CRYSTALS Dilithium sig appears in current list.
}

/// SigCodex is all indexed signature derivation codes
Expand All @@ -75,10 +75,10 @@ pub mod SigCodex {
pub const ECDSA_256r1_Big_Crt: &str = "2F"; // ECDSA secp256r1 sig appears in current list only.
pub const Ed448_Big: &str = "3A"; // Ed448 signature appears in both lists.
pub const Ed448_Big_Crt: &str = "3B"; // Ed448 signature appears in current list only.
pub const CRYSTALS_Dilithium3: &str = "1AAA"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium3_Crt: &str = "1AAB"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium5: &str = "1AAC"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium5_Crt: &str = "1AAD"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium3: &str = "5AAA"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium3_Crt: &str = "5AAB"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium5: &str = "5AAC"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium5_Crt: &str = "5AAD"; // CRYSTALS Dilithium sig appears in current list.
}

/// CurrentSigCodex is codex indexed signature codes for current list.
Expand All @@ -95,8 +95,8 @@ pub mod CurrentSigCodex {
pub const ECDSA_256k1_Big_Crt: &str = "2D"; // ECDSA secp256k1 sig appears in current list only.
pub const ECDSA_256r1_Big_Crt: &str = "2F"; // ECDSA secp256r1 sig appears in current list only.
pub const Ed448_Big_Crt: &str = "3B"; // Ed448 signature appears in current list only.
pub const CRYSTALS_Dilithium3_Crt: &str = "1AAB"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium5_Crt: &str = "1AAD"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium3_Crt: &str = "5AAB"; // CRYSTALS Dilithium sig appears in current list.
pub const CRYSTALS_Dilithium5_Crt: &str = "5AAD"; // CRYSTALS Dilithium sig appears in current list.

pub(crate) fn has_code(code: &str) -> bool {
const CODES: &[&str] = &[
Expand Down Expand Up @@ -131,8 +131,8 @@ pub mod BothSigCodex {
pub const ECDSA_256k1_Big: &str = "2C"; // ECDSA secp256k1 sig appears in both lists.
pub const ECDSA_256r1_Big: &str = "2E"; // ECDSA secp256r1 sig appears in both lists.
pub const Ed448_Big: &str = "3A"; // Ed448 signature appears in both lists.
pub const CRYSTALS_Dilithium3: &str = "1AAA"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium5: &str = "1AAC"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium3: &str = "5AAA"; // CRYSTALS Dilithium sig appears same in both lists if any.
pub const CRYSTALS_Dilithium5: &str = "5AAC"; // CRYSTALS Dilithium sig appears same in both lists if any.

pub(crate) fn has_code(code: &str) -> bool {
const CODES: &[&str] = &[
Expand Down Expand Up @@ -193,10 +193,10 @@ pub(crate) fn sizage(s: &str) -> Result<Sizage> {
"0z" => Sizage { hs: 2, ss: 2, os: 0, fs: u32::MAX, ls: 0 },
"1z" => Sizage { hs: 2, ss: 2, os: 1, fs: 76, ls: 1 },
"4z" => Sizage { hs: 2, ss: 6, os: 3, fs: 80, ls: 1 },
"1AAA" => Sizage { hs: 4, ss: 1, os: 0, fs: 4396, ls: 0 },
"1AAB" => Sizage { hs: 4, ss: 1, os: 0, fs: 4396, ls: 0 },
"1AAC" => Sizage { hs: 4, ss: 1, os: 0, fs: 6132, ls: 0 },
"1AAD" => Sizage { hs: 4, ss: 1, os: 0, fs: 6132, ls: 0 },
"5AAA" => Sizage { hs: 4, ss: 1, os: 0, fs: 4396, ls: 0 },
"5AAB" => Sizage { hs: 4, ss: 1, os: 0, fs: 4396, ls: 0 },
"5AAC" => Sizage { hs: 4, ss: 1, os: 0, fs: 6132, ls: 0 },
"5AAD" => Sizage { hs: 4, ss: 1, os: 0, fs: 6132, ls: 0 },
_ => return err!(Error::UnknownSizage(s.to_string())),
})
}
Expand All @@ -205,6 +205,7 @@ pub(crate) fn hardage(c: char) -> Result<u32> {
match c {
'A'..='Z' | 'a'..='z' => Ok(1),
'0'..='4' => Ok(2),
'5' => Ok(4),
'-' => err!(Error::UnexpectedCode("count code start".to_owned())),
'_' => err!(Error::UnexpectedCode("op code start".to_owned())),
_ => err!(Error::UnknownHardage(c.to_string())),
Expand All @@ -215,6 +216,7 @@ pub(crate) fn bardage(b: u8) -> Result<u32> {
match b {
b'\x00'..=b'\x33' => Ok(1),
b'\x34'..=b'\x38' => Ok(2),
b'\x39' => Ok(4),
b'\x3e' => err!(Error::UnexpectedCode("count code start".to_owned())),
b'\x3f' => err!(Error::UnexpectedCode("op code start".to_owned())),
_ => err!(Error::UnknownBardage(b.to_string())),
Expand Down Expand Up @@ -427,6 +429,7 @@ mod test {
#[case(0x36, 2)]
#[case(0x37, 2)]
#[case(0x38, 2)]
#[case(0x39, 4)]
fn bardage(#[case] code: u8, #[case] bdg: u32) {
assert_eq!(indexer::bardage(code).unwrap(), bdg);
}
Expand All @@ -443,6 +446,6 @@ mod test {

#[test]
fn unknown_bardage() {
assert!(indexer::bardage(0x39).is_err());
assert!(indexer::bardage(0x40).is_err());
}
}
8 changes: 8 additions & 0 deletions src/core/siger.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,14 @@ mod test {
.is_ok());
}

#[test]
fn new_with_qb64() {
let qsig64 = "5AAAAKEWfy8izZF5MNOHRA5jj0WdWR4LnasWt97UTwEgku7o5xd_L7Oftt8oHAS4qO4gUpbj7rZntpI4wB-vHSvTXDBXSsEc3NOJ4Vb1MWfxiYHsJSSHSh5g-_S-6LmBeC5v66eMh8RUsAuP-SqfXwH3O2Vim3e44wTY7tf5XCxuGHdXLpvksZ3ut5W-TtT_yz5zCzO88M4SwNKg6VACGXwXyASLzlsHSaxx3Y4FQa8o3AImkfoIJmMQYHYo--EhIJkWl5zLOmljGenQUC7mie2wqe0_JtA0PS-2lsFRFhHT4xvoHDNH-T9t72mZY_fHqeuQx2sqf6f-tjqAzSly1DHxPc_q6evDLSev_90GGWmaY2ZcionQZZr8pM741vy7u_pdSRc_rvrEcSf9ofE_4eXFezNHfHBVlsLaX3BsztwXvAxT_FmCRrrTGzR_uYffYnAdvaLCDdnuflaEC8stAsuOEnZbpgHIeeYWJK8xkwq-pwDQ-khGFVM0aJnMUIyNJpHzwBQS-OcTjU3HLObOOy5L3tuTkoRdvlxv0nNUre9ZY5S7rDW8vSQgCEXJOw0RkKr5uOjwQwM-yARGu-Ta44RddAKDvijDI0OAyT5Lv2U2U1ip9y9bMCOOr4dRK3elOQ6M0RReAfLb6UFniSqbfevFyJ0WbfNfDaqhhbo2J2V0Ck53kb1G6pY7yV9BNlBrlvXQARedf-wLgby3jU0Y06yoCWdavycH9-vvAKzBF6ggnfxJCeJNnAIATy3dfvsBaYRv4uOa6gODaSJuOdKAInErMcGUi279jTUy1LtPk9v1LMdWoTm_zT-K3kwvEu1uU0kcszzVjJUOAl7rDbXeux1CyooyN0MfH4dtUgUiSWGDq3JoNsDSEuQ2XfztoNQcS82hsRzgQsyvTeXsSqp92MpO4jCfGv3pvhyAUdv0TKh1wkxXvj9P1Hv9WmeSFpYCx1aZlqekYcKedPEZ2jDAVJSFsJUVGvyl8_meOZvOCUSTAEbjoL52tdQu8wUmreRBRyrfXkh5C9a3Jl39YHSkhStc1dgwHOJmLFK3oGMRRlwnqlazQ77JjIFJYjt2i4q-KfKDiIURL6ai66fTHXbndvBMq548NVcQYrfIOI_xRnKEXsDwEGMJhc47Fmk3sznpJ76yIzCXchqepmLXbBqM6sA3Gwd9dJZGzaJwpSeugEBZmjckU7rwzyDXim1sphs2ywFKGMyQGxvUOv7HgriPpbR5kvuSNN_HXDZaAzatWM-bbcfvv-3WxAmY398SSaQpe0sWaa9IxAhbCUB1jgPxslJLNNLfWF8J8vp90SxMRhlwZUGZGclSvlM0plFYrpmeqvNlhr3iViCquSQDDQmD4gqE2lViKA4PU7TxYPb1Ywiov0-bjlQylTckf8dkI3ZafQgNNpOCdquj-8AkGoUzlGHx1sg-hxSe9XphO8a5Gqd204ydiNzHLr1CLBDdkHSwcDA6j2UHlrfRV8mtM1Tfcutl05ise_BQgv5C2EiYw-r_Zz0itQPngCH_LdVT1NBTlPyPy8DxjGnMjwthaOhBBc8mSoA4Xe9vz4cWhjJ-UJaCtESUz7zybMJ2toafTrtBptE0TjZFWC1oZBCEn1codNMQ1fIzddCPJpce8NvvdZrEkqP0UT1RuxR35-o7aVOtWzf6WtpvKre2doKliwgNnMXOJHUZdAWYLsolPW5wbkCElkvQ0vS0nep_jFJuDt3AvQdkLOhf-wRNSiswCz8-LNWRNVZV2bdJ90CiF4jr-L9jb4Tzt38oJM1xXSgBsn0XErcui0GZPm1R80pM3kbErebrXn5XFR6CoKqgHgCf_X2kQ5nQHtir5ipskq35kEG7pZ9vRaSw6YBqz28_eUHITN0PfNHIGSAo8shsqCuV8DdN59iBLPKr9JvZK3FmzOPsLGNKcmYS0UMVSbkCSfRMb-s2jKOqFbSe4xsFCky90CcNsxUIqBIRhNu5f2Ebqv7jZOVR8wb22j3eNBz1Mp1Jpe-asxD3o6O0gbIGa081eiMoKUvG60ZRfVwroKd0OP-LVKPP2HRB6UHGyMZ-MxYBHhLbc_3un5uvTIgQ-2i2fzLP2Az5vMY12hTbYqzIwWVHa0O2nzdTBAzM7fSkupSazxG_24Th5HF5RTCJAl11KsPPzKbimFdE1yT7S9lGIDGk446fYdhdGhUs_ujiowlNZkDlaxk_L5zymDOwRUfYYwfpIiRVWhT6OgkS8KaqufHIBowAN7WQIeQ4RTYsJCF5wYUGRwB_dvLyJehXZlilBIXVLeL5kMbYTMMuF0QZbKDVymAAXI6m_0LLEsCWbLoOjWvz8L9QvNWjFiEZzGOMZa1g7BTQ17GFJ5aOWJ0tvaAbIS079zSOj0JFF889AxuRF2UizQCvXeh_geSQ3ccgWBwpSv6Un85GdTiQUQKcZRSOtNT2-pc6mCj6z1vKFr0zwktY4B5JYMw-mbHlq8KUz_rBwVU09MhuCRG-eqv78PCZI0Lg6jHXpgjTBR8Z3ylH_eU4lQxH_8Qm8_4S2IoHHnMa-EXiNaxoxPT3GJOCjNvXVKAbVKfnmau32R2J3nBYwShSfGh32adA70JbO69D_zHIAkJPdmr_ZTUh8RYzVtetHLNO6wHGhat-Kft6k4rSmN-epMzU80pgp_e22AfXS8YhyuE3JOT2C6H5VC1eO6jO1ra3njqHGtQpTcaXRELCHZBS97bykJP3Vpg93VY1kFZEgVY1uGiXrCLI-PTPOJUEWv9GR7x4yesfyOboQPrDsCoLJgXd6DMPa_L2xbCyz-fuqzsJm_6sjzjXGx_MJXlOLAI9mw4JEUUu1xM5rqkxHiQ8_RzTBxfmA2kNYSsPRJDuzdWcI7aLXS1w6JC7Rfmb5iYN15Sh2ykgCZdU9o_fYc49bnS-Eyqlt5-C_ZY3vx2ipspVjBnZZB3fnenAfpw9JJvHVhpCFIdIU1W_QiZD5RrFAK8sw8MXIBlSTc6yfkRx6FiZ64ih17g7_VeYmZDjEndl7MZNxq5o3fbLiqIAFrV_KIqQqpUu-wSYtqKSXTaaVAb8QsVjh4ab9vUYkiW9hoU11O0SvVGajD4fzejELhEFBZsXfz9DYrBGGukeEEU-BIawpv-CCZAl5e4xbHaVPg8OvyIHf9uF4OlEodY487Bji8oP9qpd5YoYbbbUfiCIrxWfcR9DnXZAnJmj5Cjr9shkIsqXjF5ra3qWjMfcZh7eS0vRWpioL9EHsHvncodGFO-sXCiRo70SOmQPtKc4R5HHFw1c9Sm4etqAHqMHXMcZYbnrhaFQuJSnL4fe5wVJLEmvcPFueA1Ymz4tOlxjgzC8VxsWnFRCBYdLnxTvHeMp18h5r8kWz3Y0auhxzLHSR4cOirgKWNCBSSZvgvzWYHGLtDkiPoIfOJYZ8pqbKzFyRIqvkZvBQwBXHmyRyz0_pxkoeGIP0FaWGu0YBLy-y6ZEzNs0igbisX8-DtJ6ORrnsFGVaYEwVnPFlPydJ5n6r7geEQR9ZxdXXzG2VBaY4OJwHr5_WP4YmiPxdQWaJPrC6xZHthq5el4j82exKwXU6VXduhPY7n0n1TkIY9-i7jxRdkMI_RIlXylrNYTl_L5THA4NIgmoBJFHyDeV7tHwQPTvoz-AQe5TznzS4oMEfYY6HBBjlqXkSI0sySPC3p0QZU7oMQ18gGQDpqagGJYRr4OpJFvjcvEa2KEUmqkz-cfo2WFq-jjxO6nyvR0BQrqXE_L8Du63qj19yYEF4jX2HRvAQSSw20GqjaG7Ua0WM4fRGU0MIZ996j38iJdSAlsA9vRkoZNj_V-SQb2sGkN1qUyZK9YuhQ8BRdLs-ksxnJjLTAur4UpyWncYUeegj7PmSSv2MPe1B-6IKhlqr3vzo8S3K8xteGXR6LMhsh_mU0Bbo_HLlIll_xNcCh-HgGkLb-sqKcC09HwBEGBB1A3xO_rNkIjMcgwClA-l-3klQCohmkk2fd39m_ZYq5MabS9ge2jV8jg_9jBJVwO3kd9KhCRBoYjnGucN2eiheo2BsFFrFo7lexE7z90Pf4zhLBu-RKqV4X0Y7SVUWZgJBNK_GAmyAWmqYMmviO0fP5UZ29KoDdIpgnCqWme6FNTyew7wFvL7pbeEr7OcGzH6zDMHQdNFPns3MNCw6OMUIq2CDSHpccaj2vZkA0gM8z8Tg1MdreU12UkyzVjFFFkdCROSX32hBndzQa14977XP1JBom_vlzFdDxOeZ03-cVTpzH_Y8ha5D9J_gKA9locHSdbvUA7hAzjfrVVpBAAHpc9prqqO3bLgt08dCLa9Hf08l9wzyBQCW3_2ETRq0114g6Ws2uouS1S77_MNb8AOD1NVWGBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgPFRgf";

Siger::new(None, None, None, None, None, None, Some(qsig64), None).unwrap();
assert!(Siger::new(None, None, None, None, None, None, Some(qsig64), None).is_ok());
}

#[test]
fn new_with_qb64b() {
let verfer_raw = hex!("0123456789abcdef00001111222233334444555566667777888899990000aaaa");
Expand Down

0 comments on commit b1186c0

Please sign in to comment.