GH1141: Different fix, preferred by Richard.

Reviewed-by: NRichard Levitte <levitte@openssl.org>

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