diff options
| author | Hans Nilsson <[email protected]> | 2019-06-19 09:01:08 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-06-19 09:01:08 +0200 |
| commit | aefc28f97448696b79b9303eac29054b6f42959e (patch) | |
| tree | 1c68a3a666172a1cb165e1fa780c1a7aa4bacfd8 /lib/os_mon/src | |
| parent | 8887ec80b5ffcf9b7e78a2e2a3ec3591fcfb5163 (diff) | |
| parent | 52944a455694069b0eb22726ba72452065125f1a (diff) | |
| download | otp-aefc28f97448696b79b9303eac29054b6f42959e.tar.gz otp-aefc28f97448696b79b9303eac29054b6f42959e.tar.bz2 otp-aefc28f97448696b79b9303eac29054b6f42959e.zip | |
Merge branch 'hans/crypto/FIPS_digests/OTP-15911' into maint
* hans/crypto/FIPS_digests/OTP-15911:
crypto: Fix FIPS flags for digests
crypto: Rename cipher fips macro
Diffstat (limited to 'lib/os_mon/src')
0 files changed, 0 insertions, 0 deletions