diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-11 13:02:11 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-11 13:02:11 +0000 |
| commit | aced43c14072eb06fcde5b3c1eda22143a31cc7a (patch) | |
| tree | 82d6a7f94c61d41f570cbe96b69f1b8ed8e67241 /lib/libssl | |
| parent | daabe206b2d05ea5dfbe2f3d354d9672d4b5a8d7 (diff) | |
Fix version number processing in cms_sd_set_version(); OpenSSL PR #3249 via
OpenSSL trunk.
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/src/crypto/cms/cms_sd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/src/crypto/cms/cms_sd.c b/lib/libssl/src/crypto/cms/cms_sd.c index 63c3f69bae2..7e490c09886 100644 --- a/lib/libssl/src/crypto/cms/cms_sd.c +++ b/lib/libssl/src/crypto/cms/cms_sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_sd.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: cms_sd.c,v 1.7 2014/07/11 13:02:10 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -150,8 +150,8 @@ cms_sd_set_version(CMS_SignedData *sd) si->version = 3; if (sd->version < 3) sd->version = 3; - } else - sd->version = 1; + } else if (si->version < 1) + si->version = 1; } if (sd->version < 1) |