Commit e20d7d71 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

sk_value was also suffering from de-const-ification. 

Also, add in a couple of missing declarations in pkcs7 code.
parent b1086116

crypto/pkcs7/pk7_mime.c

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ char *param_name; /* Param name e.g. "micalg" */ 
char *param_value;			/* Param value e.g. "sha1" */

} MIME_PARAM;



DECLARE_STACK_OF(MIME_PARAM)

IMPLEMENT_STACK_OF(MIME_PARAM)



typedef struct {
@@ -82,6 +83,7 @@ char *value; /* Value of line e.g. "text/plain" */ 
STACK_OF(MIME_PARAM) *params;		/* Zero or more parameters */

} MIME_HEADER;



DECLARE_STACK_OF(MIME_HEADER)

IMPLEMENT_STACK_OF(MIME_HEADER)



static int B64_write_PKCS7(BIO *bio, PKCS7 *p7);

crypto/stack/stack.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ int sk_num(const STACK *st) 
	return st->num;

}



char *sk_value(STACK *st, int i)

char *sk_value(const STACK *st, int i)

{

	if(st == NULL) return NULL;

	return st->data[i];

crypto/stack/stack.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ typedef struct stack_st 
#define M_sk_value(sk,n)	((sk) ? (sk)->data[n] : NULL)



int sk_num(const STACK *);

char *sk_value(STACK *, int);

char *sk_value(const STACK *, int);



char *sk_set(STACK *, int, char *);