Clean dead macros and defines

... mostly related to some old discarded modules .

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1906)
(cherry picked from commit 31a51151fc163a7f5f4d07dff9478be50e4b5707)

diff --git a/include/openssl/err.h b/include/openssl/err.h
index 904cf3a59e0c26e4fcf6bf69a3b6b4b8a8f15f2c..9bbe9e10912f9e17806bcfb0900ee0f474c17749 100644 (file)
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -89,7 +89,7 @@ typedef struct err_state_st {
 # define ERR_LIB_CMS             46
 # define ERR_LIB_TS              47
 # define ERR_LIB_HMAC            48
-# define ERR_LIB_JPAKE           49
+/* # define ERR_LIB_JPAKE       49 */
 # define ERR_LIB_CT              50
 # define ERR_LIB_ASYNC           51
 # define ERR_LIB_KDF             52
@@ -128,7 +128,6 @@ typedef struct err_state_st {
 # define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
 # define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
 # define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
 # define CTerr(f,r) ERR_PUT_error(ERR_LIB_CT,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
 # define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
 # define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

diff --git a/util/indent.pro b/util/indent.pro
index 932c9b0f00d2d703dd40109550b56f151a15f92a..de0c7dbdc78d247381d91c6fd1c73384a6b3eac2 100644 (file)
--- a/util/indent.pro
+++ b/util/indent.pro
@@ -35,24 +35,6 @@
 -ts0
 -T ACCESS_DESCRIPTION
 -T ADDED_OBJ
--T AEP_BBOOL
--T AEP_CHAR
--T AEP_CHAR_PTR
--T AEP_CONNECTION_ENTRY
--T AEP_CONNECTION_HNDL
--T AEP_CONNECTION_HNDL_PTR
--T AEP_FLAGS
--T AEP_RV
--T AEP_TRANSACTION_ID
--T AEP_TRANSACTION_ID_PTR
--T AEP_U16
--T AEP_U32
--T AEP_U32_PTR
--T AEP_U64_PTR
--T AEP_U8
--T AEP_U8_PTR
--T AEP_VOID_PTR
--T AEP_VOID_PTR_PTR
 -T AES_KEY
 -T APP_INFO
 -T ARGS
@@ -285,10 +267,6 @@
 -T HEAPLIST32
 -T HEARTBEAT_TEST_FIXTURE
 -T HMAC_CTX
--T ICA_KEY_RSA_CRT
--T ICA_KEY_RSA_CRT_REC
--T ICA_KEY_RSA_MODEXPO
--T ICA_KEY_RSA_MODEXPO_REC
 -T IDEA_KEY_SCHEDULE
 -T IPAddrBlocks
 -T IPAddressFamily
@@ -362,7 +340,6 @@
 -T OPENSSL_ITEM
 -T OPENSSL_PSTRING
 -T OPENSSL_STRING
--T OPENSSL_STRING
 -T OSSL_ASYNC_FD
 -T OTHERNAME
 -T P256_POINT
@@ -434,8 +411,6 @@
 -T SSL
 -T SSL2_STATE
 -T SSL3_BUFFER
--T SSL3_BUF_FREELIST
--T SSL3_BUF_FREELIST_ENTRY
 -T SSL3_COMP
 -T SSL3_ENC_METHOD
 -T SSL3_RECORD
@@ -450,43 +425,6 @@
 -T SSL_SESSION
 -T SSL_SESSION_ASN1
 -T STACK_OF
--T STORE
--T STORE_ATTR_INFO
--T STORE_ATTR_TYPES
--T STORE_CERTIFICATE_STATUS
--T STORE_CLEANUP_FUNC_PTR
--T STORE_CTRL_FUNC_PTR
--T STORE_END_OBJECT_FUNC_PTR
--T STORE_GENERATE_OBJECT_FUNC_PTR
--T STORE_GENERIC_FUNC_PTR
--T STORE_GET_OBJECT_FUNC_PTR
--T STORE_HANDLE_OBJECT_FUNC_PTR
--T STORE_INITIALISE_FUNC_PTR
--T STORE_METHOD
--T STORE_MODIFY_OBJECT_FUNC_PTR
--T STORE_NEXT_OBJECT_FUNC_PTR
--T STORE_OBJECT
--T STORE_OBJECT_TYPES
--T STORE_PARAM_TYPES
--T STORE_START_OBJECT_FUNC_PTR
--T STORE_STORE_OBJECT_FUNC_PTR
--T SW_ALGTYPE
--T SW_BYTE
--T SW_COMMAND_BITMAP
--T SW_COMMAND_CODE
--T SW_CONTEXT_HANDLE
--T SW_CRT
--T SW_DSA
--T SW_EXP
--T SW_LARGENUMBER
--T SW_NVDATA
--T SW_OSHANDLE
--T SW_PARAM
--T SW_STATE
--T SW_STATUS
--T SW_U16
--T SW_U32
--T SW_U64
 -T SXNET
 -T SXNETID
 -T TCHAR
@@ -662,7 +600,6 @@
 -T STACK_OF_SRTP_PROTECTION_PROFILE_
 -T STACK_OF_SSL_CIPHER_
 -T STACK_OF_SSL_COMP_
--T STACK_OF_STORE_ATTR_INFO_
 -T STACK_OF_STRING_
 -T STACK_OF_SXNETID_
 -T STACK_OF_SingleResponse_