diff options
| author | Pauli <pauli@openssl.org> | 2021-06-16 00:44:28 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-06-16 15:42:38 +0200 |
| commit | a6f8e131f40bbca55867af7d1504a58acd4c3b3d (patch) | |
| tree | 228dcae672d7f2d285e6c30cef3a67d1d8860714 /providers/encoders.inc | |
| parent | VMS build: drop a spurious debug print (diff) | |
| download | openssl-a6f8e131f40bbca55867af7d1504a58acd4c3b3d.tar.xz openssl-a6f8e131f40bbca55867af7d1504a58acd4c3b3d.zip | |
prov: tag SM2 encoders and decoders as non-FIPS
They're impossible to use in a FIPS environment, so they shouldn't be flagged
as compatible.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15782)
Diffstat (limited to '')
| -rw-r--r-- | providers/encoders.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/providers/encoders.inc b/providers/encoders.inc index a1034f45de..193a9175a7 100644 --- a/providers/encoders.inc +++ b/providers/encoders.inc @@ -61,7 +61,7 @@ ENCODER_TEXT("ED448", ed448, yes), ENCODER_TEXT("X25519", x25519, yes), ENCODER_TEXT("X448", x448, yes), # ifndef OPENSSL_NO_SM2 -ENCODER_TEXT("SM2", sm2, yes), +ENCODER_TEXT("SM2", sm2, no), # endif #endif @@ -110,9 +110,9 @@ ENCODER_w_structure("EC", ec, yes, pem, type_specific_no_pub), /* EC supports blob output for the public key */ ENCODER("EC", ec, yes, blob), # ifndef OPENSSL_NO_SM2 -ENCODER_w_structure("SM2", sm2, yes, der, type_specific_no_pub), -ENCODER_w_structure("SM2", sm2, yes, pem, type_specific_no_pub), -ENCODER("SM2", sm2, yes, blob), +ENCODER_w_structure("SM2", sm2, no, der, type_specific_no_pub), +ENCODER_w_structure("SM2", sm2, no, pem, type_specific_no_pub), +ENCODER("SM2", sm2, no, blob), # endif #endif @@ -189,10 +189,10 @@ ENCODER_w_structure("ED448", ed448, yes, der, SubjectPublicKeyInfo), ENCODER_w_structure("ED448", ed448, yes, pem, SubjectPublicKeyInfo), # ifndef OPENSSL_NO_SM2 -ENCODER_w_structure("SM2", sm2, yes, der, PrivateKeyInfo), -ENCODER_w_structure("SM2", sm2, yes, pem, PrivateKeyInfo), -ENCODER_w_structure("SM2", sm2, yes, der, SubjectPublicKeyInfo), -ENCODER_w_structure("SM2", sm2, yes, pem, SubjectPublicKeyInfo), +ENCODER_w_structure("SM2", sm2, no, der, PrivateKeyInfo), +ENCODER_w_structure("SM2", sm2, no, pem, PrivateKeyInfo), +ENCODER_w_structure("SM2", sm2, no, der, SubjectPublicKeyInfo), +ENCODER_w_structure("SM2", sm2, no, pem, SubjectPublicKeyInfo), # endif #endif |