summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7
diff options
context:
space:
mode:
authorinoguchi <>2020-01-21 10:18:52 +0000
committerinoguchi <>2020-01-21 10:18:52 +0000
commit59792af6ba04f21a2d45c97fccc72ac33f22cc48 (patch)
treef88acea6a57103e83645ed9fe7f43bd600a7a6f9 /src/lib/libcrypto/pkcs7
parent460496e02df69c7c7be18c9b45a095914ee59be4 (diff)
downloadopenbsd-59792af6ba04f21a2d45c97fccc72ac33f22cc48.tar.gz
openbsd-59792af6ba04f21a2d45c97fccc72ac33f22cc48.tar.bz2
openbsd-59792af6ba04f21a2d45c97fccc72ac33f22cc48.zip
Remove redundant ASN1_INTEGER_set call in PKCS7_set_type
ok bcook@
Diffstat (limited to 'src/lib/libcrypto/pkcs7')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_lib.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 28f812a811..afcc179240 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_lib.c,v 1.20 2019/03/13 20:34:00 tb Exp $ */ 1/* $OpenBSD: pk7_lib.c,v 1.21 2020/01/21 10:18:52 inoguchi Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -186,7 +186,6 @@ PKCS7_set_type(PKCS7 *p7, int type)
186 if ((p7->d.signed_and_enveloped = 186 if ((p7->d.signed_and_enveloped =
187 PKCS7_SIGN_ENVELOPE_new()) == NULL) 187 PKCS7_SIGN_ENVELOPE_new()) == NULL)
188 goto err; 188 goto err;
189 ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1);
190 if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1)) 189 if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1))
191 goto err; 190 goto err;
192 p7->d.signed_and_enveloped->enc_data->content_type = 191 p7->d.signed_and_enveloped->enc_data->content_type =