diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-12-19 23:30:24 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-04-24 16:42:46 +0200 |
| commit | 852c2ed260860b6b85c84f9fe96fb4d23d49c9f2 (patch) | |
| tree | d8104686e0a02217c13f51e5d10d7434fa13e3dc /crypto/dso | |
| parent | Fix typo from #10631 (diff) | |
| download | openssl-852c2ed260860b6b85c84f9fe96fb4d23d49c9f2.tar.xz openssl-852c2ed260860b6b85c84f9fe96fb4d23d49c9f2.zip | |
In OpenSSL builds, declare STACK for datatypes ...
... and only *define* them in the source files that need them.
Use DEFINE_OR_DECLARE which is set appropriately for internal builds
and not non-deprecated builds.
Deprecate stack-of-block
Better documentation
Move some ASN1 struct typedefs to types.h
Update ParseC to handle this. Most of all, ParseC needed to be more
consistent. The handlers are "recursive", in so far that they are called
again and again until they terminate, which depends entirely on what the
"massager" returns. There's a comment at the beginning of ParseC that
explains how that works. {Richard Levtte}
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10669)
Diffstat (limited to 'crypto/dso')
| -rw-r--r-- | crypto/dso/dso_dlfcn.c | 2 | ||||
| -rw-r--r-- | crypto/dso/dso_lib.c | 2 | ||||
| -rw-r--r-- | crypto/dso/dso_win32.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index b01c2f6ac5..57fa43fa41 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -19,6 +19,8 @@ #include "dso_local.h" #include "e_os.h" +DEFINE_STACK_OF(void) + #ifdef DSO_DLFCN # ifdef HAVE_DLFCN_H diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c index a464c391be..82215dde7d 100644 --- a/crypto/dso/dso_lib.c +++ b/crypto/dso/dso_lib.c @@ -10,6 +10,8 @@ #include "dso_local.h" #include "internal/refcount.h" +DEFINE_STACK_OF(void) + static DSO_METHOD *default_DSO_meth = NULL; static DSO *DSO_new_method(DSO_METHOD *meth) diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index adf2e63688..5826d410b5 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -69,6 +69,8 @@ static void *win32_globallookup(const char *name); static const char *openssl_strnchr(const char *string, int c, size_t len); +DEFINE_STACK_OF(void) + static DSO_METHOD dso_meth_win32 = { "OpenSSL 'win32' shared library method", win32_load, |