diff options
| author | tb <> | 2022-03-23 15:16:59 +0000 |
|---|---|---|
| committer | tb <> | 2022-03-23 15:16:59 +0000 |
| commit | 2abb826326bb2e6e2dae212d227d36c328da958e (patch) | |
| tree | d319aae03cd180d12c2ed66c3bb1da325eeec324 /src | |
| parent | 81e4a05dff593f3e62ed9485ebea2c4ea2415c6d (diff) | |
| download | openbsd-2abb826326bb2e6e2dae212d227d36c328da958e.tar.gz openbsd-2abb826326bb2e6e2dae212d227d36c328da958e.tar.bz2 openbsd-2abb826326bb2e6e2dae212d227d36c328da958e.zip | |
openssl cms: avoid NULL derefs on option parsing
Two missing initializations in the new option handling cause a
segfault when -nodetach or -noindef is passed to openssl cms.
ok inoguchi jsing miod
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/cms.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/cms.c b/src/usr.bin/openssl/cms.c index 5b876941fb..a3004e8af3 100644 --- a/src/usr.bin/openssl/cms.c +++ b/src/usr.bin/openssl/cms.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms.c,v 1.29 2022/01/16 07:11:49 inoguchi Exp $ */ | 1 | /* $OpenBSD: cms.c,v 1.30 2022/03/23 15:16:59 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -769,12 +769,14 @@ static const struct option cms_options[] = { | |||
| 769 | .name = "nodetach", | 769 | .name = "nodetach", |
| 770 | .desc = "Use opaque signing", | 770 | .desc = "Use opaque signing", |
| 771 | .type = OPTION_VALUE_AND, | 771 | .type = OPTION_VALUE_AND, |
| 772 | .opt.value = &cms_config.flags, | ||
| 772 | .value = ~CMS_DETACHED, | 773 | .value = ~CMS_DETACHED, |
| 773 | }, | 774 | }, |
| 774 | { | 775 | { |
| 775 | .name = "noindef", | 776 | .name = "noindef", |
| 776 | .desc = "Disable CMS streaming", | 777 | .desc = "Disable CMS streaming", |
| 777 | .type = OPTION_VALUE_AND, | 778 | .type = OPTION_VALUE_AND, |
| 779 | .opt.value = &cms_config.flags, | ||
| 778 | .value = ~CMS_STREAM, | 780 | .value = ~CMS_STREAM, |
| 779 | }, | 781 | }, |
| 780 | { | 782 | { |
