diff options
author | Matt Caswell <matt@openssl.org> | 2020-09-03 14:10:41 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:39 +0100 |
commit | 24c4ea958ecae0b194cc3eb812a81766cdb421f6 (patch) | |
tree | 29be67ecc7efed3b5ae25bb3d976281d1499437d /apps | |
parent | e144fd36ceb4d71a75b04503995a52ad6699fb22 (diff) |
Fix stacks of OPENSSL_STRING, OPENSSL_CSTRING and OPENSSL_BLOCK
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'apps')
-rw-r--r-- | apps/asn1pars.c | 1 | ||||
-rw-r--r-- | apps/ca.c | 1 | ||||
-rw-r--r-- | apps/cms.c | 1 | ||||
-rw-r--r-- | apps/crl2p7.c | 2 | ||||
-rw-r--r-- | apps/dgst.c | 2 | ||||
-rw-r--r-- | apps/engine.c | 3 | ||||
-rw-r--r-- | apps/fipsinstall.c | 2 | ||||
-rw-r--r-- | apps/kdf.c | 2 | ||||
-rw-r--r-- | apps/lib/apps.c | 1 | ||||
-rw-r--r-- | apps/lib/names.c | 2 | ||||
-rw-r--r-- | apps/lib/s_cb.c | 2 | ||||
-rw-r--r-- | apps/list.c | 2 | ||||
-rw-r--r-- | apps/mac.c | 2 | ||||
-rw-r--r-- | apps/ocsp.c | 1 | ||||
-rw-r--r-- | apps/pkcs12.c | 1 | ||||
-rw-r--r-- | apps/pkeyutl.c | 2 | ||||
-rw-r--r-- | apps/provider.c | 2 | ||||
-rw-r--r-- | apps/rehash.c | 2 | ||||
-rw-r--r-- | apps/req.c | 1 | ||||
-rw-r--r-- | apps/s_client.c | 1 | ||||
-rw-r--r-- | apps/s_server.c | 2 | ||||
-rw-r--r-- | apps/smime.c | 2 | ||||
-rw-r--r-- | apps/verify.c | 2 | ||||
-rw-r--r-- | apps/x509.c | 1 |
24 files changed, 0 insertions, 40 deletions
diff --git a/apps/asn1pars.c b/apps/asn1pars.c index 9f21f0c730..9acc3c0080 100644 --- a/apps/asn1pars.c +++ b/apps/asn1pars.c @@ -19,7 +19,6 @@ #include <openssl/asn1t.h> DEFINE_STACK_OF(ASN1_OBJECT) -DEFINE_STACK_OF_STRING() typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, @@ -35,7 +35,6 @@ #include "progs.h" DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF_STRING() #ifndef W_OK # define F_OK 0 diff --git a/apps/cms.c b/apps/cms.c index 350f9ed75b..2706e5af86 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -24,7 +24,6 @@ # include <openssl/cms.h> DEFINE_STACK_OF(CMS_SignerInfo) -DEFINE_STACK_OF_STRING() static int save_certs(char *signerfile, STACK_OF(X509) *signers); static int cms_cb(int ok, X509_STORE_CTX *ctx); diff --git a/apps/crl2p7.c b/apps/crl2p7.c index 545fe0a53b..9137f87239 100644 --- a/apps/crl2p7.c +++ b/apps/crl2p7.c @@ -19,8 +19,6 @@ #include <openssl/pem.h> #include <openssl/objects.h> -DEFINE_STACK_OF_STRING() - static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile); typedef enum OPTION_choice { diff --git a/apps/dgst.c b/apps/dgst.c index 0654d4c8b9..0bbde71d4b 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -21,8 +21,6 @@ #include <openssl/hmac.h> #include <ctype.h> -DEFINE_STACK_OF_STRING() - #undef BUFSIZE #define BUFSIZE 1024*8 diff --git a/apps/engine.c b/apps/engine.c index d51586d855..393008d5ce 100644 --- a/apps/engine.c +++ b/apps/engine.c @@ -22,9 +22,6 @@ #include <openssl/ssl.h> #include <openssl/store.h> -DEFINE_STACK_OF_STRING() -DEFINE_STACK_OF_CSTRING() - typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_C, OPT_T, OPT_TT, OPT_PRE, OPT_POST, diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c index 2df7d0f024..832f560b5a 100644 --- a/apps/fipsinstall.c +++ b/apps/fipsinstall.c @@ -19,8 +19,6 @@ #include "apps.h" #include "progs.h" -DEFINE_STACK_OF_STRING() - #define BUFSIZE 4096 /* Configuration file values */ diff --git a/apps/kdf.c b/apps/kdf.c index 8d11807f5f..ba14cfdc76 100644 --- a/apps/kdf.c +++ b/apps/kdf.c @@ -17,8 +17,6 @@ #include <openssl/kdf.h> #include <openssl/params.h> -DEFINE_STACK_OF_STRING() - typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_KDFOPT, OPT_BIN, OPT_KEYLEN, OPT_OUT, diff --git a/apps/lib/apps.c b/apps/lib/apps.c index d69ded2a5c..9bc976317d 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -63,7 +63,6 @@ static int WIN32_rename(const char *from, const char *to); DEFINE_STACK_OF(CONF) DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF_STRING() typedef struct { const char *name; diff --git a/apps/lib/names.c b/apps/lib/names.c index 42b9e9065c..5e2e7e147c 100644 --- a/apps/lib/names.c +++ b/apps/lib/names.c @@ -12,8 +12,6 @@ #include <openssl/safestack.h> #include "names.h" -DEFINE_STACK_OF_CSTRING() - #ifdef _WIN32 # define strcasecmp _stricmp #endif diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c index b53d4cbd40..ec52cef158 100644 --- a/apps/lib/s_cb.c +++ b/apps/lib/s_cb.c @@ -26,8 +26,6 @@ #define COOKIE_SECRET_LENGTH 16 -DEFINE_STACK_OF_STRING() - VERIFY_CB_ARGS verify_args = { -1, 0, X509_V_OK, 0 }; #ifndef OPENSSL_NO_SOCK diff --git a/apps/list.c b/apps/list.c index c891bf7213..fd018991e1 100644 --- a/apps/list.c +++ b/apps/list.c @@ -25,8 +25,6 @@ #include "opt.h" #include "names.h" -DEFINE_STACK_OF_CSTRING() - static int verbose = 0; static void legacy_cipher_fn(const EVP_CIPHER *c, diff --git a/apps/mac.c b/apps/mac.c index 30f0daabcc..e751dcf0b1 100644 --- a/apps/mac.c +++ b/apps/mac.c @@ -16,8 +16,6 @@ #include <openssl/evp.h> #include <openssl/params.h> -DEFINE_STACK_OF_STRING() - #undef BUFSIZE #define BUFSIZE 1024*8 diff --git a/apps/ocsp.c b/apps/ocsp.c index ad699629f6..6943267bde 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -35,7 +35,6 @@ DEFINE_STACK_OF(OCSP_CERTID) DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF_STRING() #if defined(__TANDEM) # if defined(OPENSSL_TANDEM_FLOSS) diff --git a/apps/pkcs12.c b/apps/pkcs12.c index fddfdbca36..dd08b96ff8 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -22,7 +22,6 @@ DEFINE_STACK_OF(PKCS7) DEFINE_STACK_OF(PKCS12_SAFEBAG) -DEFINE_STACK_OF_STRING() #define NOKEYS 0x1 #define NOCERTS 0x2 diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c index 9bfef87311..5f53867790 100644 --- a/apps/pkeyutl.c +++ b/apps/pkeyutl.c @@ -15,8 +15,6 @@ #include <openssl/evp.h> #include <sys/stat.h> -DEFINE_STACK_OF_STRING() - #define KEY_NONE 0 #define KEY_PRIVKEY 1 #define KEY_PUBKEY 2 diff --git a/apps/provider.c b/apps/provider.c index 748b95023e..f1374a365c 100644 --- a/apps/provider.c +++ b/apps/provider.c @@ -24,8 +24,6 @@ # include <string.h> /* memset */ #endif -DEFINE_STACK_OF_CSTRING() - typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_V = 100, OPT_VV, OPT_VVV diff --git a/apps/rehash.c b/apps/rehash.c index efa0b65497..3cbd65c860 100644 --- a/apps/rehash.c +++ b/apps/rehash.c @@ -42,8 +42,6 @@ # include <openssl/pem.h> # include <openssl/x509.h> -DEFINE_STACK_OF_STRING() - # ifndef PATH_MAX # define PATH_MAX 4096 # endif diff --git a/apps/req.c b/apps/req.c index 2cc9ebf43d..5f3c7b5fc8 100644 --- a/apps/req.c +++ b/apps/req.c @@ -36,7 +36,6 @@ #endif DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF_STRING() #define BITS "default_bits" #define KEYFILE "default_keyfile" diff --git a/apps/s_client.c b/apps/s_client.c index 32aa6fafcb..ecd737ef69 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -60,7 +60,6 @@ typedef unsigned int u_int; #endif DEFINE_STACK_OF(SCT) -DEFINE_STACK_OF_STRING() #undef BUFSIZZ #define BUFSIZZ 1024*8 diff --git a/apps/s_server.c b/apps/s_server.c index c970080d83..dde0ee60c0 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -60,8 +60,6 @@ typedef unsigned int u_int; #endif #include "internal/sockets.h" -DEFINE_STACK_OF_STRING() - static int not_resumable_sess_cb(SSL *s, int is_forward_secure); static int sv_body(int s, int stype, int prot, unsigned char *context); static int www_body(int s, int stype, int prot, unsigned char *context); diff --git a/apps/smime.c b/apps/smime.c index ed3d63af6c..9113038db7 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -19,8 +19,6 @@ #include <openssl/x509_vfy.h> #include <openssl/x509v3.h> -DEFINE_STACK_OF_STRING() - static int save_certs(char *signerfile, STACK_OF(X509) *signers); static int smime_cb(int ok, X509_STORE_CTX *ctx); diff --git a/apps/verify.c b/apps/verify.c index c43a4e69a4..3d4e7d4060 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -18,8 +18,6 @@ #include <openssl/x509v3.h> #include <openssl/pem.h> -DEFINE_STACK_OF_STRING() - static int cb(int ok, X509_STORE_CTX *ctx); static int check(X509_STORE *ctx, const char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, diff --git a/apps/x509.c b/apps/x509.c index 4b2200c35b..a8f515a90b 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -29,7 +29,6 @@ #endif DEFINE_STACK_OF(ASN1_OBJECT) -DEFINE_STACK_OF_STRING() #undef POSTFIX #define POSTFIX ".srl" |