openssl version info to be desplayed in about (some nerves are blank after heartbleed); refs #30
This commit is contained in:
		| @@ -71,6 +71,27 @@ | ||||
| //! @ref gopenssl @copydoc gpcsc | ||||
| namespace openssl { | ||||
|  | ||||
|   /// Get OpenSSL runtime and buildtime version information | ||||
|   /** To be displyed in an about box. It also shows mandatory license | ||||
|       information. */ | ||||
|   inline std::string version() { | ||||
|     std::string v | ||||
|       ((std::string(OPENSSL_VERSION_TEXT)==SSLeay_version(SSLEAY_VERSION)) | ||||
|        ? SSLeay_version(SSLEAY_VERSION) | ||||
|        : std::string(OPENSSL_VERSION_TEXT) + " (Buildtime)" | ||||
|        + "\n  - Runtime: " + SSLeay_version(SSLEAY_VERSION)); | ||||
|     return v | ||||
|       + "\n  - OpenSSL API "+SHLIB_VERSION_NUMBER+" compatible" | ||||
|       + "\n  - " + SSLeay_version(SSLEAY_BUILT_ON) | ||||
|       + "\n  - " + SSLeay_version(SSLEAY_PLATFORM) | ||||
|       + "\n\n" | ||||
|       "This product includes software developed by the OpenSSL Project" | ||||
|       " for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||||
|       "\n\n" | ||||
|       "This product includes cryptographic software written by Eric Young" | ||||
|       " (eay@cryptsoft.com)"; | ||||
|   } | ||||
|  | ||||
|   //============================================================================ | ||||
|   //! @addtogroup opensslexceptions | ||||
|   //@{ | ||||
|   | ||||
| @@ -495,7 +495,7 @@ namespace pcsc { | ||||
|           try { | ||||
|             if (crypto::hex(c.reader(*it)->status().atr).find(atr) | ||||
|                 !=string::npos) | ||||
|               CRYPTOLOG("found reader: "<<*it); | ||||
|               CRYPTOLOG("found reader: "<<(*it)); | ||||
|               res.push_back(*it); | ||||
|           } catch (std::exception& x) { // ignore unusable readers | ||||
|             CRYPTOLOG("ignored unusable reader: "<<x.what()); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user