Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl Merge conflicts.
details: https://anonhg.NetBSD.org/src/rev/8f3dafd950a7
branches: trunk
changeset: 796473:8f3dafd950a7
user: christos <christos%NetBSD.org@localhost>
date: Thu Jun 05 14:39:46 2014 +0000
description:
Merge conflicts.
diffstat:
crypto/external/bsd/openssl/dist/apps/Makefile.save | 1056 ---------
crypto/external/bsd/openssl/dist/apps/ocsp.c | 22 +-
crypto/external/bsd/openssl/dist/crypto/Makefile.save | 219 --
crypto/external/bsd/openssl/dist/crypto/aes/Makefile.save | 153 -
crypto/external/bsd/openssl/dist/crypto/asn1/Makefile.save | 930 --------
crypto/external/bsd/openssl/dist/crypto/bf/Makefile.save | 101 -
crypto/external/bsd/openssl/dist/crypto/bio/Makefile.save | 222 --
crypto/external/bsd/openssl/dist/crypto/bn/Makefile.save | 377 ---
crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c | 48 +-
crypto/external/bsd/openssl/dist/crypto/buffer/Makefile.save | 97 -
crypto/external/bsd/openssl/dist/crypto/camellia/Makefile.save | 110 -
crypto/external/bsd/openssl/dist/crypto/cast/Makefile.save | 102 -
crypto/external/bsd/openssl/dist/crypto/cmac/Makefile.save | 111 -
crypto/external/bsd/openssl/dist/crypto/cms/Makefile.save | 284 --
crypto/external/bsd/openssl/dist/crypto/comp/Makefile.save | 108 -
crypto/external/bsd/openssl/dist/crypto/conf/Makefile.save | 152 -
crypto/external/bsd/openssl/dist/crypto/des/Makefile.save | 279 --
crypto/external/bsd/openssl/dist/crypto/dh/Makefile.save | 180 -
crypto/external/bsd/openssl/dist/crypto/dsa/Makefile.save | 209 -
crypto/external/bsd/openssl/dist/crypto/dso/Makefile.save | 150 -
crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ec/Makefile.save | 263 --
crypto/external/bsd/openssl/dist/crypto/ecdh/Makefile.save | 116 -
crypto/external/bsd/openssl/dist/crypto/ecdsa/Makefile.save | 140 -
crypto/external/bsd/openssl/dist/crypto/engine/Makefile.save | 447 ----
crypto/external/bsd/openssl/dist/crypto/err/Makefile.save | 110 -
crypto/external/bsd/openssl/dist/crypto/evp/Makefile.save | 776 -------
crypto/external/bsd/openssl/dist/crypto/hmac/Makefile.save | 110 -
crypto/external/bsd/openssl/dist/crypto/idea/Makefile.save | 89 -
crypto/external/bsd/openssl/dist/crypto/krb5/Makefile.save | 84 -
crypto/external/bsd/openssl/dist/crypto/lhash/Makefile.save | 88 -
crypto/external/bsd/openssl/dist/crypto/md4/Makefile.save | 89 -
crypto/external/bsd/openssl/dist/crypto/md5/Makefile.save | 102 -
crypto/external/bsd/openssl/dist/crypto/mdc2/Makefile.save | 93 -
crypto/external/bsd/openssl/dist/crypto/modes/Makefile.save | 144 -
crypto/external/bsd/openssl/dist/crypto/objects/Makefile.save | 130 -
crypto/external/bsd/openssl/dist/crypto/ocsp/Makefile.save | 213 --
crypto/external/bsd/openssl/dist/crypto/opensslv.h | 6 +-
crypto/external/bsd/openssl/dist/crypto/pem/Makefile.save | 258 --
crypto/external/bsd/openssl/dist/crypto/pkcs12/Makefile.save | 286 --
crypto/external/bsd/openssl/dist/crypto/pkcs7/Makefile.save | 194 -
crypto/external/bsd/openssl/dist/crypto/pqueue/Makefile.save | 83 -
crypto/external/bsd/openssl/dist/crypto/rand/Makefile.save | 164 -
crypto/external/bsd/openssl/dist/crypto/rc2/Makefile.save | 90 -
crypto/external/bsd/openssl/dist/crypto/rc4/Makefile.save | 125 -
crypto/external/bsd/openssl/dist/crypto/ripemd/Makefile.save | 95 -
crypto/external/bsd/openssl/dist/crypto/rsa/Makefile.save | 308 --
crypto/external/bsd/openssl/dist/crypto/seed/Makefile.save | 106 -
crypto/external/bsd/openssl/dist/crypto/sha/Makefile.save | 168 -
crypto/external/bsd/openssl/dist/crypto/srp/Makefile.save | 98 -
crypto/external/bsd/openssl/dist/crypto/stack/Makefile.save | 84 -
crypto/external/bsd/openssl/dist/crypto/ts/Makefile.save | 269 --
crypto/external/bsd/openssl/dist/crypto/txt_db/Makefile.save | 84 -
crypto/external/bsd/openssl/dist/crypto/ui/Makefile.save | 111 -
crypto/external/bsd/openssl/dist/crypto/whrlpool/Makefile.save | 96 -
crypto/external/bsd/openssl/dist/crypto/x509/Makefile.save | 407 ---
crypto/external/bsd/openssl/dist/crypto/x509v3/Makefile.save | 591 -----
crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_client_CA_list.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_use_psk_identity_hint.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_accept.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_do_handshake.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_shutdown.pod | 4 +-
crypto/external/bsd/openssl/dist/engines/Makefile.save | 335 ---
crypto/external/bsd/openssl/dist/engines/ccgost/Makefile.save | 275 --
crypto/external/bsd/openssl/dist/ssl/Makefile.save | 1061 ----------
crypto/external/bsd/openssl/dist/ssl/d1_pkt.c | 19 +-
crypto/external/bsd/openssl/dist/ssl/d1_srvr.c | 1 +
crypto/external/bsd/openssl/dist/ssl/s3_clnt.c | 9 +
crypto/external/bsd/openssl/dist/ssl/s3_pkt.c | 45 +-
crypto/external/bsd/openssl/dist/ssl/s3_srvr.c | 33 +-
crypto/external/bsd/openssl/dist/ssl/ssl.h | 4 +-
crypto/external/bsd/openssl/dist/ssl/ssl3.h | 1 +
crypto/external/bsd/openssl/dist/ssl/ssl_err.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/t1_enc.c | 8 +-
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 45 +-
crypto/external/bsd/openssl/dist/test/Makefile.save | 729 ------
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_ssl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_find_type.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new_CMS.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_push.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_read.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_accept.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_bio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_connect.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_fd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_file.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_mem.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_null.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_socket.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_set_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_should_retry.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_BLINDING_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_start.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_add.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_add_word.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_bn2bin.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_cmp.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_copy.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_generate_prime.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_inverse.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_montgomery.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_reciprocal.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_num_bytes.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_rand.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_set_bit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_swap.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_zero.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add0_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add1_recipient_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_compress.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_decrypt.3 | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_final.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_RecipientInfos.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_SignerInfos.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_type.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign_add1_signer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign_receipt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_uncompress.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify_receipt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_free.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_load_file.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CRYPTO_set_ex_data.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_parameters.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_set_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_SIG_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_do_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_dup_DH.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_parameters.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_set_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_GET_LIB.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_clear_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_error_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_get_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_crypto_strings.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_strings.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_print_errors.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_put_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_remove_state.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_set_mark.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_BytesToKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestSignInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestVerifyInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_EncryptInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_OpenInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_cmp.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_decrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_derive.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_keygen.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_print_private.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verify_recover.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SealInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SignInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_VerifyInit.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OBJ_nid2obj.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_Applink.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_config.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_create.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_parse.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_decrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign_add_signer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_add.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_bytes.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_cleanup.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_egd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_load_file.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_set_rand_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_blinding_on.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_check_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_generate_key.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_print.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_private_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_public_encrypt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_set_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_CMS.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_PKCS7.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_CMS.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_PKCS7.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CIPHER_get_name.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_COMP_add_compression_method.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_session.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_ctrl.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_flush_sessions.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_free.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get_verify_mode.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_load_verify_locations.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_number.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sessions.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_store.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cipher_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_generate_session_id.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_info_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_max_cert_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_mode.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_msg_callback.3 | 8 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_options.3 | 9 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_psk_client_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_id_context.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_ssl_version.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_timeout.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tmp_rsa_callback.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_verify.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_certificate.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_psk_identity_hint.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_free.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_time.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_accept.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_alert_type_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_clear.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_connect.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_do_handshake.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_free.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_SSL_CTX.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ciphers.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_client_CA_list.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_current_cipher.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_default_timeout.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ex_new_index.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_fd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_cert_chain.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_certificate.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_psk_identity.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_rbio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_session.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_verify_result.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_version.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_library_init.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_load_client_CA_file.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_pending.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_read.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_rstate_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_session_reused.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_bio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_connect_state.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_fd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_session.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_shutdown.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_verify_result.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_shutdown.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_state_string.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_want.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_write.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_print_ex.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_get_error.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_new.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_verify_cert.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/crypto.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_ASN1_OBJECT.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DHparams.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DSAPublicKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_RSAPublicKey.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_SSL_SESSION.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_ALGOR.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_CRL.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_NAME.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_REQ.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509_SIG.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/des_modes.7 | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/man/i2d_CMS_bio_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/lh_stats.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl.cnf.5 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_CA.pl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_asn1parse.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bio.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_blowfish.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bn.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_bn_internal.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_buffer.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ca.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ciphers.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_cms.1 | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl2pkcs7.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_des.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dgst.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dh.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dhparam.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsa.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsaparam.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ec.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ecdsa.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ecparam.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_enc.1 | 8 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_engine.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_err.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_errstr.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_evp.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_gendsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genpkey.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genrsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_hmac.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_lhash.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_md5.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_mdc2.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_nseq.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ocsp.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_passwd.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pem.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs12.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs7.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs8.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkey.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyparam.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyutl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rand.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rand.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rc4.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_req.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ripemd.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsa.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsa.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsautl.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_client.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_server.1 | 9 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_time.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_sess_id.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_sha.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_smime.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_speed.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_spkac.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_threads.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ts.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_tsget.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ui.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ui_compat.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_verify.1 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_version.1 | 9 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509.1 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509.3 | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509v3_config.1 | 5 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ssl.3 | 4 +-
414 files changed, 899 insertions(+), 14645 deletions(-)
diffs (truncated from 21052 to 300 lines):
diff -r a28902339e05 -r 8f3dafd950a7 crypto/external/bsd/openssl/dist/apps/Makefile.save
--- a/crypto/external/bsd/openssl/dist/apps/Makefile.save Thu Jun 05 14:25:44 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1056 +0,0 @@
-#
-# apps/Makefile
-#
-
-DIR= apps
-TOP= ..
-CC= cc
-INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES)
-CFLAG= -g -static
-MAKEFILE= Makefile
-PERL= perl
-RM= rm -f
-# KRB5 stuff
-KRB5_INCLUDES=
-LIBKRB5=
-
-PEX_LIBS=
-EX_LIBS=
-EXE_EXT=
-
-SHLIB_TARGET=
-
-CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile makeapps.com install.com
-
-DLIBCRYPTO=../libcrypto.a
-DLIBSSL=../libssl.a
-LIBCRYPTO=-L.. -lcrypto
-LIBSSL=-L.. -lssl
-
-PROGRAM= openssl
-
-SCRIPTS=CA.sh CA.pl tsget
-
-EXE= $(PROGRAM)$(EXE_EXT)
-
-E_EXE= verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
- ca crl rsa rsautl dsa dsaparam ec ecparam \
- x509 genrsa gendsa genpkey s_server s_client speed \
- s_time version pkcs7 cms crl2pkcs7 sess_id ciphers nseq pkcs12 \
- pkcs8 pkey pkeyparam pkeyutl spkac smime rand engine ocsp prime ts srp
-
-PROGS= $(PROGRAM).c
-
-A_OBJ=apps.o
-A_SRC=apps.c
-S_OBJ= s_cb.o s_socket.o
-S_SRC= s_cb.c s_socket.c
-RAND_OBJ=app_rand.o
-RAND_SRC=app_rand.c
-
-E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o errstr.o \
- ca.o pkcs7.o crl2p7.o crl.o \
- rsa.o rsautl.o dsa.o dsaparam.o ec.o ecparam.o \
- x509.o genrsa.o gendsa.o genpkey.o s_server.o s_client.o speed.o \
- s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
- ciphers.o nseq.o pkcs12.o pkcs8.o pkey.o pkeyparam.o pkeyutl.o \
- spkac.o smime.o cms.o rand.o engine.o ocsp.o prime.o ts.o srp.o
-
-E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
- pkcs7.c crl2p7.c crl.c \
- rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
- x509.c genrsa.c gendsa.c genpkey.c s_server.c s_client.c speed.c \
- s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
- ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \
- spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c srp.c
-
-SRC=$(E_SRC)
-
-EXHEADER=
-HEADER= apps.h progs.h s_apps.h \
- testdsa.h testrsa.h \
- $(EXHEADER)
-
-ALL= $(GENERAL) $(SRC) $(HEADER)
-
-top:
- @(cd ..; $(MAKE) DIRS=$(DIR) all)
-
-all: exe
-
-exe: $(EXE)
-
-req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
- shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
- shlib_target="$(SHLIB_TARGET)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-sreq.o: req.c
- $(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
-
-files:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-install:
- @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
- @set -e; for i in $(EXE); \
- do \
- (echo installing $$i; \
- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
- chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
- done;
- @set -e; for i in $(SCRIPTS); \
- do \
- (echo installing $$i; \
- cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
- chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
- mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
- done
- @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
- chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
- mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
-
-tags:
- ctags $(SRC)
-
-tests:
-
-links:
-
-lint:
- lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
- @if [ -z "$(THIS)" ]; then \
- $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
- else \
- $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
- fi
-
-dclean:
- $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
- mv -f Makefile.new $(MAKEFILE)
- rm -f CA.pl
-
-clean:
- rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
- rm -f req
-
-$(DLIBSSL):
- (cd ..; $(MAKE) DIRS=ssl all)
-
-$(DLIBCRYPTO):
- (cd ..; $(MAKE) DIRS=crypto all)
-
-$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
- $(RM) $(EXE)
- shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
- shlib_target="$(SHLIB_TARGET)"; \
- elif [ -n "$(FIPSCANLIB)" ]; then \
- FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
- fi; \
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- @(cd ..; $(MAKE) rehash)
-
-progs.h: progs.pl
- $(PERL) progs.pl $(E_EXE) >progs.h
- $(RM) $(PROGRAM).o
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-app_rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-app_rand.o: ../include/openssl/buffer.h ../include/openssl/conf.h
-app_rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-app_rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-app_rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-app_rand.o: ../include/openssl/evp.h ../include/openssl/lhash.h
-app_rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-app_rand.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-app_rand.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-app_rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-app_rand.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-app_rand.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
-app_rand.o: app_rand.c apps.h
-apps.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-apps.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-apps.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-apps.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-apps.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-apps.o: ../include/openssl/engine.h ../include/openssl/err.h
-apps.o: ../include/openssl/evp.h ../include/openssl/lhash.h
-apps.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-apps.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-apps.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-apps.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-apps.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
-apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-apps.o: ../include/openssl/sha.h ../include/openssl/stack.h
-apps.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-apps.o: ../include/openssl/ui.h ../include/openssl/x509.h
-apps.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.c apps.h
-asn1pars.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-asn1pars.o: ../include/openssl/buffer.h ../include/openssl/conf.h
-asn1pars.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-asn1pars.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-asn1pars.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h
-asn1pars.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-asn1pars.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-asn1pars.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-asn1pars.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-asn1pars.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-asn1pars.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-asn1pars.o: asn1pars.c
-ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-ca.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-ca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-ca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-ca.o: ../include/openssl/engine.h ../include/openssl/err.h
-ca.o: ../include/openssl/evp.h ../include/openssl/lhash.h
-ca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-ca.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-ca.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ca.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
-ca.o: ../include/openssl/sha.h ../include/openssl/stack.h
-ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-ca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ca.o: ../include/openssl/x509v3.h apps.h ca.c
-ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-ciphers.o: ../include/openssl/buffer.h ../include/openssl/comp.h
-ciphers.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-ciphers.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
-ciphers.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-ciphers.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-ciphers.o: ../include/openssl/err.h ../include/openssl/evp.h
-ciphers.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
-ciphers.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-ciphers.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ciphers.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-ciphers.o: ../include/openssl/sha.h ../include/openssl/srtp.h
-ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ciphers.o: ../include/openssl/x509v3.h apps.h ciphers.c
-cms.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-cms.o: ../include/openssl/buffer.h ../include/openssl/cms.h
-cms.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-cms.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-cms.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-cms.o: ../include/openssl/engine.h ../include/openssl/err.h
-cms.o: ../include/openssl/evp.h ../include/openssl/lhash.h
-cms.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-cms.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-cms.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-cms.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-cms.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
-cms.o: ../include/openssl/sha.h ../include/openssl/stack.h
-cms.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-cms.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-cms.o: ../include/openssl/x509v3.h apps.h cms.c
-crl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-crl.o: ../include/openssl/buffer.h ../include/openssl/conf.h
-crl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-crl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-crl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-crl.o: ../include/openssl/err.h ../include/openssl/evp.h
-crl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-crl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-crl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-crl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-crl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-crl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-crl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-crl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-crl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h crl.c
-crl2p7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-crl2p7.o: ../include/openssl/buffer.h ../include/openssl/conf.h
-crl2p7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-crl2p7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-crl2p7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-crl2p7.o: ../include/openssl/err.h ../include/openssl/evp.h
-crl2p7.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-crl2p7.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-crl2p7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
Home |
Main Index |
Thread Index |
Old Index