diff options
| author | miod <> | 2014-07-11 13:02:10 +0000 |
|---|---|---|
| committer | miod <> | 2014-07-11 13:02:10 +0000 |
| commit | deecf17e93eed9b19a5e5259c8d5b03a6b23f12c (patch) | |
| tree | ffd51bcc666fdde6374096d1564ad82712eca4b1 /src/lib | |
| parent | ebc8a4576687c9fe05cd2c1717f90e4195597b75 (diff) | |
| download | openbsd-deecf17e93eed9b19a5e5259c8d5b03a6b23f12c.tar.gz openbsd-deecf17e93eed9b19a5e5259c8d5b03a6b23f12c.tar.bz2 openbsd-deecf17e93eed9b19a5e5259c8d5b03a6b23f12c.zip | |
Fix version number processing in cms_sd_set_version(); OpenSSL PR #3249 via
OpenSSL trunk.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/cms/cms_sd.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/cms/cms_sd.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c index 63c3f69bae..7e490c0988 100644 --- a/src/lib/libcrypto/cms/cms_sd.c +++ b/src/lib/libcrypto/cms/cms_sd.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms_sd.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: cms_sd.c,v 1.7 2014/07/11 13:02:10 miod 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 | */ |
| @@ -150,8 +150,8 @@ cms_sd_set_version(CMS_SignedData *sd) | |||
| 150 | si->version = 3; | 150 | si->version = 3; |
| 151 | if (sd->version < 3) | 151 | if (sd->version < 3) |
| 152 | sd->version = 3; | 152 | sd->version = 3; |
| 153 | } else | 153 | } else if (si->version < 1) |
| 154 | sd->version = 1; | 154 | si->version = 1; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | if (sd->version < 1) | 157 | if (sd->version < 1) |
diff --git a/src/lib/libssl/src/crypto/cms/cms_sd.c b/src/lib/libssl/src/crypto/cms/cms_sd.c index 63c3f69bae..7e490c0988 100644 --- a/src/lib/libssl/src/crypto/cms/cms_sd.c +++ b/src/lib/libssl/src/crypto/cms/cms_sd.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms_sd.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: cms_sd.c,v 1.7 2014/07/11 13:02:10 miod 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 | */ |
| @@ -150,8 +150,8 @@ cms_sd_set_version(CMS_SignedData *sd) | |||
| 150 | si->version = 3; | 150 | si->version = 3; |
| 151 | if (sd->version < 3) | 151 | if (sd->version < 3) |
| 152 | sd->version = 3; | 152 | sd->version = 3; |
| 153 | } else | 153 | } else if (si->version < 1) |
| 154 | sd->version = 1; | 154 | si->version = 1; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | if (sd->version < 1) | 157 | if (sd->version < 1) |