diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-08-22 14:28:23 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-09-02 20:46:34 +0200 |
| commit | 363e941ed43c648adf4d6d0874077ddd80041e1f (patch) | |
| tree | 0c2eb8ae502830118e895b4e79a77a337b9b972f /crypto/cversion.c | |
| parent | 586dd674f57e0df08b76388f2680dc1b2c8c81f5 (diff) | |
Add CPU info to the speed command summary
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9669)
Diffstat (limited to 'crypto/cversion.c')
| -rw-r--r-- | crypto/cversion.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/cversion.c b/crypto/cversion.c index aef84e9c60..2a0dcf9445 100644 --- a/crypto/cversion.c +++ b/crypto/cversion.c @@ -43,6 +43,8 @@ const char *OPENSSL_version_build_metadata(void) return OPENSSL_VERSION_BUILD_METADATA_STR; } +extern char ossl_cpu_info_str[]; + const char *OpenSSL_version(int t) { switch (t) { @@ -76,6 +78,11 @@ const char *OpenSSL_version(int t) #else return "MODULESDIR: N/A"; #endif + case OPENSSL_CPU_INFO: + if (OPENSSL_info(OPENSSL_INFO_CPU_SETTINGS) != NULL) + return ossl_cpu_info_str; + else + return "CPUINFO: N/A"; } return "not available"; } |