-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #81 from cconlon/1.7release
Prep for 1.7 Release
- Loading branch information
Showing
19 changed files
with
592 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,8 +137,12 @@ section titled `/* Configuration */`: | |
``` | ||
#define WOLFSSL_KEY_GEN | ||
#define HAVE_CRL | ||
#define OPENSSL_ALL | ||
``` | ||
|
||
If also building wolfSSL JNI/JSSE, additional defines may be needed. Please | ||
reference the Windows build documentation for wolfSSL JNI/JSSE if so. | ||
|
||
After editing and saving the `user_settings.h` file, select one of the following | ||
DLL Library configurations and build the wolfSSL library solution: | ||
|
||
|
@@ -204,8 +208,12 @@ and set the values for `HAVE_FIPS`, `HAVE_FIPS_VERSION`, and | |
``` | ||
#define WOLFSSL_KEY_GEN | ||
#define HAVE_CRL | ||
#define OPENSSL_ALL | ||
``` | ||
|
||
If also building wolfSSL JNI/JSSE, additional defines may be needed. Please | ||
reference the Windows build documentation for wolfSSL JNI/JSSE if so. | ||
|
||
6. Build the `wolfssl-fips` project, which will create a DLL in one of the | ||
following locations: | ||
|
||
|
@@ -230,28 +238,33 @@ in the wolfCrypt tests successfully running. | |
See the FIPS User Guide for more details on the FIPS verifyCore hash, or | ||
email [email protected]. | ||
|
||
## wolfSSL FIPS 140-3 (Upcoming) | ||
## wolfSSL FIPS 140-3 (Certificate #4718) | ||
|
||
To build a version of wolfSSL that has been submitted for FIPS 140-3, use | ||
the Visual Studio solution file under the `IDE\WIN10` directory inside the | ||
wolfSSL package: | ||
To build a wolfSSL FIPS 140-3 variant for use with FIPS 140-3 certificate | ||
#4718, use the Visual Studio solution file located in the `IDE/WIN10` | ||
directory inside the wolfSSL package: | ||
|
||
``` | ||
<wolfssl>\IDE\WIN10\wolfssl-fips.sln | ||
``` | ||
|
||
Follow instructions in the above section for 140-2 / 3389, except use the | ||
following values for `HAVE_FIPS`, `HAVE_FIPS_VERSION`, and | ||
`HAVE_FIPS_VERSION_MINOR` in `user_settings.h`: | ||
following values for `HAVE_FIPS`, `HAVE_FIPS_VERSION`, | ||
`HAVE_FIPS_VERSION_MAJOR`, `HAVE_FIPS_VERSION_MINOR`, and | ||
`HAVE_FIPS_VERSION_PATCH` in `user_settings.h`: | ||
|
||
``` | ||
#if 1 | ||
#undef HAVE_FIPS | ||
#define HAVE_FIPS | ||
#undef HAVE_FIPS_VERSION | ||
#define HAVE_FIPS_VERSION 5 | ||
#undef HAVE_FIPS_VERSION_MAJOR | ||
#define HAVE_FIPS_VERSION_MAJOR 5 | ||
#undef HAVE_FIPS_VERSION_MINOR | ||
#define HAVE_FIPS_VERSION_MINOR 1 | ||
#define HAVE_FIPS_VERSION_MINOR 2 | ||
#undef HAVE_FIPS_VERSION_PATCH | ||
#define HAVE_FIPS_VERSION_PATCH 0 | ||
#endif | ||
``` | ||
|
||
|
@@ -261,8 +274,12 @@ The following additional defines will also need to be added to | |
``` | ||
#define WOLFSSL_KEY_GEN | ||
#define HAVE_CRL | ||
#define OPENSSL_ALL | ||
``` | ||
|
||
If also building wolfSSL JNI/JSSE, additional defines may be needed. Please | ||
reference the Windows build documentation for wolfSSL JNI/JSSE if so. | ||
|
||
For additional help, contact [email protected]. | ||
|
||
# Building wolfCrypt JNI/JCE Library | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.