The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #364, comment#3: Remove ED25519 from PEM line

Browse Source 
Actually, ED25519 has no "traditional" format.
While at it, replace the switch statement by
the simpler PEM_write_bio_PrivateKey_traditional()
This commit is contained in:
Christian Hohnstaedt 2024-08-22 12:21:25 +02:00
parent 34f4c13191
commit c730a886c8
2 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/pki_evp.cpp
View File

@ -768,40 +768,27 @@ QSqlError pki_evp::deleteSqlData()
return q.lastError();
}
#ifndef LIBRESSL_VERSION_NUMBER
int PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x,
const EVP_CIPHER *enc,
unsigned char *kstr, int klen,
pem_password_cb *cb, void *u)
{
QString pem = keytype::byPKEY(x).traditionalPemName();
return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
pem.toLatin1(), bp, (char*)x, enc, kstr, klen, cb, u);
}
#endif
bool pki_evp::pem(BioByteArray &b, const pki_export *xport)
{
EVP_PKEY *pkey;
int keytype;
if (xport->match_all(F_PEM | F_PRIVATE)) {
pkey = decryptKey();
keytype = EVP_PKEY_id(pkey);
switch (keytype) {
case EVP_PKEY_RSA:
PEM_write_bio_RSAPrivateKey(b,
EVP_PKEY_get0_RSA(pkey),
NULL, NULL, 0, NULL, NULL);
break;
case EVP_PKEY_DSA:
PEM_write_bio_DSAPrivateKey(b,
EVP_PKEY_get0_DSA(pkey),
NULL, NULL, 0, NULL, NULL);
break;
#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC:
PEM_write_bio_ECPrivateKey(b,
EVP_PKEY_get0_EC_KEY(pkey),
NULL, NULL, 0, NULL, NULL);
break;
#ifdef EVP_PKEY_ED25519
case EVP_PKEY_ED25519:
if (xport->match_all(F_PRIVATE))
return false;
write_SSH2_ed25519_private(b, pkey, NULL);
break;
#endif
#endif
}
PEM_write_bio_PrivateKey_traditional(b, pkey, nullptr,
nullptr, 0, nullptr, nullptr);
EVP_PKEY_free(pkey);
} else if (xport->match_all(F_PKCS8 | F_PRIVATE)) {
const EVP_CIPHER *algo = xport->match_all(F_CRYPT) ?
@ -875,19 +862,6 @@ void pki_evp::writeDefault(const QString &dirname) const
mycb, true);
}
#ifndef LIBRESSL_VERSION_NUMBER
int PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x,
const EVP_CIPHER *enc,
unsigned char *kstr, int klen,
pem_password_cb *cb, void *u)
{
QString pem = keytype::byPKEY(x).traditionalPemName();
return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
pem.toLatin1(), bp, (char*)x, enc, kstr, klen, cb, u);
}
#endif
void pki_evp::writeKey(XFile &file, const EVP_CIPHER *enc,
pem_password_cb *cb, bool pem) const
{

4
lib/pki_key.h
View File

@ -61,7 +61,9 @@ class keytype
}
QString traditionalPemName() const
{
return name + " PRIVATE KEY";
return type == EVP_PKEY_ED25519 ?
QString("PRIVATE KEY") :
QString("%1 PRIVATE KEY").arg(name);
}
static const keytype byType(int type)
{