From eb268995b45105d39cb0bcd988afa1ec15db5e64 Mon Sep 17 00:00:00 2001 From: Anton Date: Tue, 17 Mar 2015 01:49:46 +0400 Subject: fixed regexps preventing names with spaces --- pica-client/openssltool.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pica-client/openssltool.cpp') diff --git a/pica-client/openssltool.cpp b/pica-client/openssltool.cpp index 94352a3..dafd0ef 100644 --- a/pica-client/openssltool.cpp +++ b/pica-client/openssltool.cpp @@ -3,6 +3,9 @@ #include #include +#define REGEXOLD "CN = [0-9]+\\#([^\\#\\$&\"\'=\\(\\)\\\\/\\|`!<>\\{\\}\\[\\]\\+\r\n]+)" +#define REGEXNEW "CN = ([^\\#\\$&\"\'=\\(\\)\\\\/\\|`!<>\\{\\}\\[\\]\\+\r\n]+)" + OpenSSLTool::OpenSSLTool() { } @@ -20,8 +23,8 @@ QString OpenSSLTool::NameFromCertFile(QString cert_file) return QString(); QByteArray result = openssl.readAll(); - QRegExp rxOld("CN = [0-9]+\\#([^\\s\\#]+)"); - QRegExp rx("CN = ([^\\s\\#]+)"); + QRegExp rxOld(REGEXOLD); + QRegExp rx(REGEXNEW); QString name=QString::fromUtf8( result.constData()); @@ -52,8 +55,8 @@ QString OpenSSLTool::NameFromCertString(QString cert_pem) return QString(); QByteArray result = openssl.readAll(); - QRegExp rxOld("CN = [0-9]+\\#([^\\s\\#]+)"); - QRegExp rx("CN = ([^\\s\\#]+)"); + QRegExp rxOld(REGEXOLD); + QRegExp rx(REGEXNEW); QString name=QString::fromUtf8( result.constData()); -- cgit v1.2.1