[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  35096e912c4eba6c5ffd961d36fc92f1ddf34240 (commit)
      from  b4b576d3b7c6ab57f419015d4d49846278ddd0d4 (commit)


- Log -----------------------------------------------------------------
commit 35096e912c4eba6c5ffd961d36fc92f1ddf34240
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Jun 13 09:51:12 2016 -0400

    GH1141: Different fix, preferred by Richard.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/cms/cms_env.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 111b2aa..b143a91 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;
 }