Skip to content

Commit 6173477

Browse files
committed
Merged PR 11341465: Add SymCrypt version to FIPS status indicator string
## Description: Update FIPS status indicator string to include SymCrypt version ## Admin Checklist: - [ ] You have updated documentation in symcrypt.h to reflect any changes in behavior - [ ] You have updated CHANGELOG.md to reflect any changes in behavior - [ ] You have updated symcryptunittest to exercise any new functionality - [ ] If you have introduced any symbols in symcrypt.h you have updated production and test dynamic export symbols (exports.ver / exports.def / symcrypt.src) and tested the updated dynamic modules with symcryptunittest - [ ] If you have introduced functionality that varies based on CPU features, you have manually tested with and without relevant features - [ ] If you have made significant changes to a particular algorithm, you have checked that performance numbers reported by symcryptunittest are in line with expectations - [ ] If you have added new algorithms/modes, you have updated the status indicator text for the associated modules if necessary Related work items: #53283328
1 parent 957e09e commit 6173477

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

conf/buildInfo.h.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "symcrypt_internal_shared.inc"
22

3-
#define _SYMCRYPT_JOIN(a, b) #a "." #b
4-
#define _SYMCRYPT_EXPAND_JOIN(a, b) _SYMCRYPT_JOIN(a, b)
3+
#define _SYMCRYPT_STRING_INT(a) #a
4+
#define _SYMCRYPT_STRING(a) _SYMCRYPT_STRING_INT(a)
55
#define SYMCRYPT_BUILD_INFO_BRANCH "@SYMCRYPT_BUILD_INFO_BRANCH@"
66
#define SYMCRYPT_BUILD_INFO_COMMIT "@SYMCRYPT_BUILD_INFO_COMMIT@"
7-
#define SYMCRYPT_BUILD_INFO_VERSION _SYMCRYPT_EXPAND_JOIN(_SYMCRYPT_EXPAND_JOIN(SYMCRYPT_CODE_VERSION_API, SYMCRYPT_CODE_VERSION_MINOR), SYMCRYPT_CODE_VERSION_PATCH)
7+
#define SYMCRYPT_BUILD_INFO_VERSION _SYMCRYPT_STRING(SYMCRYPT_CODE_VERSION_API) "." _SYMCRYPT_STRING(SYMCRYPT_CODE_VERSION_MINOR) "." _SYMCRYPT_STRING(SYMCRYPT_CODE_VERSION_PATCH)
88
#define SYMCRYPT_BUILD_INFO_TIMESTAMP "@SYMCRYPT_BUILD_INFO_TIMESTAMP@"

lib/status_indicator.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,20 @@
170170
#define FIPS_SERVICE_TEXT_ZEROIZING_CRYPTOGRAPHIC_MATERIAL ""
171171
#endif
172172

173+
#ifndef STRING_INT
174+
#define STRING_INT( x ) #x
175+
#define STRING( x ) STRING_INT( x )
176+
#endif
177+
178+
// SymCrypt version string
179+
#define FIPS_SYMCRYPT_VERSION \
180+
"SymCrypt v" \
181+
STRING(SYMCRYPT_CODE_VERSION_API) "." \
182+
STRING(SYMCRYPT_CODE_VERSION_MINOR) "." \
183+
STRING(SYMCRYPT_CODE_VERSION_PATCH) "\n\n"
173184

174185
static const char _szStatusIndicator[] = \
186+
FIPS_SYMCRYPT_VERSION \
175187
FIPS_SERVICE_TEXT_ALGORITHM_PROVIDERS_AND_PROPERTIES \
176188
FIPS_SERVICE_TEXT_ENCRYPTION_AND_DECRYPTION \
177189
FIPS_SERVICE_TEXT_ENTROPY_SOURCE \

0 commit comments

Comments
 (0)