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/engine | |
| 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/engine')
| -rw-r--r-- | crypto/engine/eng_cnf.c | 2 | ||||
| -rw-r--r-- | crypto/engine/eng_dyn.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c index 221981942c..de215952ab 100644 --- a/crypto/engine/eng_cnf.c +++ b/crypto/engine/eng_cnf.c @@ -11,6 +11,8 @@ #include <openssl/conf.h> #include <openssl/trace.h> +DEFINE_STACK_OF(CONF_VALUE) + /* ENGINE config module */ static const char *skip_dot(const char *name) diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 15504410d9..f7595b7420 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -17,6 +17,8 @@ * prototypes. */ +DEFINE_STACK_OF_STRING() + /* Our ENGINE handlers */ static int dynamic_init(ENGINE *e); static int dynamic_finish(ENGINE *e); |