提交 e20d7d71 编写于 作者: G Geoff Thorpe

sk_value was also suffering from de-const-ification.

Also, add in a couple of missing declarations in pkcs7 code.
上级 b1086116
...@@ -74,6 +74,7 @@ char *param_name; /* Param name e.g. "micalg" */ ...@@ -74,6 +74,7 @@ char *param_name; /* Param name e.g. "micalg" */
char *param_value; /* Param value e.g. "sha1" */ char *param_value; /* Param value e.g. "sha1" */
} MIME_PARAM; } MIME_PARAM;
DECLARE_STACK_OF(MIME_PARAM)
IMPLEMENT_STACK_OF(MIME_PARAM) IMPLEMENT_STACK_OF(MIME_PARAM)
typedef struct { typedef struct {
...@@ -82,6 +83,7 @@ char *value; /* Value of line e.g. "text/plain" */ ...@@ -82,6 +83,7 @@ char *value; /* Value of line e.g. "text/plain" */
STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */ STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */
} MIME_HEADER; } MIME_HEADER;
DECLARE_STACK_OF(MIME_HEADER)
IMPLEMENT_STACK_OF(MIME_HEADER) IMPLEMENT_STACK_OF(MIME_HEADER)
static int B64_write_PKCS7(BIO *bio, PKCS7 *p7); static int B64_write_PKCS7(BIO *bio, PKCS7 *p7);
......
...@@ -285,7 +285,7 @@ int sk_num(const STACK *st) ...@@ -285,7 +285,7 @@ int sk_num(const STACK *st)
return st->num; return st->num;
} }
char *sk_value(STACK *st, int i) char *sk_value(const STACK *st, int i)
{ {
if(st == NULL) return NULL; if(st == NULL) return NULL;
return st->data[i]; return st->data[i];
......
...@@ -80,7 +80,7 @@ typedef struct stack_st ...@@ -80,7 +80,7 @@ typedef struct stack_st
#define M_sk_value(sk,n) ((sk) ? (sk)->data[n] : NULL) #define M_sk_value(sk,n) ((sk) ? (sk)->data[n] : NULL)
int sk_num(const STACK *); int sk_num(const STACK *);
char *sk_value(STACK *, int); char *sk_value(const STACK *, int);
char *sk_set(STACK *, int, char *); char *sk_set(STACK *, int, char *);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册