From 4ee1d02b3379a761d8853f25d03899b9659ed8c8 Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Fri, 18 Jun 2010 15:33:33 +0200 Subject: jl153 #i112218# correctly displaying issuer/subject names when they use multi-value RDN --- xmlsecurity/source/dialogs/resourcemanager.cxx | 6 +++--- .../xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 2 +- .../test_docs/certs/end_certs/User_32_Root_11.crt | Bin 0 -> 591 bytes .../test_docs/certs/end_certs/User_33_Root_11.crt | Bin 0 -> 620 bytes .../test_docs/certs/end_certs/User_34_Root_11.crt | Bin 0 -> 637 bytes xmlsecurity/test_docs/certs/p12/Root_11.p12 | Bin 0 -> 1797 bytes xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 | Bin 0 -> 1605 bytes xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 | Bin 0 -> 1732 bytes xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 | Bin 0 -> 1714 bytes .../test_docs/documents/dn_multivalue_rdn.odt | Bin 0 -> 9272 bytes .../documents/dn_single_multivalue_rdn.odt | Bin 0 -> 9299 bytes .../dn_single_multivalue_rdn_with_quoting.odt | Bin 0 -> 9313 bytes xmlsecurity/test_docs/test_description.odt | Bin 24746 -> 25782 bytes 13 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 xmlsecurity/test_docs/certs/end_certs/User_32_Root_11.crt create mode 100755 xmlsecurity/test_docs/certs/end_certs/User_33_Root_11.crt create mode 100755 xmlsecurity/test_docs/certs/end_certs/User_34_Root_11.crt create mode 100644 xmlsecurity/test_docs/certs/p12/Root_11.p12 create mode 100644 xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 create mode 100644 xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 create mode 100644 xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 create mode 100755 xmlsecurity/test_docs/documents/dn_multivalue_rdn.odt create mode 100755 xmlsecurity/test_docs/documents/dn_single_multivalue_rdn.odt create mode 100755 xmlsecurity/test_docs/documents/dn_single_multivalue_rdn_with_quoting.odt mode change 100755 => 100644 xmlsecurity/test_docs/test_description.odt (limited to 'xmlsecurity') diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index bfc4cb92fd20..e41cf546f74f 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -149,7 +149,7 @@ namespace XmlSec */ #ifdef WNT vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) - { +{ vector< pair > retVal; bool bInEscape = false; bool bInValue = false; @@ -197,7 +197,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) bInEscape = false; } } - else if (c == ',') + else if (c == ',' || c == '+') { //The comma separate the attribute value pairs. //If the comma is not part of a value (the value would then be enclosed in '"'), @@ -292,7 +292,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) bInEscape = false; } } - else if (c == ',') + else if (c == ',' || c == '+') { //The comma separate the attribute value pairs. //If the comma is not part of a value (the value would then be enclosed in '"'), diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index 8f983dae05de..d5928b027075 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -107,7 +107,7 @@ findTypeInDN(const OUString& rRawString, const OUString& sTypeName) bInEscape = false; } } - else if (c == ',') + else if (c == ',' || c == '+') { //The comma separate the attribute value pairs. //If the comma is not part of a value (the value would then be enclosed in '"'), diff --git a/xmlsecurity/test_docs/certs/end_certs/User_32_Root_11.crt b/xmlsecurity/test_docs/certs/end_certs/User_32_Root_11.crt new file mode 100755 index 000000000000..dc28470c8b47 Binary files /dev/null and b/xmlsecurity/test_docs/certs/end_certs/User_32_Root_11.crt differ diff --git a/xmlsecurity/test_docs/certs/end_certs/User_33_Root_11.crt b/xmlsecurity/test_docs/certs/end_certs/User_33_Root_11.crt new file mode 100755 index 000000000000..df9d81d8d1a8 Binary files /dev/null and b/xmlsecurity/test_docs/certs/end_certs/User_33_Root_11.crt differ diff --git a/xmlsecurity/test_docs/certs/end_certs/User_34_Root_11.crt b/xmlsecurity/test_docs/certs/end_certs/User_34_Root_11.crt new file mode 100755 index 000000000000..018da383d7fa Binary files /dev/null and b/xmlsecurity/test_docs/certs/end_certs/User_34_Root_11.crt differ diff --git a/xmlsecurity/test_docs/certs/p12/Root_11.p12 b/xmlsecurity/test_docs/certs/p12/Root_11.p12 new file mode 100644 index 000000000000..7df592643ef7 Binary files /dev/null and b/xmlsecurity/test_docs/certs/p12/Root_11.p12 differ diff --git a/xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 b/xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 new file mode 100644 index 000000000000..17e22f7a5bec Binary files /dev/null and b/xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 differ diff --git a/xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 b/xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 new file mode 100644 index 000000000000..5982532a97d9 Binary files /dev/null and b/xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 differ diff --git a/xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 b/xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 new file mode 100644 index 000000000000..4c00b21d457e Binary files /dev/null and b/xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 differ diff --git a/xmlsecurity/test_docs/documents/dn_multivalue_rdn.odt b/xmlsecurity/test_docs/documents/dn_multivalue_rdn.odt new file mode 100755 index 000000000000..4d34bc0f580a Binary files /dev/null and b/xmlsecurity/test_docs/documents/dn_multivalue_rdn.odt differ diff --git a/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn.odt b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn.odt new file mode 100755 index 000000000000..798f25a35312 Binary files /dev/null and b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn.odt differ diff --git a/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn_with_quoting.odt b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn_with_quoting.odt new file mode 100755 index 000000000000..591f9aa4d63d Binary files /dev/null and b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn_with_quoting.odt differ diff --git a/xmlsecurity/test_docs/test_description.odt b/xmlsecurity/test_docs/test_description.odt old mode 100755 new mode 100644 index 9c2eff18ddcc..45bbb5b0d4b6 Binary files a/xmlsecurity/test_docs/test_description.odt and b/xmlsecurity/test_docs/test_description.odt differ -- cgit v1.2.3