Skip to content

Commit 759b9f8

Browse files
skmcgrailskmcgrail
committed
Enabled a few more capabilities
1 parent 71a9ac9 commit 759b9f8

File tree

13 files changed

+305
-106
lines changed

13 files changed

+305
-106
lines changed

‎openssl/src/bn.rs

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,15 @@ use crate::{cvt, cvt_n, cvt_p, LenType};
3737
use openssl_macros::corresponds;
3838

3939
cfg_if! {
40-
if #[cfg(any(ossl110, libressl350))] {
40+
if #[cfg(any(ossl110, libressl350, awslc))] {
4141
use ffi::{
42-
BN_get_rfc2409_prime_1024, BN_get_rfc2409_prime_768, BN_get_rfc3526_prime_1536,
43-
BN_get_rfc3526_prime_2048, BN_get_rfc3526_prime_3072, BN_get_rfc3526_prime_4096,
42+
BN_get_rfc3526_prime_1536, BN_get_rfc3526_prime_2048, BN_get_rfc3526_prime_3072, BN_get_rfc3526_prime_4096,
4443
BN_get_rfc3526_prime_6144, BN_get_rfc3526_prime_8192, BN_is_negative,
4544
};
46-
} else if #[cfg(any(boringssl, awslc))] {
45+
} else if #[cfg(boringssl)] {
4746
use ffi::BN_is_negative;
4847
} else {
4948
use ffi::{
50-
get_rfc2409_prime_1024 as BN_get_rfc2409_prime_1024,
51-
get_rfc2409_prime_768 as BN_get_rfc2409_prime_768,
5249
get_rfc3526_prime_1536 as BN_get_rfc3526_prime_1536,
5350
get_rfc3526_prime_2048 as BN_get_rfc3526_prime_2048,
5451
get_rfc3526_prime_3072 as BN_get_rfc3526_prime_3072,
@@ -64,6 +61,19 @@ cfg_if! {
6461
}
6562
}
6663

64+
cfg_if! {
65+
if #[cfg(any(ossl110, libressl350))] {
66+
use ffi::{
67+
BN_get_rfc2409_prime_1024, BN_get_rfc2409_prime_768
68+
};
69+
} else if #[cfg(not(any(boringssl, awslc)))] {
70+
use ffi::{
71+
get_rfc2409_prime_1024 as BN_get_rfc2409_prime_1024,
72+
get_rfc2409_prime_768 as BN_get_rfc2409_prime_768,
73+
};
74+
}
75+
}
76+
6777
/// Options for the most significant bits of a randomly generated `BigNum`.
6878
pub struct MsbOption(c_int);
6979

@@ -1014,7 +1024,7 @@ impl BigNum {
10141024
///
10151025
/// [`RFC 3526`]: https://tools.ietf.org/html/rfc3526#page-3
10161026
#[corresponds(BN_get_rfc3526_prime_1536)]
1017-
#[cfg(not(any(boringssl, awslc)))]
1027+
#[cfg(not(boringssl))]
10181028
pub fn get_rfc3526_prime_1536() -> Result<BigNum, ErrorStack> {
10191029
unsafe {
10201030
ffi::init();
@@ -1028,7 +1038,7 @@ impl BigNum {
10281038
///
10291039
/// [`RFC 3526`]: https://tools.ietf.org/html/rfc3526#page-3
10301040
#[corresponds(BN_get_rfc3526_prime_2048)]
1031-
#[cfg(not(any(boringssl, awslc)))]
1041+
#[cfg(not(boringssl))]
10321042
pub fn get_rfc3526_prime_2048() -> Result<BigNum, ErrorStack> {
10331043
unsafe {
10341044
ffi::init();
@@ -1042,7 +1052,7 @@ impl BigNum {
10421052
///
10431053
/// [`RFC 3526`]: https://tools.ietf.org/html/rfc3526#page-4
10441054
#[corresponds(BN_get_rfc3526_prime_3072)]
1045-
#[cfg(not(any(boringssl, awslc)))]
1055+
#[cfg(not(boringssl))]
10461056
pub fn get_rfc3526_prime_3072() -> Result<BigNum, ErrorStack> {
10471057
unsafe {
10481058
ffi::init();
@@ -1056,7 +1066,7 @@ impl BigNum {
10561066
///
10571067
/// [`RFC 3526`]: https://tools.ietf.org/html/rfc3526#page-4
10581068
#[corresponds(BN_get_rfc3526_prime_4096)]
1059-
#[cfg(not(any(boringssl, awslc)))]
1069+
#[cfg(not(boringssl))]
10601070
pub fn get_rfc3526_prime_4096() -> Result<BigNum, ErrorStack> {
10611071
unsafe {
10621072
ffi::init();
@@ -1070,7 +1080,7 @@ impl BigNum {
10701080
///
10711081
/// [`RFC 3526`]: https://tools.ietf.org/html/rfc3526#page-6
10721082
#[corresponds(BN_get_rfc3526_prime_6114)]
1073-
#[cfg(not(any(boringssl, awslc)))]
1083+
#[cfg(not(boringssl))]
10741084
pub fn get_rfc3526_prime_6144() -> Result<BigNum, ErrorStack> {
10751085
unsafe {
10761086
ffi::init();
@@ -1084,7 +1094,7 @@ impl BigNum {
10841094
///
10851095
/// [`RFC 3526`]: https://tools.ietf.org/html/rfc3526#page-6
10861096
#[corresponds(BN_get_rfc3526_prime_8192)]
1087-
#[cfg(not(any(boringssl, awslc)))]
1097+
#[cfg(not(boringssl))]
10881098
pub fn get_rfc3526_prime_8192() -> Result<BigNum, ErrorStack> {
10891099
unsafe {
10901100
ffi::init();

‎openssl/src/cipher.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl Cipher {
166166
unsafe { CipherRef::from_ptr(ffi::EVP_aes_128_xts() as *mut _) }
167167
}
168168

169-
#[cfg(not(any(boringssl, awslc)))]
169+
#[cfg(not(boringssl))]
170170
pub fn aes_256_xts() -> &'static CipherRef {
171171
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_xts() as *mut _) }
172172
}
@@ -175,17 +175,17 @@ impl Cipher {
175175
unsafe { CipherRef::from_ptr(ffi::EVP_aes_128_ctr() as *mut _) }
176176
}
177177

178-
#[cfg(not(any(boringssl, awslc)))]
178+
#[cfg(not(boringssl))]
179179
pub fn aes_128_cfb1() -> &'static CipherRef {
180180
unsafe { CipherRef::from_ptr(ffi::EVP_aes_128_cfb1() as *mut _) }
181181
}
182182

183-
#[cfg(not(any(boringssl, awslc)))]
183+
#[cfg(not(boringssl))]
184184
pub fn aes_128_cfb128() -> &'static CipherRef {
185185
unsafe { CipherRef::from_ptr(ffi::EVP_aes_128_cfb128() as *mut _) }
186186
}
187187

188-
#[cfg(not(any(boringssl, awslc)))]
188+
#[cfg(not(boringssl))]
189189
pub fn aes_128_cfb8() -> &'static CipherRef {
190190
unsafe { CipherRef::from_ptr(ffi::EVP_aes_128_cfb8() as *mut _) }
191191
}
@@ -194,7 +194,7 @@ impl Cipher {
194194
unsafe { CipherRef::from_ptr(ffi::EVP_aes_128_gcm() as *mut _) }
195195
}
196196

197-
#[cfg(not(any(boringssl, awslc)))]
197+
#[cfg(not(boringssl))]
198198
pub fn aes_128_ccm() -> &'static CipherRef {
199199
unsafe { CipherRef::from_ptr(ffi::EVP_aes_128_ccm() as *mut _) }
200200
}
@@ -233,7 +233,7 @@ impl Cipher {
233233
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_ctr() as *mut _) }
234234
}
235235

236-
#[cfg(not(any(boringssl, awslc)))]
236+
#[cfg(not(boringssl))]
237237
pub fn aes_192_cfb1() -> &'static CipherRef {
238238
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_cfb1() as *mut _) }
239239
}
@@ -242,7 +242,7 @@ impl Cipher {
242242
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_cfb128() as *mut _) }
243243
}
244244

245-
#[cfg(not(any(boringssl, awslc)))]
245+
#[cfg(not(boringssl))]
246246
pub fn aes_192_cfb8() -> &'static CipherRef {
247247
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_cfb8() as *mut _) }
248248
}
@@ -251,7 +251,7 @@ impl Cipher {
251251
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_gcm() as *mut _) }
252252
}
253253

254-
#[cfg(not(any(boringssl, awslc)))]
254+
#[cfg(not(boringssl))]
255255
pub fn aes_192_ccm() -> &'static CipherRef {
256256
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_ccm() as *mut _) }
257257
}
@@ -290,7 +290,7 @@ impl Cipher {
290290
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_ctr() as *mut _) }
291291
}
292292

293-
#[cfg(not(any(boringssl, awslc)))]
293+
#[cfg(not(boringssl))]
294294
pub fn aes_256_cfb1() -> &'static CipherRef {
295295
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_cfb1() as *mut _) }
296296
}
@@ -299,7 +299,7 @@ impl Cipher {
299299
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_cfb128() as *mut _) }
300300
}
301301

302-
#[cfg(not(any(boringssl, awslc)))]
302+
#[cfg(not(boringssl))]
303303
pub fn aes_256_cfb8() -> &'static CipherRef {
304304
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_cfb8() as *mut _) }
305305
}
@@ -308,7 +308,7 @@ impl Cipher {
308308
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_gcm() as *mut _) }
309309
}
310310

311-
#[cfg(not(any(boringssl, awslc)))]
311+
#[cfg(not(boringssl))]
312312
pub fn aes_256_ccm() -> &'static CipherRef {
313313
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_ccm() as *mut _) }
314314
}
@@ -500,7 +500,7 @@ impl Cipher {
500500
unsafe { CipherRef::from_ptr(ffi::EVP_chacha20() as *mut _) }
501501
}
502502

503-
#[cfg(all(any(ossl110, libressl360), not(osslconf = "OPENSSL_NO_CHACHA")))]
503+
#[cfg(all(any(ossl110, libressl360, awslc), not(osslconf = "OPENSSL_NO_CHACHA")))]
504504
pub fn chacha20_poly1305() -> &'static CipherRef {
505505
unsafe { CipherRef::from_ptr(ffi::EVP_chacha20_poly1305() as *mut _) }
506506
}

‎openssl/src/cipher_ctx.rs

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,166 @@ mod test {
809809
aes_128_cbc(cipher);
810810
}
811811

812+
#[cfg(not(boringssl))]
813+
#[test]
814+
fn default_aes_128_ccm() {
815+
let cipher = Cipher::aes_128_ccm();
816+
aes_ccm(
817+
cipher,
818+
"26511fb51fcfa75cb4b44da75a6e5a0e",
819+
"ea98ec44f5a86715014783172e",
820+
"4da40b80579c1d9a5309f7efecb7c059a2f914511ca5fc10",
821+
"e4692b9f06b666c7451b146c8aeb07a6e30c629d28065c3dde5940325b14b810",
822+
"1bf0ba0ebb20d8edba59f29a9371750c9c714078f73c335d",
823+
"2f1322ac69b848b001476323aed84c47",
824+
);
825+
}
826+
827+
#[cfg(not(boringssl))]
828+
#[test]
829+
fn default_aes_192_ccm() {
830+
let cipher = Cipher::aes_192_ccm();
831+
aes_ccm(
832+
cipher,
833+
"26511fb51fcfa75cb4b44da75a6e5a0eb8d9c8f3b906f886",
834+
"ea98ec44f5a86715014783172e",
835+
"4da40b80579c1d9a5309f7efecb7c059a2f914511ca5fc10",
836+
"e4692b9f06b666c7451b146c8aeb07a6e30c629d28065c3dde5940325b14b810",
837+
"30c154c616946eccc2e241d336ad33720953e449a0e6b0f0",
838+
"dbf8e9464909bdf337e48093c082a10b",
839+
);
840+
}
841+
842+
#[cfg(not(boringssl))]
843+
#[test]
844+
fn default_aes_256_ccm() {
845+
let cipher = Cipher::aes_256_ccm();
846+
aes_ccm(
847+
cipher,
848+
"314a202f836f9f257e22d8c11757832ae5131d357a72df88f3eff0ffcee0da4e",
849+
"3542fbe0f59a6d5f3abf619b7d",
850+
"c5b3d71312ea14f2f8fae5bd1a453192b6604a45db75c5ed",
851+
"dd4531f158a2fa3bc8a339f770595048f4a42bc1b03f2e824efc6ba4985119d8",
852+
"39c2e8f6edfe663b90963b98eb79e2d4f7f28a5053ae8881",
853+
"567a6b4426f1667136bed4a5e32a2bc1",
854+
);
855+
}
856+
857+
#[cfg(not(boringssl))]
858+
fn aes_ccm(
859+
cipher: &CipherRef,
860+
key: &'static str,
861+
iv: &'static str,
862+
pt: &'static str,
863+
aad: &'static str,
864+
ct: &'static str,
865+
tag: &'static str,
866+
) {
867+
// from https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Algorithm-Validation-Program/documents/mac/ccmtestvectors.zip
868+
let key = hex::decode(key).unwrap();
869+
let iv = hex::decode(iv).unwrap();
870+
let pt = hex::decode(pt).unwrap();
871+
let ct = hex::decode(ct).unwrap();
872+
let aad = hex::decode(aad).unwrap();
873+
let tag = hex::decode(tag).unwrap();
874+
875+
let mut ctx = CipherCtx::new().unwrap();
876+
877+
ctx.encrypt_init(Some(cipher), None, None).unwrap();
878+
ctx.set_iv_length(iv.len()).unwrap();
879+
ctx.set_tag_length(tag.len()).unwrap();
880+
ctx.encrypt_init(None, Some(&key), Some(&iv)).unwrap();
881+
ctx.set_data_len(pt.len()).unwrap();
882+
883+
let mut buf = vec![];
884+
ctx.cipher_update(&aad, None).unwrap();
885+
ctx.cipher_update_vec(&pt, &mut buf).unwrap();
886+
ctx.cipher_final_vec(&mut buf).unwrap();
887+
assert_eq!(buf, ct);
888+
889+
let mut out_tag = vec![0u8; tag.len()];
890+
ctx.tag(&mut out_tag).unwrap();
891+
assert_eq!(tag, out_tag);
892+
893+
ctx.decrypt_init(Some(cipher), None, None).unwrap();
894+
ctx.set_iv_length(iv.len()).unwrap();
895+
ctx.set_tag(&tag).unwrap();
896+
ctx.decrypt_init(None, Some(&key), Some(&iv)).unwrap();
897+
ctx.set_data_len(pt.len()).unwrap();
898+
899+
let mut buf = vec![];
900+
ctx.cipher_update(&aad, None).unwrap();
901+
ctx.cipher_update_vec(&ct, &mut buf).unwrap();
902+
ctx.cipher_final_vec(&mut buf).unwrap();
903+
904+
assert_eq!(buf, pt);
905+
}
906+
907+
#[cfg(not(any(boringssl, awslc)))]
908+
#[test]
909+
fn default_aes_128_xts() {
910+
let cipher = Cipher::aes_128_xts();
911+
aes_xts(
912+
cipher,
913+
"a1b90cba3f06ac353b2c343876081762090923026e91771815f29dab01932f2f",
914+
"4faef7117cda59c66e4b92013e768ad5",
915+
"ebabce95b14d3c8d6fb350390790311c",
916+
"778ae8b43cb98d5a825081d5be471c63",
917+
);
918+
}
919+
920+
#[cfg(not(boringssl))]
921+
#[test]
922+
fn default_aes_256_xts() {
923+
let cipher = Cipher::aes_256_xts();
924+
aes_xts(cipher, "1ea661c58d943a0e4801e42f4b0947149e7f9f8e3e68d0c7505210bd311a0e7cd6e13ffdf2418d8d1911c004cda58da3d619b7e2b9141e58318eea392cf41b08", "adf8d92627464ad2f0428e84a9f87564", "2eedea52cd8215e1acc647e810bbc3642e87287f8d2e57e36c0a24fbc12a202e", "cbaad0e2f6cea3f50b37f934d46a9b130b9d54f07e34f36af793e86f73c6d7db");
925+
}
926+
927+
#[cfg(not(boringssl))]
928+
fn aes_xts(
929+
cipher: &CipherRef,
930+
key: &'static str,
931+
i: &'static str,
932+
pt: &'static str,
933+
ct: &'static str,
934+
) {
935+
let key = hex::decode(key).unwrap();
936+
let i = hex::decode(i).unwrap();
937+
let pt = hex::decode(pt).unwrap();
938+
let ct = hex::decode(ct).unwrap();
939+
940+
let mut ctx = CipherCtx::new().unwrap();
941+
ctx.encrypt_init(Some(cipher), Some(&key), Some(&i))
942+
.unwrap();
943+
let mut buf = vec![];
944+
ctx.cipher_update_vec(&pt, &mut buf).unwrap();
945+
ctx.cipher_final_vec(&mut buf).unwrap();
946+
947+
assert_eq!(ct, buf);
948+
949+
ctx.decrypt_init(Some(cipher), Some(&key), Some(&i))
950+
.unwrap();
951+
let mut buf = vec![];
952+
ctx.cipher_update_vec(&ct, &mut buf).unwrap();
953+
ctx.cipher_final_vec(&mut buf).unwrap();
954+
955+
assert_eq!(pt, buf);
956+
}
957+
812958
#[test]
813959
fn test_stream_ciphers() {
960+
#[cfg(not(boringssl))]
961+
{
962+
test_stream_cipher(Cipher::aes_128_cfb1());
963+
test_stream_cipher(Cipher::aes_128_cfb8());
964+
test_stream_cipher(Cipher::aes_128_cfb128());
965+
test_stream_cipher(Cipher::aes_192_cfb1());
966+
test_stream_cipher(Cipher::aes_192_cfb8());
967+
test_stream_cipher(Cipher::aes_192_cfb128());
968+
test_stream_cipher(Cipher::aes_256_cfb1());
969+
test_stream_cipher(Cipher::aes_256_cfb8());
970+
test_stream_cipher(Cipher::aes_256_cfb128());
971+
}
814972
test_stream_cipher(Cipher::aes_192_ctr());
815973
test_stream_cipher(Cipher::aes_256_ctr());
816974
}

‎openssl/src/dsa.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,11 @@ cfg_if! {
533533
mod test {
534534
use super::*;
535535
use crate::bn::BigNumContext;
536-
#[cfg(not(any(boringssl, awslc)))]
536+
#[cfg(not(boringssl))]
537537
use crate::hash::MessageDigest;
538-
#[cfg(not(any(boringssl, awslc)))]
538+
#[cfg(not(boringssl))]
539539
use crate::pkey::PKey;
540-
#[cfg(not(any(boringssl, awslc)))]
540+
#[cfg(not(boringssl))]
541541
use crate::sign::{Signer, Verifier};
542542

543543
#[test]
@@ -607,7 +607,7 @@ mod test {
607607
}
608608

609609
#[test]
610-
#[cfg(not(any(boringssl, awslc)))]
610+
#[cfg(not(boringssl))]
611611
fn test_signature() {
612612
const TEST_DATA: &[u8] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
613613
let dsa_ref = Dsa::generate(1024).unwrap();
@@ -648,7 +648,7 @@ mod test {
648648
}
649649

650650
#[test]
651-
#[cfg(not(any(boringssl, awslc)))]
651+
#[cfg(not(boringssl))]
652652
fn test_signature_der() {
653653
use std::convert::TryInto;
654654

0 commit comments

Comments
 (0)