fix(certificates): report legacy key password length limit

This commit is contained in:
Kevin Yue committed 2026-11-01 23:35:58 +08:00
1 parent 14c4e24e0e
commit 18ce000640
8 files changed
+92 -76

No files matched your search

@@ -167,6 +167,13 @@ fn decrypt(der: &[u8], passphrase: Option<&str>) -> anyhow::Result<SecretDocumen
// PKCS#12 PBE-SHA1-3DES inside standalone PKCS#8 is not implemented by
// RustCrypto. Only this known legacy scheme uses the native importer.
if algorithm == pkcs8::ObjectIdentifier::new_unwrap("1.2.840.113549.1.12.1.3") {
// Older supported GnuTLS releases allow 256 UTF-16 bytes including the terminator.
if let Some(passphrase) = passphrase {
anyhow::ensure!(
passphrase.encode_utf16().count() <= 127,
"Password is too long for this legacy key format. Re-export the key with modern encryption"
);
}
return certificate::decrypt_key(der, false, passphrase);
}
return Err(RequestIdentityError::UnsupportedEncryption.into());
+18 -13
View File
@@ -324,19 +324,24 @@ fn identity_import_does_not_use_converter_executables() {
target_os = "freebsd",
target_os = "openbsd"
))]
fn encrypted_key_import_accepts_long_passwords() {
for length in [1023, 1024] {
let identity = load(
"rsa-cert.pem",
&format!("rsa-pbes1-3des-password-{length}.pem"),
Some(&"x".repeat(length)),
)
.unwrap();
assert_eq!(
identity.key_data().unwrap(),
fs::read(fixture("rsa-pkcs8.pem")).unwrap()
);
}
fn legacy_key_import_handles_the_supported_password_boundary() {
let identity = load(
"rsa-cert.pem",
"rsa-pbes1-3des-password-127.pem",
Some(&"x".repeat(127)),
)
.unwrap();
assert_eq!(
identity.key_data().unwrap(),
fs::read(fixture("rsa-pkcs8.pem")).unwrap()
);
let password = "x".repeat(128);
let error = load("rsa-cert.pem", "rsa-pbes1-3des-password-128.pem", Some(&password)).unwrap_err();
assert_eq!(
error.to_string(),
"Password is too long for this legacy key format. Re-export the key with modern encryption"
);
assert!(!format!("{error:?}").contains(&password));
}
#[test]
@@ -2,7 +2,7 @@
These generated keys and certificates are **public test data**, never production
credentials. Passwords are `fixture-password`, except `unicode-password.p12`,
which uses `pässword-密码`, and the `rsa-pbes1-3des-password-{1023,1024}.pem`
which uses `pässword-密码`, and the `rsa-pbes1-3des-password-{127,128}.pem`
fixtures, which use `x` repeated the indicated number of bytes.
Regenerate intentionally with OpenSSL 3:
@@ -27,7 +27,7 @@ optional fixture-generation script, not identity import.
| `rsa-pbes2-des3-{sha1,sha256}.pem` | PBES2 3DES-CBC with PBKDF2 SHA1/SHA256; distinct from the PKCS#12 PBE scheme handled by GnuTLS |
| `rsa-pbes2-des.pem` | PBES2 DES-CBC/PBKDF2-SHA256; Rust processing requires no native legacy provider |
| `rsa-pbes2-scrypt.pem` | PBES2 AES256-CBC with scrypt |
| `rsa-pbes1-3des-password-{1023,1024}.pem` | Same encryption with 1023- and 1024-byte passwords; both import without executable line limits |
| `rsa-pbes1-3des-password-{127,128}.pem` | Legacy password boundary: 127 ASCII characters import; 128 report the supported limit |
| `rsa-pbes1-3des.pem` | Legacy PKCS#12 SHA1/3DES scheme inside standalone encrypted PKCS#8; private GnuTLS import case |
| `empty-password.p12` | RSA leaf/key/root with an empty password, accepted with omitted or empty password |
| `ec-pbes2.pem` | Encrypted EC PKCS#8, AES256-CBC/PBKDF2-SHA256 |
@@ -41,8 +41,12 @@ permissions and cleanup. `tests/identity_encoding.rs` covers PEM/DER, RSA PKCS#1
EC SEC1, traditional encrypted PEM, first-key selection, malformed encryption
headers and archive extension capitalization. Rustls validates RSA and EC keys
on all supported targets; desktop legacy encrypted-key imports use GnuTLS.
PBES2, including scrypt, stays in Rust. The no-executable child test runs with an
empty PATH and imports both legacy key families and RC2 PKCS#12.
Legacy PKCS#12 SHA1/3DES keys use a consistent limit of 127 UTF-16 code units
(256 bytes including the terminator), matching older supported GnuTLS releases.
Longer passwords report a clear error without exposing the password.
PBES2, including scrypt, stays in Rust and does not use this limit. The
no-executable child test runs with an empty PATH and imports both legacy key
families and RC2 PKCS#12.
Archive integrity checks change the UTF-16 friendly name without changing the
MAC. Decrypted output is compared with independent plaintext fixture keys.
@@ -49,7 +49,7 @@ done
-passout pass:fixture-password -out rsa-pbes2-scrypt.pem
"$openssl_bin" pkcs8 -topk8 -in rsa-pkcs8.pem -v1 PBE-SHA1-3DES \
-passout pass:fixture-password -out rsa-pbes1-3des.pem
for length in 1023 1024; do
for length in 127 128; do
printf -v password '%*s' "$length" ''
password=${password// /x}
"$openssl_bin" pkcs8 -topk8 -in rsa-pkcs8.pem -v1 PBE-SHA1-3DES \
@@ -1,29 +0,0 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
MIIE6jAcBgoqhkiG9w0BDAEDMA4ECLOZZqD+VLtQAgIIAASCBMiGiqam4dNtVdxD
KpskK3iDnYL00TNXKNeHM/vwsJp1J9l1oIUq9ftWd3hFucd3tfTBIyE3BB6tCxDh
D3EJWeIvgIfsKLCX7vB4GJhUTBA4zVwKgdvr61RYpwd2MfJYXN3d3u0BkUDhyoSz
lTheKH4Ip+/GG3jpyq2pbDjHTBEFW7b3JuM3nvnC6hDiVXtjFhfGKWwa/sOpfmyf
20Nj0RGP0eIlVz9XGXuZ23VWk8u9oF3rVY18qRThyNSCPJG+qAgyuKioKqw1MOKZ
1RjD1kiDwSnz+aDDSI8y5/XE883Nawd3Gvi3SyZXd4FWwd6G49zoPdyJsODZt04G
DzdT0jeaCaPNkGO1xoZ2VVmlRhC7sB3Bf69kKsZOryLMuKGm9CLDWH78i6TjoQV+
oVJjna1liFcw9ws1sZxagNsr1JxPuOTzNk9hzgBKl5LUUloIL1nhhyUzoA8M4BPt
0Cc/b4yrs2pTgyozC+xGQZt7crxSg70VYgfHL0Jx5wM1+5SFBKHxhsYojl0uD2uI
PIjtm26agFkw4QXvh/vUKuuu4LBQLrrdN91UX5ovcQ2r1SmG0AFNoQtvx2C8pMjx
tEKngF5Uk+rL8zv6v0Hl7J2yU+LIF2LsgSBLYXpEzQNmakZvDa0Ib74ZOfGbMLmd
ZuUIIH0eqzSXwkrrjQ2SFAzlAg9vgq/93MWLTpBN3gifR3R5xHq1i/GYkWCPVGEL
HFuE1w6oZAWrxm/p6HFlSJYc+d6PoMRFSUQObi2Ta/tH0KjsKNLwv36PEvER/teN
6ks6/f8aADQDTw+xi/SCM7rIOHas14b6QE/ILVmXpFitbFpe7c0YDKo5Cm/viO68
eqqchWJX5PUVI7gAthmCDtKX4SBmImsdxsBl1zr28FVQsP62A0m91XxRjrIABABe
IuuV/9WSd5wHJ4Elh0OW+uYw3vFvfxIRBjKbD610Se0ZDLL+PbKQHXK8Mm+NmBdi
LkXNyHo0asrmQYSdQWYPnglmrQZpfuOKQUNipsagQvd/q0KpE1YK+UGtzPFWf9Nv
DkyZTb6qG3jAMNNP9kWe+i03e1YGW7HB0I9ac4CPFG/FxDfDk3o6tt8fT3y/Aa6z
HHOP5C+GtaNcG8BWTkzwEwYlyu496Tw+C2K+PWQ4zdw/kBLjkP3/8yKnFDQMoeRL
eHX+Aho9OHioXe3gX7Ya+Bgp/8koarW0XsPIRyMCQ5x4oRtYp+sIPf6BJ1a3WvM2
owhTo2/DC7kWnAbJBGpodKeydwM7lYFsrTv+JsjbtyqDP7z++G8dhCDTXvgzFZKg
N7d5HqwCYkmmneNFMNntgvivdWjQvrb6H4jexWF5FIpoLUCW5EO6dVyRsC4d3A6j
PC5GKCh4fZB+LhfIYGkrzLDx0iaAKWv16as+fHSY8vDBFhUFed6INsMlHNEuOEpX
GtM1QzGta4GbVNVue7XIRjiY/XPzQ1RmZPwOCzBi03PFwbt7zti13v0oQs49W7Yh
5E+yu7PQPKxr1WbmmU8e0U5NF0bkPsFVauUKFCOC164nEn0zGZRSyFL54O7+lF+b
zAPRM0zYEVbCkkQsF87ToGwPRY9LoNikP14MV1npujkWIK1wZ/eysBACDCdW8mxR
X2ONO70h8TsO1R6KS5Y=
-----END ENCRYPTED PRIVATE KEY-----
@@ -1,29 +0,0 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
MIIE6jAcBgoqhkiG9w0BDAEDMA4ECOIH1TuPOHfxAgIIAASCBMgcv+kci9FRoLjr
zYevFdoYS66/aUAy0V/173CuRMb1hzwsxfXeoRzTgXaWXUOExJX2PSCIai2cwCcj
SvZUXPSQz+9aWrZjO/R+tWfKW0ttmT6Et2Kfps6MkJpRK/jbmaYOISpNa/8ROCty
A7P6f4KNFeRhU89TgLqegm+so4un7d/n9vwYQBC1oCaRuCvxuNIugbnVKJkJ2RMx
e7JLk16HVox8UGb66knS5kvaFVZZzJasmxN/tLg9kyomzopOMQZJ5E5uLD2CyndV
Wh8OTwHbH6MOGOfhSi7eETWaveUvR9CMfm5YwTLM9RJHGlhl6J0NO8eZBd+IyA08
jP2UYtLo2Lgx0ZobAUCfx9ZWFmQH//wnOyyiU4HzmIrUVUFPj2LsnYUyypAl54lp
hFLf0P5oPFdNc1GfYEW7REBrJilj+4R1ycY1jw2o/WYntJUyFSYJ4rUXadzpv7el
BGvbob04atktipdFF7Y/OfcOk0kuf/BdLNchayUYAHMNv8V+BB7c2EuiHA4Rg5sv
J6egzKEpyJmdhvAWiEZavDpr0mz0KjZQVSGDmZ//ZWWponR/8vWhT2HRjFd6UAeP
YFAnH+Hk8JlsGKcsrQMybECQTsyGNnUDlAZhu6doiWPGnT+27l7iyNGCoxCXw7Nd
PXXMkPk6vFakvS4pe10jgNn+nV8K6w1yK8mOcA0yzaSx4vM0H4WU1k3wGhkGLzAp
qStyAMLeR5vC8ZEOslj+5UchBpKCgROz2TuHDerHRJOw/CTECKP/LitXkYgjH4Z8
6PgPNDhQhScVDsy6xvt5TayWckfqVsCUtfzcfN7xxYsfLlMHxkV5m8guFpcZNpbi
87/k/xeL1UaFXxWGf4l8yWL2t1Td29PAF6Tb24ly3XLnsTcapJ4WCfdq5Pou5IAE
PsoBex6XhKv5O8zzBZJKW0KWhvQTevpW3qLnb9jmr7NuCnSEAgsjF+K2HTDWJXb5
FUwoDYZXkonoI8PD/df5RvyuhzwwUz7KwFpZ0gGpEKT11JYFTk+f/9UrYSdGrvf5
wEepxJBYnPc028JZKnOkLptGp75DE/KIXCfPY5sG72AQfFekAf1gXFL9zWyRYnxg
HhDSHUZsZze6U5tcrqtpUNagu/F/RXaDWBvnntiQNEM2zwtjgakBb/oDVZ5x+7Sc
hTqN51MfsTTRAdqKJWMY/BZGkW0E2NF8/mPF/JdQcyeb4edSbyO/ZNlnS9xx4OGu
ZmoYMWW//fFhFc62Q4zR4f/C7o0WgkXgu8mitjCxZ4JInJGqyLwHKdLW6Dka3Yig
Cw88bpV4G2RwyvVNP7RyPiabHClrfZzhhHq2Qltawr08RZmBKX1S0EepH6p6125G
Bbd2lSL5NS4g3VN70/pcdBSYbiTCL6Cmbxii14CPk1d+nnm6+RwrrcNkjjbqVQpM
GlRfu807yjAHqAqwa45DEeFufGPY2bX1BjEWsw4l6tgI0nEmaKRurfcv6Ns0SeD/
1t+ondPjd6QUIo0fdUkU/2O99QpI8r0nORa8Df98nSIkzgfC+G/WXLonJ2EWVGUR
3hIXf2x/vFSVnH2gIHlP3vUjQv7igw8igoNBy6iCwxzvH0DKu998qZ+w9KWPJMfv
7gRfkOUwSwgzBYFu/2g=
-----END ENCRYPTED PRIVATE KEY-----
@@ -0,0 +1,29 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
MIIE6jAcBgoqhkiG9w0BDAEDMA4ECIxo5EM1S2OsAgIIAASCBMjM2XZlCdMDSMOP
xn4TbkBNa5RKs5aZYMg+24UtEOjE2CB7ucX82FXDR3Q3SQklXW/8Fy7Gp5DNAqz2
rFA8xzbawoFkQQyjOxCbJFqTqZfUgmxy5zhpZvBTLuP63FmMgRT0FRVDaCsXl0kd
oWUd02YiM5PpRETM0dslck1IOib6GH7g699834LvMvYDeTp5N+ZWKgCAWAJUn1hs
Xo5oBAaWhQGO4+B0gkAKZ34Wj1a6ebPVILngsF4ClLiUxMY0HoKwrEQHGqGj3piD
VEWYwg6BoMerDro3fQXiu+K7uaqAAVh73aPikbfKubGhuWxt/BeFzYpkXZYt3q9C
jbQUkyg3VUnPcRInjykH+7UzzcjDcyDaxmkdZIph9RdSgYr0aM0BSrcaDJv9uSDT
wKCO0TDeEpCprTbMeu1NOiGANbZ4pfQpfbfSHd6eFsIEz8C/5/v6S/SIT0lh890t
I878fj+EplQ0NX6oJFh4AYfO7U89R4OWq/xZ8jjx85USS7Jzgcl9kz5LgbTCLFXi
GUMWmHop3AZhve2L2KXprEUrClVFS2V/PrfWf9aley0wkCBBLaLKsGz9xxh7Hv+D
87q1WMP9Z+4/LMeihUmtun7cYYh/uYIGilvuxVmwchmmbge51sj8BBe2Kd6MQ8LB
jlqLbhNY4AdiRq7rqyOasYoH2kKhVTSvP3x7NRDt1bgdK5BFtdbsy8LyfXCJfiBo
zQBXRhfUsquuTLvt/1RMyygJlpihNET2hEvBz/dqCCumqgFZOBMBbOE9vxWQvFlL
6c6/VtNw4eHaCe6OJF0zYRcPsZCknj/mxgU9zVHK+a7T3x+MjsjS4yTn637luDIV
0p/7AJgjuzO9KnmMgL8ZY34aSazx908shnpLX/yFA4GSQ4kqqQ580bjz7kMHTS9b
gGS5/uwywoG1n7m6VITZ1iLDAXvKu+s5rsR9y+fOn5LMpSAiQ/VMlgst9985XEYr
L5CjfR6pThOjAgoBZfvVN6WjrQnc7NGEbfBc8o5BgR2xX0I8Z1o3lsDGB0eSEWA3
iaTa2Y2UCKq241X2oKV3wIvFLQdsyP+JTdZGLgZCH8IiV+/6v2R95K/IOIzyl1LY
smqU4YIBPFep2gK9YPOXl0/3r3o8RCqkE3TngM4MyAWT0qgaUpp+S/B+5k8VXeuK
oJJnDaleq/6IIVljtP2Fz03oiykU0qfZy/xoW40GVAmB/grVMFnozinc8YJ7W/GC
/wnz6ugOuJuOFB1c7RhyiqR8ioOxUWYs9iXA5CQqMIqxKLq2GI6ZgU08pGIFa85W
TACqSCTS18otIWOPHcWH4Eait/MiMds78f+aizmq0ZYwGZac79sRByobIZzU/6q/
wb/HQgwJD+AJDYMrUsTsrRIIAy9Qvq8MDsf9HDHCKXCWbew6hIoZJ8c/sZryKHnj
lwCMJMHAjM1nDcdWOj6euF/3jA5gh9etxkpNw/gm8i2a1nRQtjWkAcICoTFl1QRX
KfQv8URpe0XiNbBs26ABGJUKZHY+wCkWeE2AztR3cFf2AGDB7xI1OXK75BXOJiqC
GYAuzRayZzXlPMWl4kEHQH8iGR5rI4LF/d72f3GTcof6IruSgj/Dk+i4e+JBMqth
TPaNQWDea8ALdu0ZitE=
-----END ENCRYPTED PRIVATE KEY-----
@@ -0,0 +1,29 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
MIIE6jAcBgoqhkiG9w0BDAEDMA4ECJYKMPRWT41NAgIIAASCBMi9nkicRojhOxI4
UZwVAHF0n4L0oWQFUCYyRjg8b7/ntNZBs9Jzt4LSiMVprRgAlPHTrIT2lPSmK/2Z
W2N1VqDs0FuStyDgagFRd/UtjtNfnk7QlI0PEy4W6z2UFlF7/m2A4LeuSFoP30FF
ySESixT0Du7SPQX4rLKIeeq2CvTF9gUu7lCbe5stFs5/G7eVJoDyOdKSmCL6d0rA
quhEVPGDi83tDJRAfgz5OsaXF/+NLK7avKNvmst6v8IC7ZvpUj91VpjF0JHHCxrs
A7TUtPkM3dVbf6ERyi5JWtWcSFR+yw2BYjV2utHWkCAFtXyd83T/SfAs8RRcAUWk
BrzFiJr7e9XOAmPmUoMkvU6vXGki/YPiXjQpfOLjfujjhI4CNMXNxF/rFTzF9Uqu
sD6TXdN2xZvVaewBOxQIPguTCdRn2sCYzDGoDB58yQrVVaKDSk9BMZvjhbuGKcct
ldjubBgmuhoAi4QQpu3IfRkLsGSS3mn73UZuO/i5y69HzKg7nCF9k0dVZ/bcOsK3
HymmCv9B5i/uJHNefdqWXuEHtG6futJ4iGHm8o5VkJSOD/PNUzSMzKeh9aygBE/x
C0V6NKRfL0zNBfwn1fPe/bOHvwBuDpjjPvfaJz8imFJwHxOz9i+2qJHVMWPD4Tnx
ht2y9RG8acYADd6qod4YgDYhReEaScunBatI/6uxD9SQk7y7NY8JpxomW1RmmtJd
mtT6/QpZxFzrbpKysAsMz3Fl5KmtnwaufxeAvSmqyBe3pLp7PYibWJDbwc1O7aN4
eBkk2QBlDgyVCkVxAtOhC+3d1vI9yav3RjmlunfmRdphZmxduPoDOJ+yz8JnDSAh
K4pGzRKU9xmciR/X6WmCXAz5FrvRru7Ur4myVePGdKRbVK80n0pGSX4wjN/KfMB9
Zw17o1HGQ0gDL+XrC9ORlyh5so+c3cXZiQ+jlb4urUJ+sFo/qjcYdGsePEM+Y2Xy
3poAlrxh1NrsdlUPGNx20OYf/eWYS9FTn7/iKbaH3bQIMO8KsOV/A969HtuXeXWu
g5RIuFvJ0DTvuBNzknzgJWyhafyW/+4tPaUHR+Wf8dwAr36tkH06ZfOVTA96nIZ4
z0tF896B8eEmXqwaGbRR6KcAYidGU9aubx0gjbowZwKjGmkoGzhk7cjUr3wE+bqD
tlBnH9AA03sE3GAQ61TDTzHE3UMYKT/zkl03DGcMeoTi8H6y8Jn7GFlJVtj2IRGo
ByBSZxDr0ylKB12+RQsgICJ0dIR/XF1ljdxgB8QOCPOAgL1GxrYpSvBoTLTr/YxX
uqwUFYUO/HBiWk9t1tnBGAn3kvb9sOGm/lhME2TMNrzN1dMVUJVbFDz2cuIpo/i+
GjCr3Cwh8Rx+uRHvuYrljWQQXaN2xOApGySsTZhavnVoBUQHq/X56MVgib8/nAYh
Fc/T856Bx3fVe/HD8VPPl33iDylmoihjzFPhPkfTrCMk2nMYxWVLoxhjmkynPikR
FR9sVUo/NwDzAnk0gykjiQ62AptceTW8k3Rl7eCctytUyFlsjkcFW43kgYOUhE9a
rv6/PzRmYOjN27OIKIJ8SHhBhLKu5mH4QciH+QGRSLeAGNi+vN1SzuHBBuL1jKg7
WEYP/1MOSL1b6UNPLhc=
-----END ENCRYPTED PRIVATE KEY-----