diff options
| author |   miod <miod@openbsd.org> | 2014-07-11 13:02:10 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-07-11 13:02:10 +0000 |
| commit | d74697d52f73aeef131ee160e546e8d33e3edfd8 (patch) | |
| tree | b1dc81bf1d1e9f89f04e7e5530ce665cf36beeb6 | |
| parent | delete all traces of oldrdist -Server command. ok beck guenther (diff) | |
| download | wireguard-openbsd-d74697d52f73aeef131ee160e546e8d33e3edfd8.tar.xz wireguard-openbsd-d74697d52f73aeef131ee160e546e8d33e3edfd8.zip | |
Fix version number processing in cms_sd_set_version(); OpenSSL PR #3249 via
OpenSSL trunk.
| -rw-r--r-- | lib/libcrypto/cms/cms_sd.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/cms/cms_sd.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcrypto/cms/cms_sd.c b/lib/libcrypto/cms/cms_sd.c index 63c3f69bae2..7e490c09886 100644 --- a/lib/libcrypto/cms/cms_sd.c +++ b/lib/libcrypto/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) 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) |