diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-11 12:41:58 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-11 20:36:10 +0100 |
| commit | 8fc06e8860d91aefa32f0de2dd7d46a719b81cad (patch) | |
| tree | 974edc6e5d7247be997b216550ed167cfa8e57aa /crypto | |
| parent | 2ab851b779a77d119e1677b2495b368a46d83eef (diff) | |
Update pkcs8 defaults.
Update pkcs8 utility to use 256 bit AES using SHA256 by default.
Update documentation.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/p5_pbev2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 244706a3df..9bf6d00cff 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -140,7 +140,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, if ((prf_nid == -1) && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PBE_PRF_NID, 0, &prf_nid) <= 0) { ERR_clear_error(); - prf_nid = NID_hmacWithSHA1; + prf_nid = NID_hmacWithSHA256; } EVP_CIPHER_CTX_free(ctx); ctx = NULL; |