diff options
Diffstat (limited to 'pica-client/openssltool.cpp')
| -rw-r--r-- | pica-client/openssltool.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pica-client/openssltool.cpp b/pica-client/openssltool.cpp index 2c19223..705437e 100644 --- a/pica-client/openssltool.cpp +++ b/pica-client/openssltool.cpp @@ -20,12 +20,16 @@ QString OpenSSLTool::NameFromCertFile(QString cert_file) return QString(); QByteArray result = openssl.readAll(); - QRegExp rx("CN = [0-9]+\\#([^\\s\\#]+)"); - + QRegExp rxOld("CN = [0-9]+\\#([^\\s\\#]+)"); + QRegExp rx("CN = ([^\\s\\#]+)"); QString name=QString::fromUtf8( result.constData()); - if (name.contains(rx)) + if (name.contains(rxOld)) + { + name=rxOld.cap(1); + } + else if (name.contains(rx)) { name=rx.cap(1); } @@ -48,12 +52,16 @@ QString OpenSSLTool::NameFromCertString(QString cert_pem) return QString(); QByteArray result = openssl.readAll(); - QRegExp rx("CN = [0-9]+\\#([^\\s\\#]+)"); - + QRegExp rxOld("CN = [0-9]+\\#([^\\s\\#]+)"); + QRegExp rx("CN = ([^\\s\\#]+)"); QString name=QString::fromUtf8( result.constData()); - if (name.contains(rx)) + if (name.contains(rxOld)) + { + name=rxOld.cap(1); + } + else if (name.contains(rx)) { name=rx.cap(1); } |