diff options
| author | Anton <anton@picapica> | 2015-03-17 01:49:46 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2015-03-17 01:49:46 +0400 |
| commit | eb268995b45105d39cb0bcd988afa1ec15db5e64 (patch) | |
| tree | c5177feb87bbb25d3b90b3e91b0ff4ca3e631a17 /pica-client/openssltool.cpp | |
| parent | 540e7dc57888fcdac1e15c5cf971b3d62a8d7307 (diff) | |
| download | pica-pica-eb268995b45105d39cb0bcd988afa1ec15db5e64.tar.gz pica-pica-eb268995b45105d39cb0bcd988afa1ec15db5e64.zip | |
fixed regexps preventing names with spaces
Diffstat (limited to 'pica-client/openssltool.cpp')
| -rw-r--r-- | pica-client/openssltool.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
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 <QRegExp> #include <QMessageBox> +#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()); |