-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bring over RSA-PSS validators for WASM from #653
- Loading branch information
1 parent
3410c19
commit 2688f3d
Showing
8 changed files
with
187 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,4 +13,4 @@ | |
|
|
||
| mod ecdsa_validator; | ||
| mod ed25519_validator; | ||
| // mod rsa_validator; | ||
| mod rsa_validator; | ||
83 changes: 83 additions & 0 deletions
83
internal/crypto/src/tests/webcrypto/validators/rsa_validator.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| // Copyright 2022 Adobe. All rights reserved. | ||
| // This file is licensed to you under the Apache License, | ||
| // Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) | ||
| // or the MIT license (http://opensource.org/licenses/MIT), | ||
| // at your option. | ||
|
|
||
| // Unless required by applicable law or agreed to in writing, | ||
| // this software is distributed on an "AS IS" BASIS, WITHOUT | ||
| // WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or | ||
| // implied. See the LICENSE-MIT and LICENSE-APACHE files for the | ||
| // specific language governing permissions and limitations under | ||
| // each license. | ||
|
|
||
| use wasm_bindgen_test::wasm_bindgen_test; | ||
|
|
||
| use crate::{ | ||
| raw_signature::{RawSignatureValidationError, RawSignatureValidator}, | ||
| webcrypto::validators::RsaValidator, | ||
| }; | ||
|
|
||
| const SAMPLE_DATA: &[u8] = b"some sample content to sign"; | ||
|
|
||
| #[wasm_bindgen_test] | ||
| fn ps256() { | ||
| let signature = include_bytes!("../../fixtures/raw_signature/ps256.raw_sig"); | ||
| let pub_key = include_bytes!("../../fixtures/raw_signature/ps256.pub_key"); | ||
|
|
||
| RsaValidator::Ps256 | ||
| .validate(signature, SAMPLE_DATA, pub_key) | ||
| .unwrap(); | ||
| } | ||
|
|
||
| #[wasm_bindgen_test] | ||
| fn ps256_bad_signature() { | ||
| let mut signature = include_bytes!("../../fixtures/raw_signature/ps256.raw_sig").to_vec(); | ||
| assert_ne!(signature[10], 10); | ||
| signature[10] = 10; | ||
|
|
||
| let pub_key = include_bytes!("../../fixtures/raw_signature/ps256.pub_key"); | ||
|
|
||
| assert_eq!( | ||
| RsaValidator::Ps256 | ||
| .validate(&signature, SAMPLE_DATA, pub_key) | ||
| .unwrap_err(), | ||
| RawSignatureValidationError::SignatureMismatch | ||
| ); | ||
| } | ||
|
|
||
| #[wasm_bindgen_test] | ||
| fn ps256_bad_data() { | ||
| let signature = include_bytes!("../../fixtures/raw_signature/ps256.raw_sig"); | ||
| let pub_key = include_bytes!("../../fixtures/raw_signature/ps256.pub_key"); | ||
|
|
||
| let mut data = SAMPLE_DATA.to_vec(); | ||
| data[10] = 0; | ||
|
|
||
| assert_eq!( | ||
| RsaValidator::Ps256 | ||
| .validate(signature, &data, pub_key) | ||
| .unwrap_err(), | ||
| RawSignatureValidationError::SignatureMismatch | ||
| ); | ||
| } | ||
|
|
||
| #[wasm_bindgen_test] | ||
| fn ps384() { | ||
| let signature = include_bytes!("../../fixtures/raw_signature/ps384.raw_sig"); | ||
| let pub_key = include_bytes!("../../fixtures/raw_signature/ps384.pub_key"); | ||
|
|
||
| RsaValidator::Ps384 | ||
| .validate(signature, SAMPLE_DATA, pub_key) | ||
| .unwrap(); | ||
| } | ||
|
|
||
| #[wasm_bindgen_test] | ||
| fn ps512() { | ||
| let signature = include_bytes!("../../fixtures/raw_signature/ps512.raw_sig"); | ||
| let pub_key = include_bytes!("../../fixtures/raw_signature/ps512.pub_key"); | ||
|
|
||
| RsaValidator::Ps512 | ||
| .validate(signature, SAMPLE_DATA, pub_key) | ||
| .unwrap(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright 2024 Adobe. All rights reserved. | ||
| // This file is licensed to you under the Apache License, | ||
| // Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) | ||
| // or the MIT license (http://opensource.org/licenses/MIT), | ||
| // at your option. | ||
|
|
||
| // Unless required by applicable law or agreed to in writing, | ||
| // this software is distributed on an "AS IS" BASIS, WITHOUT | ||
| // WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or | ||
| // implied. See the LICENSE-MIT and LICENSE-APACHE files for the | ||
| // specific language governing permissions and limitations under | ||
| // each license. | ||
|
|
||
| use rsa::{ | ||
| pss::Signature, | ||
| sha2::{Sha256, Sha384, Sha512}, | ||
| signature::Verifier, | ||
| BigUint, RsaPublicKey, | ||
| }; | ||
| use spki::SubjectPublicKeyInfoRef; | ||
| use x509_parser::der_parser::ber::{parse_ber_sequence, BerObject}; | ||
|
|
||
| use crate::raw_signature::{RawSignatureValidationError, RawSignatureValidator}; | ||
|
|
||
| /// An `RsaValidator` can validate raw signatures with one of the RSA-PSS | ||
| /// signature algorithms. | ||
| #[non_exhaustive] | ||
| pub enum RsaValidator { | ||
| /// RSASSA-PSS using SHA-256 and MGF1 with SHA-256 | ||
| Ps256, | ||
|
|
||
| /// RSASSA-PSS using SHA-384 and MGF1 with SHA-384 | ||
| Ps384, | ||
|
|
||
| /// RSASSA-PSS using SHA-512 and MGF1 with SHA-512 | ||
| Ps512, | ||
| } | ||
|
|
||
| impl RawSignatureValidator for RsaValidator { | ||
| fn validate( | ||
| &self, | ||
| sig: &[u8], | ||
| data: &[u8], | ||
| public_key: &[u8], | ||
| ) -> Result<(), RawSignatureValidationError> { | ||
| let signature: Signature = sig | ||
| .try_into() | ||
| .map_err(|_| RawSignatureValidationError::InvalidSignature)?; | ||
|
|
||
| let spki = SubjectPublicKeyInfoRef::try_from(public_key) | ||
| .map_err(|_| RawSignatureValidationError::InvalidPublicKey)?; | ||
|
|
||
| let (_, seq) = parse_ber_sequence(&spki.subject_public_key.raw_bytes()) | ||
| .map_err(|_| RawSignatureValidationError::InvalidPublicKey)?; | ||
|
|
||
| let modulus = biguint_val(&seq[0]); | ||
| let exp = biguint_val(&seq[1]); | ||
|
|
||
| let public_key = RsaPublicKey::new(modulus, exp) | ||
| .map_err(|_| RawSignatureValidationError::InvalidPublicKey)?; | ||
|
|
||
| let result = match self { | ||
| Self::Ps256 => { | ||
| let vk = rsa::pss::VerifyingKey::<Sha256>::new(public_key); | ||
| vk.verify(&data, &signature) | ||
| } | ||
| Self::Ps384 => { | ||
| let vk = rsa::pss::VerifyingKey::<Sha384>::new(public_key); | ||
| vk.verify(&data, &signature) | ||
| } | ||
| Self::Ps512 => { | ||
| let vk = rsa::pss::VerifyingKey::<Sha512>::new(public_key); | ||
| vk.verify(&data, &signature) | ||
| } | ||
| }; | ||
|
|
||
| result.map_err(|_| RawSignatureValidationError::SignatureMismatch) | ||
| } | ||
| } | ||
|
|
||
| fn biguint_val(ber_object: &BerObject) -> BigUint { | ||
| ber_object | ||
| .as_biguint() | ||
| .map(|x| x.to_u32_digits()) | ||
| .map(rsa::BigUint::new) | ||
| .unwrap_or_default() | ||
| } |