GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#191 X509Certificate::import() now auto-detects format

Browse Source
This commit is contained in:
Vincent Richard 2018-03-12 20:37:12 +01:00
parent abba40e97d
commit f04190bafa
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/book/net.tex
View File

@ -931,17 +931,7 @@ vmime::shared_ptr <vmime::security::cert::X509Certificate>
vmime::utility::inputStreamAdapter is(certFile); vmime::utility::inputStreamAdapter is(certFile);
vmime::shared_ptr <vmime::security::cert::X509Certificate> cert; vmime::shared_ptr <vmime::security::cert::X509Certificate> cert;
// Try DER format cert = vmime::security::cert::X509Certificate::import(is);
cert = vmime::security::cert::X509Certificate::import
(is, vmime::security::cert::X509Certificate::FORMAT_DER);
if (cert != NULL)
return cert;
// Try PEM format
is.reset();
cert = vmime::security::cert::X509Certificate::import
(is, vmime::security::cert::X509Certificate::FORMAT_PEM);
return cert; return cert;
} }