generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-09 11:17:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/kampbell/poco into develop

Browse Source
This commit is contained in:
Francis ANDRE 2017-03-29 17:37:56 +02:00
commit 746c3b8047
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Crypto/include/Poco/Crypto/X509Certificate.h
View File

@ -46,7 +46,9 @@ public:
NID_LOCALITY_NAME = 15, NID_LOCALITY_NAME = 15,
NID_STATE_OR_PROVINCE = 16, NID_STATE_OR_PROVINCE = 16,
NID_ORGANIZATION_NAME = 17, NID_ORGANIZATION_NAME = 17,
NID_ORGANIZATION_UNIT_NAME = 18 NID_ORGANIZATION_UNIT_NAME = 18,
NID_PKCS9_EMAIL_ADDRESS = 48,
NID_SERIAL_NUMBER = 105
}; };
explicit X509Certificate(std::istream& istr); explicit X509Certificate(std::istream& istr);

4
Crypto/testsuite/src/CryptoTest.cpp
View File

@ -292,6 +292,8 @@ void CryptoTest::testCertificate()
std::string stateOrProvince(cert.subjectName(X509Certificate::NID_STATE_OR_PROVINCE)); std::string stateOrProvince(cert.subjectName(X509Certificate::NID_STATE_OR_PROVINCE));
std::string organizationName(cert.subjectName(X509Certificate::NID_ORGANIZATION_NAME)); std::string organizationName(cert.subjectName(X509Certificate::NID_ORGANIZATION_NAME));
std::string organizationUnitName(cert.subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME)); std::string organizationUnitName(cert.subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME));
std::string emailAddress(cert.subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS));
std::string serialNumber(cert.subjectName(X509Certificate::NID_SERIAL_NUMBER));
assert (subjectName == "/CN=appinf.com/O=Applied Informatics Software Engineering GmbH/OU=Development/ST=Carinthia/C=AT/L=St. Jakob im Rosental/emailAddress=guenter.obiltschnig@appinf.com"); assert (subjectName == "/CN=appinf.com/O=Applied Informatics Software Engineering GmbH/OU=Development/ST=Carinthia/C=AT/L=St. Jakob im Rosental/emailAddress=guenter.obiltschnig@appinf.com");
assert (issuerName == subjectName); assert (issuerName == subjectName);
@ -301,6 +303,8 @@ void CryptoTest::testCertificate()
assert (stateOrProvince == "Carinthia"); assert (stateOrProvince == "Carinthia");
assert (organizationName == "Applied Informatics Software Engineering GmbH"); assert (organizationName == "Applied Informatics Software Engineering GmbH");
assert (organizationUnitName == "Development"); assert (organizationUnitName == "Development");
assert (emailAddress == "guenter.obiltschnig@appinf.com");
assert (serialNumber == "");
// fails with recent OpenSSL versions: // fails with recent OpenSSL versions:
// assert (cert.issuedBy(cert)); // assert (cert.issuedBy(cert));

1
Foundation/Makefile
View File

@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
ifdef POCO_UNBUNDLED ifdef POCO_UNBUNDLED
SYSLIBS += -lpcre -lz SYSLIBS += -lpcre -lz
objects += $(pcre_utf8_objects)
else else
objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects) objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
endif endif

4
PageCompiler/File2Page/Makefile
View File

@ -10,10 +10,6 @@ include $(POCO_BASE)/build/rules/global
objects = File2Page objects = File2Page
ifdef POCO_UNBUNDLED
SYSLIBS += -lz -lpcre -lexpat
endif
target = f2cpsp target = f2cpsp
target_version = 1 target_version = 1
target_libs = PocoUtil PocoXML PocoJSON PocoFoundation target_libs = PocoUtil PocoXML PocoJSON PocoFoundation