diff options
| author | jsg <> | 2019-01-19 21:17:05 +0000 |
|---|---|---|
| committer | jsg <> | 2019-01-19 21:17:05 +0000 |
| commit | 4aff26d7a53f297f1074c3c584f67f097626fffd (patch) | |
| tree | 704c396b63437ae149c47e8ed6c50f3e6460edd7 | |
| parent | a6a557ef07c2adbd57730f1dba28d5a2a0ffeb77 (diff) | |
| download | openbsd-4aff26d7a53f297f1074c3c584f67f097626fffd.tar.gz openbsd-4aff26d7a53f297f1074c3c584f67f097626fffd.tar.bz2 openbsd-4aff26d7a53f297f1074c3c584f67f097626fffd.zip | |
change the default digest used by
openssl x509 -fingerprint
openssl crl -fingerprint
from sha1 to sha256
ok jsing@
Diffstat (limited to '')
| -rw-r--r-- | src/usr.bin/openssl/crl.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/x509.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/crl.c b/src/usr.bin/openssl/crl.c index 645b16ea54..cb1c18fa40 100644 --- a/src/usr.bin/openssl/crl.c +++ b/src/usr.bin/openssl/crl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crl.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */ | 1 | /* $OpenBSD: crl.c,v 1.12 2019/01/19 21:17:05 jsg Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -243,7 +243,7 @@ crl_main(int argc, char **argv) | |||
| 243 | } | 243 | } |
| 244 | } | 244 | } |
| 245 | 245 | ||
| 246 | digest = EVP_sha1(); | 246 | digest = EVP_sha256(); |
| 247 | 247 | ||
| 248 | memset(&crl_config, 0, sizeof(crl_config)); | 248 | memset(&crl_config, 0, sizeof(crl_config)); |
| 249 | crl_config.informat = FORMAT_PEM; | 249 | crl_config.informat = FORMAT_PEM; |
diff --git a/src/usr.bin/openssl/x509.c b/src/usr.bin/openssl/x509.c index 84aeed3c07..b25a7c828c 100644 --- a/src/usr.bin/openssl/x509.c +++ b/src/usr.bin/openssl/x509.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509.c,v 1.16 2018/02/07 05:47:55 jsing Exp $ */ | 1 | /* $OpenBSD: x509.c,v 1.17 2019/01/19 21:17:05 jsg Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -788,7 +788,7 @@ x509_main(int argc, char **argv) | |||
| 788 | const EVP_MD *fdig = digest; | 788 | const EVP_MD *fdig = digest; |
| 789 | 789 | ||
| 790 | if (!fdig) | 790 | if (!fdig) |
| 791 | fdig = EVP_sha1(); | 791 | fdig = EVP_sha256(); |
| 792 | 792 | ||
| 793 | if (!X509_digest(x, fdig, md, &n)) { | 793 | if (!X509_digest(x, fdig, md, &n)) { |
| 794 | BIO_printf(bio_err, "out of memory\n"); | 794 | BIO_printf(bio_err, "out of memory\n"); |
