diff options
| author | Vincent Richard <[email protected]> | 2018-03-12 19:37:12 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2018-03-12 19:37:12 +0000 |
| commit | f04190bafa2ac2142856bb79cb7643ae9e13a58a (patch) | |
| tree | 5b44f8ece5cf48c0a4e80a4b7fb1f7bb41ed922f | |
| parent | Added unit test related to PR #192. (diff) | |
| download | vmime-f04190bafa2ac2142856bb79cb7643ae9e13a58a.tar.gz vmime-f04190bafa2ac2142856bb79cb7643ae9e13a58a.zip | |
#191 X509Certificate::import() now auto-detects format
| -rw-r--r-- | doc/book/net.tex | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/doc/book/net.tex b/doc/book/net.tex index 1e5f1803..ac3b70c3 100644 --- a/doc/book/net.tex +++ b/doc/book/net.tex @@ -931,17 +931,7 @@ vmime::shared_ptr <vmime::security::cert::X509Certificate> vmime::utility::inputStreamAdapter is(certFile); vmime::shared_ptr <vmime::security::cert::X509Certificate> cert; - // Try DER format - 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); + cert = vmime::security::cert::X509Certificate::import(is); return cert; } |