X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcms%2Fcms_env.c;h=b143a91f243167b437077bd31bebeae0ccf86ccf;hp=111b2aa5735fcaecf0c91f8349dd71703306118a;hb=35096e912c4eba6c5ffd961d36fc92f1ddf34240;hpb=b4b576d3b7c6ab57f419015d4d49846278ddd0d4

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;
 }