generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make STACK_OF opaque.

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-03-05 15:17:33 +00:00
parent d62bc5d30f
commit 31c2b6ee7a
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/stack/safestack.h
View File

@ -88,16 +88,8 @@ extern "C" {
# define STACK_OF(type) struct stack_st_##type # define STACK_OF(type) struct stack_st_##type
# define PREDECLARE_STACK_OF(type) STACK_OF(type); # define PREDECLARE_STACK_OF(type) STACK_OF(type);
# define DECLARE_STACK_OF(type) \ # define DECLARE_STACK_OF(type) STACK_OF(type);
STACK_OF(type) \ # define DECLARE_SPECIAL_STACK_OF(type, type2) STACK_OF(type);
{ \
_STACK stack; \
};
# define DECLARE_SPECIAL_STACK_OF(type, type2) \
STACK_OF(type) \
{ \
_STACK stack; \
};
/*- /*-
* Strings are special: normally an lhash entry will point to a single * Strings are special: normally an lhash entry will point to a single

8
crypto/stack/stack.c
View File

@ -60,6 +60,14 @@
#include <openssl/stack.h> #include <openssl/stack.h>
#include <openssl/objects.h> #include <openssl/objects.h>
struct stack_st {
int num;
char **data;
int sorted;
int num_alloc;
int (*comp) (const void *, const void *);
};
#undef MIN_NODES #undef MIN_NODES
#define MIN_NODES 4 #define MIN_NODES 4

11
crypto/stack/stack.h
View File

@ -63,16 +63,7 @@
extern "C" { extern "C" {
#endif #endif
typedef struct stack_st { typedef struct stack_st _STACK; /* Use STACK_OF(...) instead */
int num;
char **data;
int sorted;
int num_alloc;
int (*comp) (const void *, const void *);
} _STACK; /* Use STACK_OF(...) instead */
# define M_sk_num(sk) ((sk) ? (sk)->num:-1)
# define M_sk_value(sk,n) ((sk) ? (sk)->data[n] : NULL)
int sk_num(const _STACK *); int sk_num(const _STACK *);
void *sk_value(const _STACK *, int); void *sk_value(const _STACK *, int);