diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-12-19 17:30:24 -0500 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-04-24 16:42:46 +0200 |
| commit | 852c2ed260860b6b85c84f9fe96fb4d23d49c9f2 (patch) | |
| tree | d8104686e0a02217c13f51e5d10d7434fa13e3dc /fuzz | |
| parent | 4692e98bdbaebb6f078e89a75c54395839e68b24 (diff) | |
| download | openssl-new-852c2ed260860b6b85c84f9fe96fb4d23d49c9f2.tar.gz | |
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 'fuzz')
| -rw-r--r-- | fuzz/client.c | 2 | ||||
| -rw-r--r-- | fuzz/cmp.c | 2 | ||||
| -rw-r--r-- | fuzz/server.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/fuzz/client.c b/fuzz/client.c index 451989773a..f80e8a0a48 100644 --- a/fuzz/client.c +++ b/fuzz/client.c @@ -20,6 +20,8 @@ #include "rand.inc" +DEFINE_STACK_OF(SSL_COMP) + /* unused, to avoid warning. */ static int idx; diff --git a/fuzz/cmp.c b/fuzz/cmp.c index 0088dd9478..6883a286ff 100644 --- a/fuzz/cmp.c +++ b/fuzz/cmp.c @@ -18,6 +18,8 @@ #include "fuzzer.h" #include "rand.inc" +DEFINE_STACK_OF(OSSL_CMP_ITAV) + int FuzzerInitialize(int *argc, char ***argv) { OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); diff --git a/fuzz/server.c b/fuzz/server.c index 335f1f165d..fe4fa5c70b 100644 --- a/fuzz/server.c +++ b/fuzz/server.c @@ -24,6 +24,8 @@ #include "rand.inc" +DEFINE_STACK_OF(SSL_COMP) + static const uint8_t kCertificateDER[] = { 0x30, 0x82, 0x02, 0xff, 0x30, 0x82, 0x01, 0xe7, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x11, 0x00, 0xb1, 0x84, 0xee, 0x34, 0x99, 0x98, 0x76, 0xfb, |