diff --git a/lib/func_base.cpp b/lib/func_base.cpp index ae96cfa3..c72b4ec4 100644 --- a/lib/func_base.cpp +++ b/lib/func_base.cpp @@ -291,3 +291,12 @@ QString appendXcaComment(QString current, QString msg) current += "\n"; return current + QString("(%1)\n").arg(msg); } + +QString toHexBlock(const QByteArray &ba) +{ + QByteArray hex; + for(int i = 0; i < ba.size(); i += 16) + hex += ba.mid(i, 16).toHex(':') + '\n'; + hex.chop(1); + return QString::fromLatin1(hex); +} diff --git a/lib/func_base.h b/lib/func_base.h index da92623f..7de9a388 100644 --- a/lib/func_base.h +++ b/lib/func_base.h @@ -60,6 +60,7 @@ void *d2i_bytearray(void *(*d2i)(void*, unsigned char**, long), QString appendXcaComment(QString current, QString msg); QString get_ossl_verify_error(int err); +QString toHexBlock(const QByteArray &ba); /* from version.cpp */ const char *version_str(bool html); diff --git a/lib/pki_key.cpp b/lib/pki_key.cpp index 60c66a6b..e20868fd 100644 --- a/lib/pki_key.cpp +++ b/lib/pki_key.cpp @@ -362,19 +362,10 @@ void pki_key::writePublic(XFile &file, bool pem) const file.write(b); } -QString pki_key::BN2QString(const BIGNUM *bn) const -{ - QByteArray hex, ba = BioByteArray(bn); - for(int i = 0; isetToolTip(CurveComment(nid)); - keyModulus->setText(key->BignumParamQString(OSSL_PKEY_PARAM_PUB_KEY)); + keyModulus->setText(toHexBlock(key->QByteArrayParam(OSSL_PKEY_PARAM_PUB_KEY))); break; #ifdef EVP_PKEY_ED25519 case EVP_PKEY_ED25519: @@ -136,7 +136,7 @@ void KeyDetail::setKey(pki_key *key, bool import) tlPrivEx->setText(tr("Private key")); tlPubEx->setText(tr("Curve name")); keyPubEx->setText("ed25519"); - keyModulus->setText(key->ed25519PubKey().toHex()); + keyModulus->setText(toHexBlock(key->ed25519PubKey())); break; #endif #endif