[openssl-commits] [openssl] master update

[Paul I. Dale]

The branch master has been updated
       via  59701e6363531cddef5b2114c0127b8453deb1f3 (commit)
      from  354e010757b95d27fb36d364412ee7a5e7111963 (commit)


- Log -----------------------------------------------------------------
commit 59701e6363531cddef5b2114c0127b8453deb1f3
Author: Eric Brown <browne at vmware.com>
Date:   Thu Aug 16 08:34:39 2018 -0700

    Remove redundant ASN1_INTEGER_set call
    
    This trivial patch removes a duplicated call to ASN1_INTEGER_set.
    
    Fixes Issue #6977
    
    Signed-off-by: Eric Brown <browne at vmware.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/6984)

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

Summary of changes:
 crypto/pkcs7/pk7_lib.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 88dd613..ba4b505 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -134,7 +134,6 @@ int PKCS7_set_type(PKCS7 *p7, int type)
         if ((p7->d.signed_and_enveloped = PKCS7_SIGN_ENVELOPE_new())
             == NULL)
             goto err;
-        ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1);
         if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1))
             goto err;
         p7->d.signed_and_enveloped->enc_data->content_type