summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Fiala <daniel@openssl.org>2022-10-07 13:24:20 +0200
committerHugo Landau <hlandau@openssl.org>2022-10-13 13:21:54 +0100
commit9eaf07ffe39e76aca2dfb8e22b8060c75fcbd8e0 (patch)
treea79c10891b9107a9f5a694f3d01c5a76399abea1
parentaf6379368f81025808689e843a5d86c6402a63a7 (diff)
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)
-rw-r--r--crypto/pkcs12/p12_attr.c4
-rw-r--r--doc/man3/PKCS12_SAFEBAG_set0_attrs.pod2
-rw-r--r--include/openssl/pkcs12.h.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 74cb55a8b5..ea0d027c10 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 98e212a9b7..406e4c5b0d 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 f3a72bb0ef..990fb84e32 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,