diff --git a/Cargo.lock b/Cargo.lock index 824b761..0096d26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,15 +4,15 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitvec" @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cfg-if" @@ -54,6 +54,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "funty" version = "2.0.0" @@ -71,39 +81,42 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "fb15147158e79fd8b8afd0252522769c4f48725460b37338544d8379d94fc8f9" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "log" -version = "0.4.17" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memory_units" @@ -113,54 +126,64 @@ checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.17.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -191,24 +214,24 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde-wasm-bindgen" -version = "0.4.5" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" dependencies = [ "js-sys", "serde", @@ -217,9 +240,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -228,20 +251,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "syn" -version = "1.0.107" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -256,11 +280,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "time" -version = "0.3.17" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -268,40 +295,42 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "21d3b25c3ea1126a2ad5f4f9068483c2af1e64168f847abe863a526b8dbfe00b" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "52857d4c32e496dc6537646b5b117081e71fd2ff06de792e3577a150627db283" dependencies = [ "bumpalo", "log", @@ -314,9 +343,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "920b0ffe069571ebbfc9ddc0b36ba305ef65577c94b06262ed793716a1afd981" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -324,9 +353,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "bf59002391099644be3524e23b781fa43d2be0c5aa0719a18c0731b9d195cab6" dependencies = [ "proc-macro2", "quote", @@ -337,9 +366,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "e5047c5392700766601942795a436d7d2599af60dcc3cc1248c9120bfb0827b0" [[package]] name = "wee_alloc" diff --git a/Cargo.toml b/Cargo.toml index df098c6..0cc491c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,6 @@ hex = { version = "0.4", features = ["serde"] } time = { version = "0.3", features = ["macros", "serde", "serde-human-readable"] } wasm-bindgen = { version = "0.2", optional = true } lazy_static = { version = "1.4", optional = true } -serde-wasm-bindgen = { version = "0.4", optional = true } +serde-wasm-bindgen = { version = "0.6", optional = true } wee_alloc = { version = "0.4", optional = true } console_error_panic_hook = { version = "0.1", optional = true } diff --git a/keys.json b/keys.json index c254f92..ba739ab 100644 --- a/keys.json +++ b/keys.json @@ -1,4 +1,28 @@ { + "01": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "01", + "modulus_hex": "00cc3087c83e7a0c410b186a4e298f1d3a203a7fbc3e29a8e90936d7382afe8cd85b3091618f022a8eb46f23185c6c12724779ec28d40ff9399d702b81c404390621b72d229dba1f0be0f44e27ce98632d9742f7aa92b92f046604c737b1bb4d98afa920d6f09860d40be66952a5caf814025eb14928a84cd3021086370007fc25", + "public_exponent_hex": "010001", + "public_key_x509": null, + "valid_from": "2017-01-01 00:00:00", + "valid_until": "2040-12-31 00:00:00" + } + ], + "04": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "04", + "modulus_hex": "00cc3087c83e7a0c410b186a4e298f1d3a203a7fbc3e29a8e90936d7382afe8cd85b3091618f022a8eb46f23185c6c12724779ec28d40ff9399d702b81c404390621b72d229dba1f0be0f44e27ce98632d9742f7aa92b92f046604c737b1bb4d98afa920d6f09860d40be66952a5caf814025eb14928a84cd3021086370007fc25", + "public_exponent_hex": "010001", + "public_key_x509": null, + "valid_from": "2017-01-01 00:00:00", + "valid_until": "2040-12-31 00:00:00" + } + ], "AA": [ { "is_private": false, @@ -17,7 +41,7 @@ "modulus_hex": "9140aa61f7d9a2e943c0510baca5fa9ca7d12d78e301a36d640f2d28d8c0aa4d6a7102555cecf138e467730b797509ec1ab5bba77ca6384bc8f483f609b121e75ae42660edfe15ef91add4da68c355f830faac6ffb25fbcfe1e61c7af37c4ae8c85e264c151bd9c9aa4de41d2756a9e260c0cc89ae2addd19e452a675e88da47", "public_exponent_hex": "10001", "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRQKph99mi6UPAUQuspfqcp9Et\neOMBo21kDy0o2MCqTWpxAlVc7PE45GdzC3l1CewatbunfKY4S8j0g/YJsSHnWuQm\nYO3+Fe+RrdTaaMNV+DD6rG/7JfvP4eYcevN8SujIXiZMFRvZyapN5B0nVqniYMDM\nia4q3dGeRSpnXojaRwIDAQAB\n-----END PUBLIC KEY-----", - "valid_from": "2015-05-31 23:00:00", + "valid_from": "2015-06-01 00:00:00", "valid_until": "2040-12-31 00:00:00" }, { @@ -47,7 +71,7 @@ "modulus_hex": "bd4bca07a1f9c5e091bdf0f492d74b33fa62dcfd8c632237de70c2a291b85f90bba41ce465a2519325ab99b1d3d6381509c394ee9e4af0db5363f18fbda1ca645c85491166ea41508be1ee5c9d834d079a6125f6df1e023eedd3bccb41c1bf12b8d6a343ae9db957b7d72a8171308dc635f191e2c7c36c41b551f301cfe76045", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2018-09-03 23:00:00", + "valid_from": "2018-09-04 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -59,7 +83,7 @@ "modulus_hex": "B4F9BAA16C9AE4FE386D3D93F4B74948043DB10F589376E389838ACC24D60F5FE9C5FC5BBDA32D5EA61C9873A5186B734814F98AF83F7B5E6D75E17E993F19586F9231CD4FD1F21CA6845DBB87DCD55EAD6C183D0C2CCC294269EA36818E38C36E49FB6CE2F2A01307656A9DB86CD7EC0962DBF2380CD58F5E2D06F55ADDD8AD", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2017-06-30 23:00:00", + "valid_from": "2017-07-01 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], @@ -83,7 +107,7 @@ "modulus_hex": "DBF589744B93EC40F090F167B0F7F6E24CB18E85548D87ED8D17C30FF636B4A15A9901CCB1154A138265242A229915963611704EE975A0E12E4B34BA162C15E94E3B474940DEE620F2FF7DBDA491CC3E3A55B245608024063D8549FD49AAF57E9B9CE642B55C6900986A2265104303E5A4E7D21B02F9AC12AA4C8E06E35CA3B7", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2018-09-30 23:00:00", + "valid_from": "2018-10-01 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], @@ -105,7 +129,7 @@ "modulus_hex": "00cc3087c83e7a0c410b186a4e298f1d3a203a7fbc3e29a8e90936d7382afe8cd85b3091618f022a8eb46f23185c6c12724779ec28d40ff9399d702b81c404390621b72d229dba1f0be0f44e27ce98632d9742f7aa92b92f046604c737b1bb4d98afa920d6f09860d40be66952a5caf814025eb14928a84cd3021086370007fc25", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2017-05-31 23:00:00", + "valid_from": "2017-06-01 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], @@ -117,7 +141,7 @@ "modulus_hex": "B0C7F7159EEB81AA04B1A2E5D74A690AE381D68366972540802F8DCC57A9650AFCE70341AC59F06A05309EF779B269AC77C15E9CFC3173B1933A6C4E4552F26A4FA2A1F8ED023B5B1BA7F91B263F18391042F652E8EB9E92727BE19A7ECA9262A771525F0BCD1A5B02357DBD451814002EE7DFEAEBC1E6EBC02C10EA709610DF", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2020-07-22 23:00:00", + "valid_from": "2020-07-23 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -153,7 +177,7 @@ "modulus_hex": "BD9E2181CCA3F4E33569D745AAF03D748A954F77431203EDBD8DCD0D44BA21996B26049FF85903273F8A78D27F4E471FB1A5834100217DC9A9C0CB7DF4A6B815C6E6A78D007F969B6F5ABC191AD6F7A49D94A61E51D0269C261616DA535DF6A254CB5B3AF4024A998EEB46A24A5824B13F0416FC9037E7C59B4DCF8797567407", "public_exponent_hex": "25", "public_key_x509": null, - "valid_from": "2020-06-29 23:00:00", + "valid_from": "2020-06-30 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -165,8 +189,20 @@ "modulus_hex": "DF32F851531CA6A9E5D318C1E2477346FD512E45CCBFDB893814BC7B358A8B2AE7450253832FE79D3C6DF613ABB73976B2638C19BA054046AED942C35A7F17BE4AAB5D84B7D27F8C1D3B21DA89F4A43571DF5192BB1576DFEF6EDFFAF54AEBA5B7D9B9157C3067C246B9091CE44E7B35249AD272E3487A5D3B85A38059ADA579", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2016-06-20 23:00:00", - "valid_until": "2026-06-18 23:00:00" + "valid_from": "2016-06-21 00:00:00", + "valid_until": "2026-06-19 00:00:00" + } + ], + "ER": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "ER", + "modulus_hex": "bab8797afc2e41beb302f52f1476a1599c3a0de84d41a393bb1e2d6919b25578c69d0c85102c2ce11a46b753bdcb31eb31eb70a903a7801883ba7ff2d25bff7ad4f955718a2e11c46e1a1c2b4cf9192ebff06bbad7aae3cc9fe04da4854796a9d0165d8194614c24f1e1f7ff433e697daa602f6a7ace9a88f08930cc10a7b8a5", + "public_exponent_hex": "10001", + "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6uHl6/C5BvrMC9S8UdqFZnDoN\n6E1Bo5O7Hi1pGbJVeMadDIUQLCzhGka3U73LMesx63CpA6eAGIO6f/LSW/961PlV\ncYouEcRuGhwrTPkZLr/wa7rXquPMn+BNpIVHlqnQFl2BlGFMJPHh9/9DPml9qmAv\nanrOmojwiTDMEKe4pQIDAQAB\n-----END PUBLIC KEY-----", + "valid_from": "2018-03-06 22:53:10", + "valid_until": "2040-12-31 00:00:00" } ], "EV": [ @@ -193,6 +229,76 @@ "valid_until": "2040-12-31 00:00:00" } ], + "FA": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FA", + "modulus_hex": "F652923CC7432E984DA21D301F07FE292C5CD0E0E906E59F2EB0B638744CBFBB2C2D76BC862E5E434E27874AA8F46E5C690BF53D8D5FFD87D5BA26F1C5EC0D1ED6B199F034D1AEA31FBCBF1B463347DD90217410EAEB609B74133A566352C0F402412CDA53ADCC3ECDA94D79C23152388416DD7B312843B0C497A865D59A1E43", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-03-18 14:04:23", + "valid_until": "2040-12-31 00:00:00" + } + ], + "FB": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FB", + "modulus_hex": "B0CBC7DC0075F3C466799DADA71894E4BD7BCFCBA2B5466766F82A23C65CD2412CFFE84931AEF4024F84EC72076DC2CCCAE011131E68B48213C1FB583C9A45B4597FE8C6E0DB18B4DA754049650980B24157912BE4E00716DD43B119E361A4538A20113E667D5723489767CFD09BF1556E4141B411B1434FF6786528D85855E9", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-01-03 00:00:00", + "valid_until": "2024-01-30 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "FB", + "modulus_hex": "BA72357DB01279682E31684653A75F68F8DE70144B3ACFDFD66F5CF28F25F5F62ACDBCFD7457A0D73878D784A7919F06DF0EA7EEAA1068E1395B9066EED39B8840E7F3CF867A078E5661E40710CA7BA45671E336CB16AAF8ED89D1A72259B285D89D720780E05ACDE9E2AD8EDC8D95DA8959A32BE708E0E393D2CBDED7A03695", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-01-30 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "FC": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FC", + "modulus_hex": "d4f45ab45a42a1e0f0ec7af9666e4c09efe22c6022ce49e7ac5280993fc6b76275f801820d8a7b88d857507602ce0db065a8686a78c587e4b7a0b8d496d462af8ed85a852331bf9d67cee65c82377121152f94c019f3c3e88755dab42c17522f2359252bd02a73efd584680a1baa5c5512f2835c7775feb476428a7edb561f7b", + "public_exponent_hex": "010001", + "public_key_x509": null, + "valid_from": "2018-01-09 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "FE": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FE", + "modulus_hex": "A6EFA742AE63D023AD48E369C76A1003244D2395D4DC2E7228C09DD0056C292E625AB563420434E8E7081ED8A2434FDFDD8B9F5930B497C319CD4732597E220BA99FC32F3B61019B47D5082125296FC7548B4DC80EB700DD5FC3B33AF681F6CF92294E3268E4CA9E1FE63417F7BE2BD99A3EB168C8118F8771D04DF3F4766A25", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-03-18 14:14:33", + "valid_until": "2040-12-31 00:00:00" + } + ], + "FG": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FG", + "modulus_hex": "A5A67A813791D29832670565B02CE4D0E9C9D1E9DB43799C695A3E32B213357EFC4FE404150BE5ECFAD11941E3F934D352468E80612AC0526F9D14E10ADCDD5D817CBA5913E1ECD8BAFD8F7CC5483F80F59F7871ABDAB5976A26DF93AFF05FF528AB3FFED2A37C5F99848926018224791101AD7AD49E2F4B4584F3D92AA51319", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-03-18 14:19:02", + "valid_until": "2040-12-31 00:00:00" + } + ], "FJ": [ { "is_private": false, @@ -201,7 +307,103 @@ "modulus_hex": "BAC2E5720E629873767E334D55DF64B9FCF5DB592D53F54D153068C763B0F323317CE2ACF6610E48FCA00D174DE362B377A917580638E7DBF93D89FED035D8FCE7AA8D03F542E33BE5925D69EDF83B6E39B531BCBD9BC455AA2F973D4E8484E006939BC6035A04A9A8C3F1B7B7569676EE2B23BFE2E106B9E03B961386B6742F", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2016-05-31 23:00:00", + "valid_from": "2016-06-01 00:00:00", + "valid_until": "2040-12-31 00:00:00" + } + ], + "FL": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FL", + "modulus_hex": "E07F1A9429D9C19CEC0D980B2F498A2B6C5476183229CCDD01E64028700795339E8A805ABB78357A1010789018E21A3FD4CC11926E5C8EFF166EF4EB762260057A780B6FDE476A5986817A3BEFA33140B77F6CAF27C5FA16660110F4B26EDC68400C011AD5F6D8C34DC1141C1DDD76BD3FD0915AC4557D3A61C4EAB0AB563AD3", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2022-01-31 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "FN": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FN", + "modulus_hex": "CDD305682BBB1E7E09CF465B5C7D90577B683BE70190106131A9FC0E2271B5BC888825BCB45C3872C4538463A4B39514F8F10F02F5BA528E7F0649E168BEDD66E5690DB0CA5C9313495A2F0C26215AA550C55A9E868E93DA85B16693D9E56122D03457A0B1C1D5F32BE9AFB6EBB32302BA06E9A04A3C83F7719DE661709243E3", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-03-18 14:28:09", + "valid_until": "2040-12-31 00:00:00" + } + ], + "FR": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FR", + "modulus_hex": "E776F6A032C8840D00D7EFBF14D030C652FEAE28FB1CDE79DEB470E1273F99DFD15453997E608285B4434235BDE4625C0D124B574C7283B7B9398D00E7C45DB6585CD3B1F787F6ABD01F19390DC9BB882F62C222D87D45D5F77E3E7EE15DFE21D8AA2799BC2A1C6BE884C750429E9A770ABFAAC15921AA1D042BCB621C828811", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2021-06-21 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "FS": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FS", + "modulus_hex": "98A5ECF4E5CEE3E95FFAA2497CB1F0A579478AED7B1C18FAC90EAF3DAF256BBBE4EF467ACDAEF9FC377BD133BF4612314EC5599D4BC4CC9A40B5EED45AFA08E33972317A6F66D509190AB60414B1F763A8FFC2F374D449C9A269C784309DB47897E24DD338B9642CB56331EA3E49301AD2CABA43ABD6AE99076A35C0384F3F2D", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-08-09 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "FT": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FT", + "modulus_hex": "D2857F49332802B46BA76DB9FD9766B21FB4067D4EA336602E52B546CFB6EE6A35F0947A805BD33026982ADCB615B63C010B3C02E79726015328A6A4026C74323DA31474B4B39334165D00B669B13236A98C154467E1EE9111ACCB1730E1ADF0503D24EDD289FC1DC8A306C8DECDC58D61D8967AAC6BB917F8A30C5AF54F79AB", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-03-18 14:31:28", + "valid_until": "2040-12-31 00:00:00" + } + ], + "FW": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FW", + "modulus_hex": "B2FD2816B81BE4F0508E5583B3C37148E916E252403D073720043850A296970799B5BEF6F04043C61E55F401E38BB6B47F4CEFA08374D6D51DCE08E4D51E9388499D78EE9721B3D80A35714B9B6334E2681C3228C13414C6F283088B7F488B38D8347BC5EB6A682107F3D5320ADFBCE322F8AA7F8FF279273FD65D33A1205EE9", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-03-18 14:24:03", + "valid_until": "2040-12-31 00:00:00" + } + ], + "FX": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "FX", + "modulus_hex": "BC166F0AB96B45A5DD91FA674960495574D03BF3DC8D234CC63836193E80FA3B608153BB8852969D4D413E4CBE1ADF473E79F09BB89BBDA5C7A996112765D22363351E10F6C65288E0C614598C5EA6013E23FB4EB86620161D78CF3314D5322B45604292D54DA560CB08CBAE0EFF7244F2EE16D8CC74A2DD70662E711AD7656D", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-03-18 14:36:23", + "valid_until": "2040-12-31 00:00:00" + } + ], + "GD": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "GD", + "modulus_hex": "EE13E01F9F6C59FFB78E68A12129BF5593F6982CB3A101772159B9B81D5D3B9F182B46C7A307B30250B9E1B2888B41F03DEAD516509F7DB0DB1D0B15E55FB6B24321E354ADB35D8FA27609B79C707D1572B7B8C583315E7679D28776F7E49E9CCBD878BEE78126B9B72F15747D8668D4542437F9506D1F2D79F6E118FCA258DD", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-07-01 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], @@ -213,7 +415,7 @@ "modulus_hex": "C1A026E424DA6A9C622127C83DE4AB675F767B1EEC1A8CE3BB5DD58C457C9F91031365418CD4A69C0EE45D04C034C76EB3BA413FBF903AD56550A0CD2145BEC965BED68A0B6432621F48B1D7C744B25E450FF001155F6D7A10AB6AF1E88002CA5CA8797FDF16057F8A3562B8F532CA35AA2A2927E5F4CC4BDF87CFBC31E59EF5", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2021-04-22 23:00:00", + "valid_from": "2021-04-23 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -237,7 +439,7 @@ "modulus_hex": "CDCFD81DA220A00962C56098FADBBBC612BC7F7ACC23C34247916D58F96D5972BFB5F585752A318BCCD94DFC186CD8C2C6FDF27550CEDE3C79DC63932DB7E28DBE0C3796EE882E9C77E49434C3F256F2BCDF71982A1333B73A479C3545EE929EFAD4C9AC37AD5C727A3B35FBCCD5F18EB9F669470D30172A03F19C6F1EC075E1", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2022-09-14 23:00:00", + "valid_from": "2022-09-15 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -249,7 +451,7 @@ "modulus_hex": "BDF3E021442DCC02A2AAC8C172B2309B05A4298E9EBA53484BA45FA3933C6377FEFBEF0D8298EB5429E8365B83298A3FD5F939D32994D546DEA31641EEA032C695C71A1D1BAA3DF984C23BBFF0FAD017EF7774B65E83AF598D9860D466F43C938EC08CC83BC7B3B53E2F087D1A1CC6BC7CDB678B69A5EC360C898C702EE10889", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2019-07-28 23:00:00", + "valid_from": "2019-07-29 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -262,7 +464,7 @@ "public_exponent_hex": "10001", "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHEi00nB0kLOtFu00Vsolzqb7p\nblz3ShbXi/2VDPGP9YNCzWkHXouEZYT2RS2ZSKE1iowx6E8a2PG5bUTPjxu+MWYJ\nLUI1OxbXYm5ObmyiIp+vYJ7NOkqTJ7BI8H/j6z68I0L/PwS2TDUnuZZdOsIa47Ps\nEn44iGnWHJxM/4hnkQIDAQAB\n-----END PUBLIC KEY-----", "valid_from": "2000-01-01 00:00:00", - "valid_until": "2017-09-29 23:00:00" + "valid_until": "2017-09-30 00:00:00" }, { "is_private": false, @@ -271,7 +473,7 @@ "modulus_hex": "acd4b094f2b8d2ee89df368a384ae82279870060ae8c2e38bfaacc4f4054c60bac51c9957ea659f476b0ca66a1ccc7b01f9a4f1cad7dce95343a5e30ed48af4102b9e9b3c157fec86d274e4ecfd6e37563394f486e41721d45cd20efd7544383793605730e2183717704a64a1377b7c3644fec7041c0f4a90b09abcf545cf2df", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2017-09-30 23:00:00", + "valid_from": "2017-10-01 00:00:00", "valid_until": "1999-12-31 00:00:00" } ], @@ -285,6 +487,16 @@ "public_key_x509": null, "valid_from": "2020-03-27 00:00:00", "valid_until": "2999-12-31 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "PC", + "modulus_hex": "CDCDAAB2115B69374AA3DD2CC159DDD3CF77535F9C9DAFCD34712C0AAA3D4230BB87C468B67F063BFA7E3D6AF532B432A39680E4BA451CB40DCDBE9936399F8D95076E2E0F57CE03DBBCD7A09289F08FAE6D17504AE4E6C71B7AD3C348939540164D02E941FBC6AE7845DF408380D8F58A2A01F8E7EAF6814285FD544B4D6295", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-03-27 00:00:00", + "valid_until": "2999-12-31 00:00:00" } ], "PI": [ @@ -296,6 +508,16 @@ "public_exponent_hex": "10001", "public_key_x509": null, "valid_from": "2020-03-27 00:00:00", + "valid_until": "2024-04-01 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "PI", + "modulus_hex": "9D5416C2CAE7379EF3EAE5CFB586EA4092DBF75482517D2B9BF3514B7FBD68DA5A810109CA0E192DACF83E63CB38292E69A60F29B6DB474817CD34FE3658DF697CFCD8EB0E62816AD8C1EF61DD50689ED1EEE4493CA0786A475D33822FBDF6BC697FF68596533AF6F1CADE2CD486BCFE244AE98122D73A3B49A68F69B9B2618B", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-03-27 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -307,10 +529,22 @@ "modulus_hex": "DBDA8187974002344899D09544C8254F07AEC89546BAB847184D904DF23D31D844A6C700187F9355C898112AA53F4DCC3B9972BE9F485E0092AF10F2A6985A0D158089B52A7715BFB4679F8A9C788157A58D798B98A614364357A44A26558502BE0FBC98F854871606641749C0E2EC1284274981529D1A6BA9F53B13CE5DB2C1", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2017-05-31 23:00:00", + "valid_from": "2017-06-01 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], + "RD": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "RD", + "modulus_hex": "E41CD2D8CE7407B784DA2A63FFFC3AEB504AAF7D03D8A4FE81746BC47F98F700D78EE998B370E5F353AB5B1B55573A9C23BCB4A6C52E7FF61300C71D9DDED185574FAC3940A5D07C225A32DAFC299D167D8416500563A84B4470B8123D0F75F70B0039E1A073AE61A5CDE4F09CE03C230F788E02B7FA0463BEE58B9FEC4D924D", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-08-14 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], "RE": [ { "is_private": false, @@ -319,7 +553,19 @@ "modulus_hex": "e8e9a0caf393f7fce5bea9d7f64842acd82aa50ad69244899328801b56b0ebc0044010a30261ce312170df9c752c311f2bd07f7d5f46d61fbcc642c2cfa2dbf7c1fb806dd46dbd6cb32822ec738d8a3b2260bb864b657706eeb0196ba9fab150209f336f5e918818a7255c84a1726abd0254c019a0bdcf6da27449957d4cb877", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2019-06-10 23:00:00", + "valid_from": "2019-06-11 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "RF": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "RF", + "modulus_hex": "D1DE0E3B9E6832D5ACE878D99AB679643E371A558F4B2169FC7102D2E57987D8983CF4108E999285F0701925E9158446C3688CF9E6C1CC1A1AAC8B2E49FF717E05546C26F376933175DC433DCDB756194A0D66C48766A74CD09250548BACCE220FD38372270A6A9AB51F037AC72AAC2448241031751C32A61319728A1F537419", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-08-14 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -345,6 +591,42 @@ "valid_until": "2040-12-31 00:00:00" } ], + "RS": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "RS", + "modulus_hex": "ABBEDF44A65998EB2EA03DB595C059A0AA96711C2EC22544D57D1515F1B0EE7800B72E5B26C65B5F17768734FAE4E4C7B3B253C456F8B5710BF9354568D7211A283DF62CA7804658A3DC756107152C886E3C1DC3E90DBCF7CF55D4C288A714BB120EF5E8AE703E582578152CB4DF97DBE063FB5E56EC1435BC14292FD2B71F11", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2020-08-19 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "SA": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SA", + "modulus_hex": "BB7E788A30E565A428E07D7AA4E218B7601990F4AE11698960CC37027CD70F69B8F3D65E633DB35A5CADE4F470DF5392155CAFC1E34C317F0DD2D390300B6375715238691DB529184007B4CDBA4912B9F44E2E61A5367FE57D2EC5F810C2D286927BF00F8628712C1C3B0445753E0A66F9AFED8AC0C8E79A341C4DD80E45E0FB", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-11-27 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "SB": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SB", + "modulus_hex": "A19981496C95E1F4444DFA4F55CAA8887485A0F23D7DDC0320B1C652A42285C98A83B2350808D8F5649B167AD98702DCAC0973B6694C041BE0151B3E1A0FAACE72156FECE679F9760B9C71AADA4F4DA97659BA4B631B1961E6E1BFE2143CF221B65257E47EA0CB200F4BB8787B48A72676FD42937F80DEED284BFA3F617FD801", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-11-27 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], "SE": [ { "is_private": false, @@ -357,6 +639,78 @@ "valid_until": "2999-12-31 00:00:00" } ], + "SG": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SG", + "modulus_hex": "d2573ffbe67c09ba06dc98c55e3eebb062f63bf0fc89fa32cba42e06d8733aa863c777e75ea7a12bd7ca6c2d14616198a6db14e84ba7326e7d80f71e55d42d81aef32ad73aeb4183fc79eb648d24aa075a469cec498f5177c459e3c6f31e3ea830f954218d592987c00a93fdca5d5532348af2a8d7259be30467760178c76b99", + "public_exponent_hex": "010001", + "public_key_x509": null, + "valid_from": "2019-02-08 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "SH": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SH", + "modulus_hex": "B1AA4000F52ABB703FD945D0F39B318BE15044E6DC0D5A2B860CC932E4EE54C6EE0F3E25D649A4966E7A7E480279214ADAAE7C2E23DDA34A5B9EA8EDEA06E58CE69E85B395DD4B844899A8F1204F308F529D86107F5337269D3E2D31E662B9113FCD86033D4C550A45108BE061F507E342FFB251C5817D2FA205D6850CBA0755", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-11-08 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "SJ": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SJ", + "modulus_hex": "8BB3070C45BB72A0F12D2C6A2888CC9C61CEF0501669851322C2A7B0AAF9C3E47BA4C38A5DA498D0C6CD76339B445B4EDA0CB623EED70980ABBB9817D2A326605D1CDC7EA162279AC24F958B8848895517F1F56B64ED953FA6A8787C54E1CCC1FC67E306742983A6423EE55C13C25A041BF31AACA47AD64EA985E2C02AEB3425", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-01-18 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "SK": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SK", + "modulus_hex": "968F089FD85780A4213EE93F778BBBA71D6AA02FCAAC4F01BA92D678DB9D115FABCCAD45350DD06186193CDA17FADC8DAA52B52BA52DE3873BB8C199988648B58CC8D13C3F8C448A4F797512C657F577A2D545B957E16A20BD68B3F5877A6A129F1F82920C8231B9C04DAF55DE0506BA8DF57EA280EC19B6E29BF2DF1092F973", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-01-18 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "SL": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SL", + "modulus_hex": "9A0F91BB4AE10ECD98524B16F3CE945ED88CCAD3D10344B3D7C2137945249C9819F9E86B3AE9501302C649C49AF90471D20582C5F5D68A6990179B3C553BE5C85469D6DA05296083D6D653DFA52F012F73090E6B0C91E58B2CE9CE6566BADCE233143F1A00C9BB3E7057E9801A86E73A64D3469EDC11C775920BD79C0F5A7377", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-10-10 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], + "SM": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SM", + "modulus_hex": "97B06C1E6E48CDC46D9A9CB74514805BBFAF36ACE91218FE2BB78E37292307574F8ADEB220B2BF1CC83545CCE47A2D489A4B4F8EFAB5C763C3632D138CDB4AF21FA2F53A4BD3284A93C5460132A6444C685CB976551C715DEEFC29F03055A1BDF0719B57AC34AD148EC693EBE51C47664E5F2D3B93E4642B58A4561576DE2EF7", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-10-10 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], "SR": [ { "is_private": false, @@ -365,7 +719,7 @@ "modulus_hex": "d28b68816ee1e2f007d5f66276051ba3aa88e3c12798058e4f4959a75551a8459c1e30c9f777c19def531d40a7b6f584f443ded8255b2ab049200c8111fcb065c910838d5ecc78c3e12042b831044b0a14d01087cfbb56ccc2be5e88edc4b5d087097fb72d059d6c2d94e23eb6306b9f20be0ec769a7970ef603b820cd64c7f9", "public_exponent_hex": "010001", "public_key_x509": null, - "valid_from": "2017-07-31 23:00:00", + "valid_from": "2017-08-01 00:00:00", "valid_until": "2040-12-31 00:00:00" }, { @@ -375,7 +729,7 @@ "modulus_hex": "D28B68816EE1E2F007D5F66276051BA3AA88E3C12798058E4F4959A75551A8459C1E30C9F777C19DEF531D40A7B6F584F443DED8255B2AB049200C8111FCB065C910838D5ECC78C3E12042B831044B0A14D01087CFBB56CCC2BE5E88EDC4B5D087097FB72D059D6C2D94E23EB6306B9F20BE0EC769A7970EF603B820CD64C7F9", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2017-08-08 23:00:00", + "valid_from": "2017-08-09 00:00:00", "valid_until": "2999-12-31 00:00:00" }, { @@ -389,6 +743,58 @@ "valid_until": "2999-12-31 00:00:00" } ], + "SX": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "SX", + "modulus_hex": "ab5d2433c336644625bb298d3475083de5fa0293932b87a0f224a72bb2d91e982f7b6e82cd70ed26ce5a93eb07d1f750858891d4655188636f47067374dcee46eac2dd15a605ec862d4153bbe814ebb74ce74700292cd8e3bf48ba0d37bb8260d323b89f37a5db68bc4683d2073166ed58d4565602433ccc4cc5bf6c2dc773a7", + "public_exponent_hex": "010001", + "public_key_x509": null, + "valid_from": "2000-01-01 00:00:00", + "valid_until": "2019-04-30 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "SX", + "modulus_hex": "a5810402c4e92db93dd9e694ab900f2101ac7e2d798cf518118acdd6c2a8c6911b7d464c3a16fc2e5ed480414cd4538d696b901c1afa775b86af80c3261863f668c04c54bd79289f45997194261dc1e207898492ac6db87e812de76462b51bc5cd46c6b8812e418d86fbe706099cbff7e5b16861190e7380ce3536a76024e105", + "public_exponent_hex": "010001", + "public_key_x509": null, + "valid_from": "2018-11-13 00:00:00", + "valid_until": "2999-12-31 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "SX", + "modulus_hex": "DD40EF6DB5252AAD9F27FE7706127380F46893A6E126CF04A47D2A311A980448AE18632A4523DC2895250C4C42DF16A5A59F4C8AF21AA1BE39356F3D2C706C5EFC5351DFD3AD74C470F3BBDDD29F0711BA68B5EE22072BB4AB8E5BA11017962A1F02C28CCA4EA1F2FD177872DE04DD38D0DBE2FC0ACFD3D85D0BF1BD29293421", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2021-02-05 00:00:00", + "valid_until": "2024-04-30 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "SX", + "modulus_hex": "E25DFAFF1F4E43A6BF0441304F4A8DB8E8352ED0CF69DC5E4B6ED748138E21917D79EBE329064313B685DFCBB89F955DFFC85041035FC8F59B7C4644F74BB09641ED46D453AA23D1CEF80079F3B7428555A07BD74169E1C137F3AD958412A091D5882F0C25F7A3520DD53C08599FCC5400920E58AFB124401F83D6858BF85E95", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2023-01-16 00:00:00", + "valid_until": "2025-08-01 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "SX", + "modulus_hex": "D65977DE9C5C3BFD570AC0DDF328699E33CDFAFC5ABFE9CB282ABE79E8C79FA17D0F3A5FC9415DCA9C86F0C95507D409CF2553DD25384BF313B0BA6153730C965C657424F0642CCFBF679477F92972170EB08E4A36DA3819DFA5F6633CCD4342C04C34080F2E8F5FB361BA03AD913545D88A8CF865B9A5594C22853E9C724C63", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2024-09-09 00:00:00", + "valid_until": "2999-12-31 00:00:00" + } + ], "T2": [ { "is_private": false, @@ -409,7 +815,7 @@ "modulus_hex": "BA2ADC5EB09EC28D42E9247B3120EF46245C14F815EE6B4BA87A657060EA556A409FA1FC76435CA4E65A293A9E034AAB5262BBF8F0A257C775196AB94E2E1CBA56B2B83B9D930EDA9B8F9766B484468E872761036531AF8DE0E6962B9F0AAE655C5C2786404FA0D395BD0C65E301ED1EC6B1285DB638BD08A2B601AF09A00301", "public_exponent_hex": "010001", "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6KtxesJ7CjULpJHsxIO9GJFwU\n+BXua0uoemVwYOpVakCfofx2Q1yk5lopOp4DSqtSYrv48KJXx3UZarlOLhy6VrK4\nO52TDtqbj5dmtIRGjocnYQNlMa+N4OaWK58KrmVcXCeGQE+g05W9DGXjAe0exrEo\nXbY4vQiitgGvCaADAQIDAQAB\n-----END PUBLIC KEY-----", - "valid_from": "2016-06-30 23:00:00", + "valid_from": "2016-07-01 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], @@ -425,17 +831,19 @@ "valid_until": "2040-12-12 00:00:00" } ], - "TT": [ + "TS": [ { "is_private": false, - "is_test": false, - "issuer_id": "TT", - "modulus_hex": "9774021C2BAD13DC31C1EC8192E084D60D82DC327016862E95ED093AD41CC9082A6015631C8E6B8148A15EC9856E2A5E16519E52EDC0C3DF2836935055EF53E1738293256464F0AD4AE3C01AE3CDD910CB1CBDC0AB35C1AD8CF0A9376B3921DEE3D1FC26FFA3409C4DC8F813A5E326D78C63ABA9A59120D74043DBA1141047AF", + "is_test": true, + "issuer_id": "TS", + "modulus_hex": "E0D7C16E551DEA846011C9D95186DCAA8468F58FF008D8704EF76D9A26302F54F832112C8A1116B1EFE3E1789F4D77CB29831A44941C16CFD45B45297CBEDED9988C0470C037396861887DB8A5F8FC393F6DD760216904845B858DE6DC04416000DD38B4DD0ADF844F77B41F9F0A181B6B31906F202C0A592D0385AEE7DB3C01", "public_exponent_hex": "10001", - "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCXdAIcK60T3DHB7IGS4ITWDYLc\nMnAWhi6V7Qk61BzJCCpgFWMcjmuBSKFeyYVuKl4WUZ5S7cDD3yg2k1BV71Phc4KT\nJWRk8K1K48Aa483ZEMscvcCrNcGtjPCpN2s5Id7j0fwm/6NAnE3I+BOl4ybXjGOr\nqaWRINdAQ9uhFBBHrwIDAQAB\n-----END PUBLIC KEY-----", - "valid_from": "2010-01-01 00:00:00", - "valid_until": "2040-12-31 00:00:00" - }, + "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDg18FuVR3qhGARydlRhtyqhGj1\nj/AI2HBO922aJjAvVPgyESyKERax7+PheJ9Nd8spgxpElBwWz9RbRSl8vt7ZmIwE\ncMA3OWhhiH24pfj8OT9t12AhaQSEW4WN5twEQWAA3Ti03QrfhE93tB+fChgbazGQ\nbyAsClktA4Wu59s8AQIDAQAB\n-----END PUBLIC KEY-----", + "valid_from": "2016-07-01 00:00:00", + "valid_until": "2049-12-31 00:00:00" + } + ], + "TT": [ { "is_private": false, "is_test": true, @@ -445,6 +853,16 @@ "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDI11xTD3lqiT/C/s4q4gN6gVUC\nz7MsLAzyX+D+3eWNXdqG/2c8F7wScjM9TT0U56ceyvBUpt6AiWjN70DLGl+viuJI\n5GSXYR+UisuxKZbDj7IvlCfY2TKxH3iVjlPvknXq7SFTxBEZLPi8gE33eEvgfvaO\n0Gc4wjj5as6l73QMNQIDAQAB\n-----END PUBLIC KEY-----", "valid_from": "2009-01-01 00:00:00", "valid_until": "2040-12-31 00:00:00" + }, + { + "is_private": false, + "is_test": false, + "issuer_id": "TT", + "modulus_hex": "9774021C2BAD13DC31C1EC8192E084D60D82DC327016862E95ED093AD41CC9082A6015631C8E6B8148A15EC9856E2A5E16519E52EDC0C3DF2836935055EF53E1738293256464F0AD4AE3C01AE3CDD910CB1CBDC0AB35C1AD8CF0A9376B3921DEE3D1FC26FFA3409C4DC8F813A5E326D78C63ABA9A59120D74043DBA1141047AF", + "public_exponent_hex": "10001", + "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCXdAIcK60T3DHB7IGS4ITWDYLc\nMnAWhi6V7Qk61BzJCCpgFWMcjmuBSKFeyYVuKl4WUZ5S7cDD3yg2k1BV71Phc4KT\nJWRk8K1K48Aa483ZEMscvcCrNcGtjPCpN2s5Id7j0fwm/6NAnE3I+BOl4ybXjGOr\nqaWRINdAQ9uhFBBHrwIDAQAB\n-----END PUBLIC KEY-----", + "valid_from": "2010-01-01 00:00:00", + "valid_until": "2040-12-31 00:00:00" } ], "TV": [ @@ -455,7 +873,7 @@ "modulus_hex": "B77951EF77B2CFF362008609B20BA37408D8E412CA6B3ACB36242C7C929F707B5905BE779020A84CA2055FE4B3BAAD455A9B865290D36C2C0B982F79A8D875C7E2BEFB1954B95E9B1D5830DAE53899517D8A631442A5E8F94C1567B1A205458BF980BB3CBD290451915AF9A0A500D65D174BF25AA7EDED8502C6FA7E5AD48777", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2018-05-21 23:00:00", + "valid_from": "2018-05-22 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], @@ -467,7 +885,7 @@ "modulus_hex": "B694677D39F4E3442E336894984E3A5B6B784BA5C55DA738F9883F217F5A54E2FD96E67C2C67B2E652CCC745927A42081B7DD56FEA960A366E3D2DF9FBE6EC7F02951ACA79484AA89454ECFC935D652C668DE0E41DEDE3A9EC838C6C4E46F185557BEE0E863A40CB905D4B98780C15E49A2FBF5DB7EF95ED44A5D73BFE08CDBB", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2022-07-07 23:00:00", + "valid_from": "2022-07-08 00:00:00", "valid_until": "2999-12-31 00:00:00" } ], @@ -479,7 +897,7 @@ "modulus_hex": "CE893969CE6C4D53484D240F3810D5B3481E2BE2F342B91B436DA63613FCC741BCF7CC63F127B0AC59291779F78A7261796162A2993D78230B0E29F3FE90C79AD0CCE2D3D820FD80E4CEF665A898AE847D25E428890CB081E8030F5661DC1554EEB8253A91066CB8A6C3C065F28781D7DEC9026337891A3B3A25DB58835462DD", "public_exponent_hex": "10001", "public_key_x509": null, - "valid_from": "2015-09-30 23:00:00", + "valid_from": "2015-10-01 00:00:00", "valid_until": "2015-12-12 00:00:00" }, { @@ -503,6 +921,18 @@ "valid_until": "2040-12-12 00:00:00" } ], + "VT": [ + { + "is_private": false, + "is_test": true, + "issuer_id": "VT", + "modulus_hex": "9DE443DAF910DC8C78A11F6EC4035949134711A1D1383D4581D0D08A33ED2D19DC8B2C0E36D8950C5472B15E3F8DF0B0C5D34E8F679B556CB1205FAE8DB02132371A2A76A641867ECF39EBC491ADEF81967B2C7CF676B2B8FD251B7158543EB4C5EF9B60463BFF6B3EA986BB64BE9E26866B3D47779B974035A0928EC2A473EB", + "public_exponent_hex": "010001", + "public_key_x509": null, + "valid_from": "2017-09-01 00:00:00", + "valid_until": "2018-12-31 00:00:00" + } + ], "YO": [ { "is_private": false, @@ -522,11 +952,35 @@ "issuer_id": "ZE", "modulus_hex": "ACC795572F2E99B99EF68480B41122C0ED99B7C3A01D9C6BCDCBA5BE70CD8F0FDB7BDA8C9D8B32C09C40812ACB03BDBCB45861EE56AC76DD86190020DFA3E406F5B2778A42E9909D2C3D276A8A6A18E6880073B40B9E03E814A57A9FFAF225FB3C747F33DFDDE93166A8D1E6A74BADB33AA3EEA36BE6F509D60CFDE4B882EEE7", "public_exponent_hex": "23", - "public_key_x509": "-----BEGIN PUBLIC KEY-----\nMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCsx5VXLy6ZuZ72hIC0ESLA7Zm3\nw6AdnGvNy6W+cM2PD9t72oydizLAnECBKssDvby0WGHuVqx23YYZACDfo+QG9bJ3\nikLpkJ0sPSdqimoY5ogAc7QLngPoFKV6n/ryJfs8dH8z393pMWao0eanS62zOqPu\no2vm9QnWDP3kuILu5wIBIw==\n-----END PUBLIC KEY-----", + "public_key_x509": null, "valid_from": "2013-01-01 00:00:00", "valid_until": "2040-12-31 00:00:00" } ], + "ZF": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "ZF", + "modulus_hex": "C2F8A759EB16BA2B77E3496E0E9D12F29D3238B05F25934C7E8069C4266E3BF1289A49BA5C29833A45013FCC0EBBC8154947F74558046CBEBE62C167411DFBE60F19884EC2E2C9023A2DE250BAD3350B274CFE057E09DA728F50085D412DA989F71313607B39B6D1BBF4896A46B4E178760E24CFBF1A30C1CDC820B80DB6C1E7", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2019-01-01 00:00:00", + "valid_until": "2040-12-31 00:00:00" + } + ], + "ZH": [ + { + "is_private": false, + "is_test": false, + "issuer_id": "ZH", + "modulus_hex": "C9DCB9745B09B76454C47D83BBE61CA8B9F3ED0CCAD0CBD093203D99C144F0AD5EBA593235AFDC964513DD041E9CFC8EB8AF26371BC9B34726222FB3F11E18059684754015BE635A134A886BFF2A89067B8AC7B6907AE87DCF877F007D9959098AD82EA4BCA9DF035A3837AA5C1E4728288AD3DB73E31DF31536448E173435DD", + "public_exponent_hex": "10001", + "public_key_x509": null, + "valid_from": "2018-01-01 00:00:00", + "valid_until": "2040-12-31 00:00:00" + } + ], "ZS": [ { "is_private": false, diff --git a/pkg/package.json b/pkg/package.json index bde5958..a1189c9 100644 --- a/pkg/package.json +++ b/pkg/package.json @@ -1,13 +1,26 @@ { "name": "rsp6-decoder", + "type": "module", + "collaborators": [ + "eta " + ], + "description": "Decode UK National Rail mobile tickets in RSP6 format.", "version": "0.1.0", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://git.eta.st/eta/rsp6-decoder" + }, "files": [ "rsp6_decoder_bg.wasm", "rsp6_decoder.js", "rsp6_decoder_bg.js", "rsp6_decoder.d.ts" ], - "module": "rsp6_decoder.js", + "main": "rsp6_decoder.js", "types": "rsp6_decoder.d.ts", - "sideEffects": false + "sideEffects": [ + "./rsp6_decoder.js", + "./snippets/*" + ] } \ No newline at end of file diff --git a/pkg/rsp6_decoder.d.ts b/pkg/rsp6_decoder.d.ts index b371112..27cadaa 100644 --- a/pkg/rsp6_decoder.d.ts +++ b/pkg/rsp6_decoder.d.ts @@ -1,10 +1,4 @@ /* tslint:disable */ /* eslint-disable */ -/** -*/ export function init(): void; -/** -* @param {string} ticket -* @returns {any} -*/ export function decode_ticket(ticket: string): any; diff --git a/pkg/rsp6_decoder.js b/pkg/rsp6_decoder.js index 9b195b7..2f7ac9c 100644 --- a/pkg/rsp6_decoder.js +++ b/pkg/rsp6_decoder.js @@ -1,2 +1,4 @@ import * as wasm from "./rsp6_decoder_bg.wasm"; -export * from "./rsp6_decoder_bg.js"; \ No newline at end of file +export * from "./rsp6_decoder_bg.js"; +import { __wbg_set_wasm } from "./rsp6_decoder_bg.js"; +__wbg_set_wasm(wasm); \ No newline at end of file diff --git a/pkg/rsp6_decoder_bg.js b/pkg/rsp6_decoder_bg.js index 302e269..adc4f3f 100644 --- a/pkg/rsp6_decoder_bg.js +++ b/pkg/rsp6_decoder_bg.js @@ -1,60 +1,26 @@ -import * as wasm from './rsp6_decoder_bg.wasm'; - -const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder; - -let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true }); - -cachedTextDecoder.decode(); - -let cachedUint8Memory0 = new Uint8Array(); - -function getUint8Memory0() { - if (cachedUint8Memory0.byteLength === 0) { - cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer); - } - return cachedUint8Memory0; +let wasm; +export function __wbg_set_wasm(val) { + wasm = val; } -function getStringFromWasm0(ptr, len) { - return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); -} -const heap = new Array(32).fill(undefined); +const heap = new Array(128).fill(undefined); heap.push(undefined, null, true, false); -let heap_next = heap.length; - -function addHeapObject(obj) { - if (heap_next === heap.length) heap.push(heap.length + 1); - const idx = heap_next; - heap_next = heap[idx]; - - heap[idx] = obj; - return idx; -} - function getObject(idx) { return heap[idx]; } -function dropObject(idx) { - if (idx < 36) return; - heap[idx] = heap_next; - heap_next = idx; -} - -function takeObject(idx) { - const ret = getObject(idx); - dropObject(idx); - return ret; -} -/** -*/ -export function init() { - wasm.init(); -} - let WASM_VECTOR_LEN = 0; +let cachedUint8ArrayMemory0 = null; + +function getUint8ArrayMemory0() { + if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) { + cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer); + } + return cachedUint8ArrayMemory0; +} + const lTextEncoder = typeof TextEncoder === 'undefined' ? (0, module.require)('util').TextEncoder : TextEncoder; let cachedTextEncoder = new lTextEncoder('utf-8'); @@ -76,16 +42,16 @@ function passStringToWasm0(arg, malloc, realloc) { if (realloc === undefined) { const buf = cachedTextEncoder.encode(arg); - const ptr = malloc(buf.length); - getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf); + const ptr = malloc(buf.length, 1) >>> 0; + getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf); WASM_VECTOR_LEN = buf.length; return ptr; } let len = arg.length; - let ptr = malloc(len); + let ptr = malloc(len, 1) >>> 0; - const mem = getUint8Memory0(); + const mem = getUint8ArrayMemory0(); let offset = 0; @@ -99,45 +65,47 @@ function passStringToWasm0(arg, malloc, realloc) { if (offset !== 0) { arg = arg.slice(offset); } - ptr = realloc(ptr, len, len = offset + arg.length * 3); - const view = getUint8Memory0().subarray(ptr + offset, ptr + len); + ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0; + const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len); const ret = encodeString(arg, view); offset += ret.written; + ptr = realloc(ptr, len, offset, 1) >>> 0; } WASM_VECTOR_LEN = offset; return ptr; } -let cachedInt32Memory0 = new Int32Array(); +let cachedDataViewMemory0 = null; -function getInt32Memory0() { - if (cachedInt32Memory0.byteLength === 0) { - cachedInt32Memory0 = new Int32Array(wasm.memory.buffer); +function getDataViewMemory0() { + if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) { + cachedDataViewMemory0 = new DataView(wasm.memory.buffer); } - return cachedInt32Memory0; + return cachedDataViewMemory0; } -/** -* @param {string} ticket -* @returns {any} -*/ -export function decode_ticket(ticket) { - try { - const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); - const ptr0 = passStringToWasm0(ticket, wasm.__wbindgen_malloc, undefined); - const len0 = WASM_VECTOR_LEN; - wasm.decode_ticket(retptr, ptr0, len0); - var r0 = getInt32Memory0()[retptr / 4 + 0]; - var r1 = getInt32Memory0()[retptr / 4 + 1]; - var r2 = getInt32Memory0()[retptr / 4 + 2]; - if (r2) { - throw takeObject(r1); - } - return takeObject(r0); - } finally { - wasm.__wbindgen_add_to_stack_pointer(16); - } + +const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder; + +let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true }); + +cachedTextDecoder.decode(); + +function getStringFromWasm0(ptr, len) { + ptr = ptr >>> 0; + return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len)); +} + +let heap_next = heap.length; + +function addHeapObject(obj) { + if (heap_next === heap.length) heap.push(heap.length + 1); + const idx = heap_next; + heap_next = heap[idx]; + + heap[idx] = obj; + return idx; } function handleError(f, args) { @@ -148,13 +116,103 @@ function handleError(f, args) { } } -export function __wbindgen_string_new(arg0, arg1) { - const ret = getStringFromWasm0(arg0, arg1); +function dropObject(idx) { + if (idx < 132) return; + heap[idx] = heap_next; + heap_next = idx; +} + +function takeObject(idx) { + const ret = getObject(idx); + dropObject(idx); + return ret; +} + +export function init() { + wasm.init(); +} + +/** + * @param {string} ticket + * @returns {any} + */ +export function decode_ticket(ticket) { + try { + const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); + // NOTE(eta): replaced realloc with undefined to match previous hacks; without this it breaks weirdly + const ptr0 = passStringToWasm0(ticket, wasm.__wbindgen_malloc, undefined); + const len0 = WASM_VECTOR_LEN; + wasm.decode_ticket(retptr, ptr0, len0); + var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true); + var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true); + var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true); + if (r2) { + throw takeObject(r1); + } + return takeObject(r0); + } finally { + wasm.__wbindgen_add_to_stack_pointer(16); + } +} + +export function __wbg_String_8f0eb39a4a4c2f66(arg0, arg1) { + const ret = String(getObject(arg1)); + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); +}; + +export function __wbg_error_7534b8e9a36f1ab4(arg0, arg1) { + let deferred0_0; + let deferred0_1; + try { + deferred0_0 = arg0; + deferred0_1 = arg1; + console.error(getStringFromWasm0(arg0, arg1)); + } finally { + wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); + } +}; + +export function __wbg_fromCodePoint_aa6978f3501dff6f() { return handleError(function (arg0) { + const ret = String.fromCodePoint(arg0 >>> 0); + return addHeapObject(ret); +}, arguments) }; + +export function __wbg_log_b4553193e78bb554(arg0, arg1) { + console.log(getStringFromWasm0(arg0, arg1)); +}; + +export function __wbg_new_4d633ef144d63fc8() { + const ret = new Object(); return addHeapObject(ret); }; -export function __wbindgen_object_drop_ref(arg0) { - takeObject(arg0); +export function __wbg_new_70746da30d76ff97() { + const ret = new Array(); + return addHeapObject(ret); +}; + +export function __wbg_new_8a6f238a6ece86ea() { + const ret = new Error(); + return addHeapObject(ret); +}; + +export function __wbg_set_000638896bde6661(arg0, arg1, arg2) { + getObject(arg0)[arg1 >>> 0] = takeObject(arg2); +}; + +export function __wbg_set_3f1d0b984ed272ed(arg0, arg1, arg2) { + getObject(arg0)[takeObject(arg1)] = takeObject(arg2); +}; + +export function __wbg_stack_0ed75d68575b0f3c(arg0, arg1) { + const ret = getObject(arg1).stack; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); }; export function __wbindgen_error_new(arg0, arg1) { @@ -162,10 +220,6 @@ export function __wbindgen_error_new(arg0, arg1) { return addHeapObject(ret); }; -export function __wbg_log_bd37ca95009d00f6(arg0, arg1) { - console.log(getStringFromWasm0(arg0, arg1)); -}; - export function __wbindgen_number_new(arg0) { const ret = arg0; return addHeapObject(ret); @@ -176,58 +230,15 @@ export function __wbindgen_object_clone_ref(arg0) { return addHeapObject(ret); }; -export function __wbg_String_91fba7ded13ba54c(arg0, arg1) { - const ret = String(getObject(arg1)); - const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; +export function __wbindgen_object_drop_ref(arg0) { + takeObject(arg0); }; -export function __wbg_set_20cbc34131e76824(arg0, arg1, arg2) { - getObject(arg0)[takeObject(arg1)] = takeObject(arg2); -}; - -export function __wbg_new_1d9a920c6bfc44a8() { - const ret = new Array(); +export function __wbindgen_string_new(arg0, arg1) { + const ret = getStringFromWasm0(arg0, arg1); return addHeapObject(ret); }; -export function __wbg_new_0b9bfdd97583284e() { - const ret = new Object(); - return addHeapObject(ret); -}; - -export function __wbg_set_a68214f35c417fa9(arg0, arg1, arg2) { - getObject(arg0)[arg1 >>> 0] = takeObject(arg2); -}; - -export function __wbg_fromCodePoint_3a5b15ba4d213634() { return handleError(function (arg0) { - const ret = String.fromCodePoint(arg0 >>> 0); - return addHeapObject(ret); -}, arguments) }; - -export function __wbg_new_abda76e883ba8a5f() { - const ret = new Error(); - return addHeapObject(ret); -}; - -export function __wbg_stack_658279fe44541cf6(arg0, arg1) { - const ret = getObject(arg1).stack; - const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; -}; - -export function __wbg_error_f851667af71bcfc6(arg0, arg1) { - try { - console.error(getStringFromWasm0(arg0, arg1)); - } finally { - wasm.__wbindgen_free(arg0, arg1); - } -}; - export function __wbindgen_throw(arg0, arg1) { throw new Error(getStringFromWasm0(arg0, arg1)); }; diff --git a/pkg/rsp6_decoder_bg.wasm b/pkg/rsp6_decoder_bg.wasm index 0d5b3d9..38f123a 100644 Binary files a/pkg/rsp6_decoder_bg.wasm and b/pkg/rsp6_decoder_bg.wasm differ diff --git a/pkg/rsp6_decoder_bg.wasm.d.ts b/pkg/rsp6_decoder_bg.wasm.d.ts index 6eda57e..7476d87 100644 --- a/pkg/rsp6_decoder_bg.wasm.d.ts +++ b/pkg/rsp6_decoder_bg.wasm.d.ts @@ -1,10 +1,10 @@ /* tslint:disable */ /* eslint-disable */ export const memory: WebAssembly.Memory; -export function decode_ticket(a: number, b: number, c: number): void; -export function init(): void; -export function __wbindgen_add_to_stack_pointer(a: number): number; -export function __wbindgen_malloc(a: number): number; -export function __wbindgen_realloc(a: number, b: number, c: number): number; -export function __wbindgen_exn_store(a: number): void; -export function __wbindgen_free(a: number, b: number): void; +export const init: () => void; +export const decode_ticket: (a: number, b: number, c: number) => void; +export const __wbindgen_malloc: (a: number, b: number) => number; +export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; +export const __wbindgen_free: (a: number, b: number, c: number) => void; +export const __wbindgen_exn_store: (a: number) => void; +export const __wbindgen_add_to_stack_pointer: (a: number) => number;