The branch master has been updated via 0ae407eebe9aafecb7181f75935fcc344318a578 (commit) via b00d5407b530fd77a752c83b04e976c44009883a (commit) via f77524524548be9740b143bccfde7565493ae78e (commit) from 5a81a050aa11711a6d674e6abfc9b13018639ab1 (commit)
- Log ----------------------------------------------------------------- commit 0ae407eebe9aafecb7181f75935fcc344318a578 Author: Benjamin Kaduk <bka...@akamai.com> Date: Tue Feb 28 16:39:01 2017 -0600 Remove documentation of deleted function It's even removing a BUGS entry! Reviewed-by: Emilia Käsper <emi...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2797) commit b00d5407b530fd77a752c83b04e976c44009883a Author: Benjamin Kaduk <bka...@akamai.com> Date: Tue Feb 28 16:00:23 2017 -0600 Remove unused typedefs from indent config Some things were not removed from util/indent.pro when they were removed from the code. grep '^-T' util/indent.pro | awk '{print $2} > /tmp/a grep -rF -f /tmp/a --exclude CHANGES --exclude 'INSTALL' --exclude 'LICENSE' --exclude 'NEWS' --exclude 'NOTES*' --exclude 'README*' --exclude indent.pro --exclude-dir corpora -o -h *|sort|uniq>/tmp/b comm -23 <(sort /tmp/a) /tmp/b >/tmp/c grep -v -E '(LHASH_OF|STACK_OF)' /tmp/c > /tmp/d grep -v -Ff /tmp/d util/indent.pro > util/indent.pro Manually adjusted to retain time_t and the ossl_*intmax_t types. Reviewed-by: Emilia Käsper <emi...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2797) commit f77524524548be9740b143bccfde7565493ae78e Author: Benjamin Kaduk <bka...@akamai.com> Date: Tue Feb 28 15:51:38 2017 -0600 Remove some unused PEM structures Reviewed-by: Emilia Käsper <emi...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2797) ----------------------------------------------------------------------- Summary of changes: doc/man3/DES_random_key.pod | 2 -- include/openssl/pem.h | 50 --------------------------------------------- util/indent.pro | 44 --------------------------------------- 3 files changed, 96 deletions(-) diff --git a/doc/man3/DES_random_key.pod b/doc/man3/DES_random_key.pod index bcf9761..4a7b106 100644 --- a/doc/man3/DES_random_key.pod +++ b/doc/man3/DES_random_key.pod @@ -254,8 +254,6 @@ bytes. =head1 BUGS -DES_3cbc_encrypt() is flawed and must not be used in applications. - DES_cbc_encrypt() does not modify B<ivec>; use DES_ncbc_encrypt() instead. diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 2375d63..431ee3e 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -54,56 +54,6 @@ extern "C" { # define PEM_TYPE_MIC_CLEAR 30 # define PEM_TYPE_CLEAR 40 -typedef struct pem_recip_st { - char *name; - X509_NAME *dn; - int cipher; - int key_enc; - /* char iv[8]; unused and wrong size */ -} PEM_USER; - -typedef struct pem_ctx_st { - int type; /* what type of object */ - struct { - int version; - int mode; - } proc_type; - - char *domain; - - struct { - int cipher; - /*- - unused, and wrong size - unsigned char iv[8]; */ - } DEK_info; - - PEM_USER *originator; - - int num_recipient; - PEM_USER **recipient; - -/*- - XXX(ben): don#t think this is used! - STACK *x509_chain; / * certificate chain */ - EVP_MD *md; /* signature type */ - - int md_enc; /* is the md encrypted or not? */ - int md_len; /* length of md_data */ - char *md_data; /* message digest, could be pkey encrypted */ - - EVP_CIPHER *dec; /* date encryption cipher */ - int key_len; /* key length */ - unsigned char *key; /* key */ - /*- - unused, and wrong size - unsigned char iv[8]; */ - - int data_enc; /* is the data encrypted */ - int data_len; - unsigned char *data; -} PEM_CTX; - /* * These macros make the PEM_read/PEM_write functions easier to maintain and * write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or diff --git a/util/indent.pro b/util/indent.pro index 74e5680..81590e1 100644 --- a/util/indent.pro +++ b/util/indent.pro @@ -48,8 +48,6 @@ -T ASN1_BIT_STRING -T ASN1_BMPSTRING -T ASN1_BOOLEAN --T ASN1_COMPAT_FUNCS --T ASN1_CTX -T ASN1_ENCODING -T ASN1_ENUMERATED -T ASN1_EXTERN_FUNCS @@ -80,7 +78,6 @@ -T ASN1_UTF8STRING -T ASN1_VALUE -T ASN1_VISIBLESTRING --T ASN1_const_CTX -T AUTHORITY_INFO_ACCESS -T AUTHORITY_KEYID -T BASIC_CONSTRAINTS @@ -167,14 +164,10 @@ -T CONF_MODULE -T CONF_VALUE -T CRYPTO_EX_DATA --T CRYPTO_EX_DATA_FUNCS --T CRYPTO_EX_DATA_IMPL -T CRYPTO_EX_dup -T CRYPTO_EX_free -T CRYPTO_EX_new --T CRYPTO_MEM_LEAK_CB -T CRYPTO_THREADID --T CRYPTO_dynlock_value -T DB_ATTR -T DES_LONG -T DES_cblock @@ -184,7 +177,6 @@ -T DH_PKEY_CTX -T DIST_POINT -T DIST_POINT_NAME --T DRBG_CTX -T DSA -T DSA_METHOD -T DSA_SIG @@ -198,14 +190,11 @@ -T DTLS1_RECORD_DATA -T DTLS1_STATE -T Dl_info --T ECDH_DATA -T ECDH_METHOD --T ECDSA_DATA -T ECDSA_METHOD -T ECDSA_SIG -T ECPARAMETERS -T ECPKPARAMETERS --T EC_EXTRA_DATA -T EC_GROUP -T EC_KEY -T EC_METHOD @@ -251,12 +240,7 @@ -T EVP_PKEY_CTX -T EVP_PKEY_METHOD -T EVP_PKEY_gen_cb --T EX_CLASS_ITEM --T E_GMP_RSA_CTX --T E_RSAX_MOD_CTX -T FILE --T F_DIGITALSIGNATUREVERIFY --T F_PUBLICKEYEXTRACT -T GCM128_CONTEXT -T GENERAL_NAME -T GENERAL_NAMES @@ -274,12 +258,8 @@ -T ISSUING_DIST_POINT -T KEY_TABLE_TYPE -T LHASH --T LHASH_COMP_FN_TYPE -T LHASH_DOALL_ARG_FN_TYPE --T LHASH_DOALL_FN_TYPE --T LHASH_HASH_FN_TYPE -T LHASH_NODE --T LPDIR_CTX -T LPHEAPENTRY32 -T LPHEAPLIST32 -T LPMODULEENTRY32 @@ -292,15 +272,12 @@ -T MD4_CTX -T MD5_CTX -T MDC2_CTX --T MD_DATA -T MEM -T MEM_LEAK --T MEM_OBJECT_DATA -T MIME_HEADER -T MIME_PARAM -T MODULEENTRY32 -T MODULEENTRY32W --T MS_FAR -T NAME_CONSTRAINTS -T NAME_FUNCS -T NBIO_TEST @@ -310,8 +287,6 @@ -T NETSCAPE_PKEY -T NETSCAPE_SPKAC -T NETSCAPE_SPKI --T NETSCAPE_X509 --T NET_API_FUNCTION -T NOTICEREF -T OBJ_NAME -T OCB128_CONTEXT @@ -336,7 +311,6 @@ -T OPENSSL_BLOCK -T OPENSSL_CSTRING -T OPENSSL_DIR_CTX --T OPENSSL_ITEM -T OPENSSL_PSTRING -T OPENSSL_STRING -T OSSL_ASYNC_FD @@ -346,10 +320,6 @@ -T PBE2PARAM -T PBEPARAM -T PBKDF2PARAM --T PCRYPTO_MEM_LEAK_CB --T PEM_CTX --T PEM_ENCODE_SEAL_CTX --T PEM_USER -T PHEAPENTRY32 -T PHEAPLIST32 -T PKCS12 @@ -395,7 +365,6 @@ -T RSA_PSS_PARAMS -T SCT -T SEED_KEY_SCHEDULE --T SESS_CERT -T SHA256_CTX -T SHA512_CTX -T SHA_CTX @@ -408,7 +377,6 @@ -T SRP_user_pwd -T SRTP_PROTECTION_PROFILE -T SSL --T SSL2_STATE -T SSL3_BUFFER -T SSL3_COMP -T SSL3_ENC_METHOD @@ -449,7 +417,6 @@ -T WCHAR -T WHIRLPOOL_CTX -T WINAPI --T WSAAPI -T X509 -T X509V3_CONF_METHOD -T X509V3_CTX @@ -466,8 +433,6 @@ -T X509_ALGOR -T X509_ATTRIBUTE -T X509_CERT_AUX --T X509_CERT_FILE_CTX --T X509_CERT_PAIR -T X509_CINF -T X509_CRL -T X509_CRL_INFO @@ -479,7 +444,6 @@ -T X509_NAME -T X509_NAME_ENTRY -T X509_OBJECT --T X509_OBJECTS -T X509_PKEY -T X509_POLICY_CACHE -T X509_POLICY_DATA @@ -497,17 +461,14 @@ -T X509_TRUST -T X509_VAL -T X509_VERIFY_PARAM --T X509_VERIFY_PARAM_ID -T X9_62_CHARACTERISTIC_TWO -T X9_62_CURVE -T X9_62_FIELDID -T X9_62_PENTANOMIAL -T XTS128_CONTEXT --T ZEN_MD_DATA -T _LHASH -T _STACK -T __int64 --T _ossl_old_des_cblock -T asn1_ps_func -T bio_dgram_data -T bio_info_cb @@ -559,7 +520,6 @@ -T STACK_OF_CONF_IMODULE_ -T STACK_OF_CONF_MODULE_ -T STACK_OF_CONF_VALUE_ --T STACK_OF_CRYPTO_EX_DATA_FUNCS_ -T STACK_OF_CRYPTO_dynlock_ -T STACK_OF_DIST_POINT_ -T STACK_OF_ENGINE_ @@ -573,7 +533,6 @@ -T STACK_OF_GENERAL_SUBTREE_ -T STACK_OF_IPAddressFamily_ -T STACK_OF_IPAddressOrRange_ --T STACK_OF_MEM_OBJECT_DATA_ -T STACK_OF_MIME_HEADER_ -T STACK_OF_MIME_PARAM_ -T STACK_OF_NAME_FUNCS_ @@ -628,7 +587,6 @@ -T LHASH_OF_ENGINE_PILE_ -T LHASH_OF_ERR_STATE_ -T LHASH_OF_ERR_STRING_DATA_ --T LHASH_OF_EX_CLASS_ITEM_ -T LHASH_OF_FUNCTION_ -T LHASH_OF_MEM_ -T LHASH_OF_OBJ_NAME_ @@ -644,7 +602,6 @@ -T ssl_st -T ssl_trace_tbl -T _stdcall --T tls12_lookup -T OPTIONS -T OPT_PAIR -T uint64_t @@ -661,7 +618,6 @@ -T SH_LIST -T PACKET -T RECORD_LAYER --T ASYNC_FIBRE -T ASYNC_CTX -T ASYNC_JOB -T intmax_t _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits