From: Daniel Fiala <daniel@openssl.org>
Date: Fri, 7 Oct 2022 11:24:20 +0000 (+0200)
Subject: PKCS12_SAFEBAG_set0_attrs: Remove const from function signature
X-Git-Tag: openssl-3.2.0-alpha1~1915
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9eaf07ffe39e76aca2dfb8e22b8060c75fcbd8e0;p=thirdparty%2Fopenssl.git

PKCS12_SAFEBAG_set0_attrs: Remove const from function signature

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19359)
---

diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 74cb55a8b5b..ea0d027c10f 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -120,10 +120,10 @@ PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag)
     return bag->attrib;
 }
 
-void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, const STACK_OF(X509_ATTRIBUTE) *attrs)
+void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, STACK_OF(X509_ATTRIBUTE) *attrs)
 {
     if (bag->attrib != attrs)
        sk_X509_ATTRIBUTE_free(bag->attrib);
 
-    bag->attrib = (STACK_OF(X509_ATTRIBUTE) *)attrs;
+    bag->attrib = attrs;
 }
diff --git a/doc/man3/PKCS12_SAFEBAG_set0_attrs.pod b/doc/man3/PKCS12_SAFEBAG_set0_attrs.pod
index 98e212a9b79..406e4c5b0d6 100644
--- a/doc/man3/PKCS12_SAFEBAG_set0_attrs.pod
+++ b/doc/man3/PKCS12_SAFEBAG_set0_attrs.pod
@@ -9,7 +9,7 @@ PKCS12_SAFEBAG_set0_attrs
 
  #include <openssl/pkcs12.h>
 
- void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, const STACK_OF(X509_ATTRIBUTE) *attrs);
+ void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, STACK_OF(X509_ATTRIBUTE) *attrs);
 
 =head1 DESCRIPTION
 
diff --git a/include/openssl/pkcs12.h.in b/include/openssl/pkcs12.h.in
index f3a72bb0efd..990fb84e325 100644
--- a/include/openssl/pkcs12.h.in
+++ b/include/openssl/pkcs12.h.in
@@ -199,7 +199,7 @@ ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs,
 char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
 const STACK_OF(X509_ATTRIBUTE) *
 PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag);
-void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, const STACK_OF(X509_ATTRIBUTE) *attrs);
+void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, STACK_OF(X509_ATTRIBUTE) *attrs);
 unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor,
                                 const char *pass, int passlen,
                                 const unsigned char *in, int inlen,