diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-06-13 09:51:12 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-13 18:36:35 -0400 |
| commit | 35096e912c4eba6c5ffd961d36fc92f1ddf34240 (patch) | |
| tree | e82ad992b3b5e0722445c8ae29733e5634df98b1 | |
| parent | b4b576d3b7c6ab57f419015d4d49846278ddd0d4 (diff) | |
| download | openssl-new-35096e912c4eba6c5ffd961d36fc92f1ddf34240.tar.gz | |
GH1141: Different fix, preferred by Richard.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/cms/cms_env.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index 111b2aa573..b143a91f24 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -833,10 +833,10 @@ static void cms_env_set_version(CMS_EnvelopedData *env) env->version = 2; } } - if (env->version == 2) - return; if (env->originatorInfo || env->unprotectedAttrs) env->version = 2; + if (env->version == 2) + return; env->version = 0; } |