Skip to content

Commit

Permalink
PKCS12_SAFEBAG_set0_attrs: Remove const from function signature
Browse files Browse the repository at this point in the history
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from openssl#19359)
  • Loading branch information
faramir-dev authored and beldmit committed Dec 26, 2022
1 parent 54f827d commit f2c0f4d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions crypto/pkcs12/p12_attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion doc/man3/PKCS12_SAFEBAG_set0_attrs.pod
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion include/openssl/pkcs12.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit f2c0f4d

Please sign in to comment.