Extend encrypted private key quick test
Test .ovpn didn't use an PKCS#8 key due to a slip-up. Fixing it unveiled that isEncrypted returned false for PKCS#8 keys. Fixes #80
This commit is contained in:
parent
46fb871375
commit
11fd418f82
|
@ -471,7 +471,10 @@ public class ConfigurationParser {
|
|||
}
|
||||
|
||||
private static func normalizeEncryptedPEMBlock(block: inout [String]) -> Bool {
|
||||
|
||||
if block.count >= 1 && block[0].contains("ENCRYPTED") {
|
||||
return true
|
||||
}
|
||||
|
||||
// XXX: restore blank line after encryption header (easier than tweaking trimmedLines)
|
||||
if block.count >= 3 && block[1].contains("Proc-Type") {
|
||||
block.insert("", at: 3)
|
||||
|
|
|
@ -97,60 +97,60 @@ kiJ6Ts2iqIvR7T7Eme2vBYH/UJ1DXrdCJx6IDGxxgoXk
|
|||
-----END CERTIFICATE-----
|
||||
</cert>
|
||||
<key>
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
Proc-Type: 4,ENCRYPTED
|
||||
DEK-Info: AES-128-CBC,1C7216F89C74E56260FE71A9C1BAB35E
|
||||
|
||||
md+NHvPFW2KQTjzOdstXWEOKcjAp2Z+5sUtXlaeY+kymFOLyweefk1QX0UN1m4Dt
|
||||
MSH0Zc5LEtwV2nd9rT2shxjZUsup1kpn8JPkXS0O/plEze3r0IrVegOi+tXc5eNA
|
||||
2Rc4jD5UZqQTXF7B2sR7HNu/TlIrcnR5DuaqmIbn0FO/9SnpEdSSabHUZHXo6M0n
|
||||
uikRHRFRXJjGR7Bi8PtueTgvOrqIt6W1e6ORZM/rs+VPGLGc6fCtGA0/aDhkpr4d
|
||||
mKOeL+WZsIX/8TVlCFlBvqeDJac5ByqY58BmbCmqYjQnmCIvNsE23I9a2ufwNq8F
|
||||
qimBAYnB/iyivY6Vhl5WMT3EehhgCaTcAjwp4xNaOAbmF0SInxM1WkBaeSM5gyE+
|
||||
GmiMef6JJU5tF1g64hzIllsDFR8VXPp8M+iRNjDBgbndOmKoTPzZfkJaqaMjTOtB
|
||||
2EXqIciBsNZydVKkMAcwDJT5pFvKS7Sv2/mfBJbp3XdwrQl5UQwz7ZfyOnsjpLLB
|
||||
5KZY8eCGrcFNFM6mPygKwhLo2/5Bh0Ke03lKd/edQuFp8wTDovyevgq9LBuRQFlG
|
||||
aKD7heLek0oMu6GvL7kESAI3hr+Aaf2l6pc8r8iIYR/ibBGXsVjKlYbUcSL2oz83
|
||||
+UAOVCazJe4oIpg4mM62t+Jj1ag6S2X48POEm8moMD5xjnrlUy4+JUKUnQ+s4iJJ
|
||||
lDVsNdvXgJh19S2qHor6QXikgQOeVAsj+yC4KEtK/w/AcueUz8uyX/FMqX2hTdLY
|
||||
i/yqxAdLb1oORrzXNbK8cDVmRfHZSC1iutBSwZ8j6UcqSbRQAQPIPWhRJzk1dPPt
|
||||
PzoP193x2x0WOHkUyeLiS6YcuZrQhebpfWnQLaUprw1geWa1A21xpAM5ATBMjc3K
|
||||
JBXeOATSwZv45QyRolrxyTbBYUdGfSoC1R3XdypgyXnOWhPXUf66EgXxkuV6hw5M
|
||||
ng+LAiBYsYHJqCq/UbpNDcRsg5z7yQYvDryDvkIZ4PSkALwQ1wpDw0tWTzbhzh0x
|
||||
h3y8SaLVH1cDr2SczjF6vN1i8gkMDrg1oqBNK4zTshk0JfswmxgDibwez4WKfYSj
|
||||
RKjYWEdJ8UCe1aeuRgIQts+4tOrLRajNfGfrVQH1pLx3yBODX4PquRo3Q/0qCd9+
|
||||
1KLmsTSn8CDsiFlqN8CaQTpy3LP7ZU1vhlN7SJtiLERzOP8vB06RU4OXd4lWcywX
|
||||
fFnsewHF6G9p0HE4x+XeRv22PLOzLtm5X/45gBg81fx8Zemmg7vemmTK65po8Yt2
|
||||
J696hgQkk+FlHZkBjLbsbzWHcxjkYV0AOD74Ac1ueKbpOZE9F3nt5mg/QDxUi+LT
|
||||
p4jQ6uNNclZV6ktHsqA+JjbUOZQKuprtvIXcXRW6OpghBcUfqAvFXEkQKrKHv64A
|
||||
68qYP7C/WJHypSwqe7gsmDmWaOX/6CMaLPlrHMOgDAFEne/jVHkDvlm6KQRHaTQG
|
||||
gHPg3Eh0EhIt4dA0t+bpBd8+CvU8/rfqek6ZvgFWva/rEFy/D3Cl5us1IL63WShC
|
||||
/HwaHqXanPIW7+mHOV60WP1tdua2sxsxo0DWyJjFZiPbO6fD2QiKDOngeu3JsAvd
|
||||
q8XS8wLH9399G5jKAvoyoGF1D9rHLG61CkgJ2DRHYWW0FXWZtUcsusfdiaYck3nA
|
||||
CDeIlKz9dT4NxMJLn1FSYnjtJLe5c9ryRvEY5z3nLGPeVOuCmyoPhvhxbK5PNQes
|
||||
KePOZI4qp83OBzsatZdR1diKkdiKLdfSAwEeI3VRjRJUm8UtVyQF34Osoz4ql3m8
|
||||
YhJ7ViAkde0TKlSFBHUsHJh+GEi+FsHMfPhYnU/nMmgUNoxdOSgE75ah+FX0+8wl
|
||||
OSLqmL3fGHTZN/rz/5LL7q1CYVns8WkJP3HtIVmxrZkOOzHn1e5t5XbXVDBNaB0y
|
||||
DAhm9ob8aXqJBRMAc1q9n74VeyxV8OlzLgD39Jmpx7VN4FfPbtH8wyEfAlUZr8qG
|
||||
yBMJtqmV6/a/fLdTpno4WRewYBRTWVnz6MeBGT3OXMRGna+af4s7/8gKlh63Dc9x
|
||||
54rifwKKC8sWnc2fTK/YT52YvHUkOZDO+xeUBb4s32HRy1Wrd2CJPC9yPq2YgXv+
|
||||
6iO5dbyuC4e3BtDGILACehKR85fEeiEs1F4aSqhfmYy2cy1VJ0MXAatuAofCBNnE
|
||||
9CH3qXKojx7kTdM7/Cy8LAm1ipTxZpSH64ZmHwXnXRjKkm9YIllTThXdzU1ougOg
|
||||
Evtm36bCYoTzGKe+JH8S6Y1yh/g8msBKF+oDQpRLtpjV8rU5EaRTg6QXvk0i8Ufv
|
||||
ACymxjCqlJFxbNaD61+t4+3gsUik2w/rNKzs3S7XU2Y4VAxInX03xQqVK3D//k9b
|
||||
ArdvXn96qr4767lt90Y9cFS1GTIFhPpTkIrMZLOoDAm7/fouTICT2uU6Hq4mi7bM
|
||||
SsA5PA8IL/DSWhdEdFeK7woV1yUfYfRBbKhoStIIv4i7Vyw6/oT4+VYSnf/NWwFn
|
||||
3C4coO/ynTrnTeC/PdoTa52kaNZolsWV2+ok9d0m5MmLjWra0R+JZA/rDJ7ZVym/
|
||||
ZbK7X92gRaJZYJvnjbGvZqpzodpCxG7zkN7e+se8z4DaypHp7jo7ozpG2nEmfbGZ
|
||||
9dgIFuxep+cctAr7/AvuQgmdoLR9sKdiqsM1gQ2TxkRVaV7d59RNTlXGdl6EC+Fx
|
||||
l5nu6RrQlwJweJ7qL/SSp9BrKKQJACvai7HV2mwFG9alBBz/KRkeso4xsW3IjSUd
|
||||
3+bC2y4l/U5Aku/i7WTRXMs8gqgqlok5wJnfwxzKRBXZt6nWGaIjGdfRrwNkQp2s
|
||||
hDRbjIR3IqeQEhvwYQUP5Su9XYg+MVbxI9eHp70t7azM14+h97Lje8eEdtthtAHJ
|
||||
NXWqzsNdpm3RkCRYzL/1Zy/d3OFGxuyor0Z46z4YlZ7paINxnmjj+XRx2hEKB0Ez
|
||||
PhUE3IHV2sGFvTnRGDzDdXUk38BxQXbQU/ggvnU4Ki79ahNrgTHvdLZ2QZmFygoo
|
||||
bLWELCnj4LXnorsIefqtzCuO4egJwCydE+AXV3Dmk/XXW8K4LRg2SB98/EJp6N71
|
||||
OMuRVuu8ZunbIIWmZ1iWSAkPzpffDmEjxwDmVQjxw/Bt8WzA33MuqRVvm1m+kL3u
|
||||
-----END RSA PRIVATE KEY-----
|
||||
-----BEGIN ENCRYPTED PRIVATE KEY-----
|
||||
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
|
||||
kNk=
|
||||
-----END ENCRYPTED PRIVATE KEY-----
|
||||
</key>
|
||||
remote no.lazerpenguin.com 443
|
||||
cipher AES-256-CBC
|
||||
|
|
Loading…
Reference in New Issue