Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 38118 invoked from network); 2 Apr 2010 18:59:23 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Apr 2010 18:59:23 -0000 Received: (qmail 76068 invoked by uid 500); 2 Apr 2010 18:59:22 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 76020 invoked by uid 500); 2 Apr 2010 18:59:22 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 76006 invoked by uid 99); 2 Apr 2010 18:59:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Apr 2010 18:59:22 +0000 X-ASF-Spam-Status: No, hits=-0.3 required=10.0 tests=AWL,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [207.5.72.95] (HELO EXHUB015-3.exch015.msoutlookonline.net) (207.5.72.95) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Apr 2010 18:59:18 +0000 Received: from philip.hq.rws (174.79.184.239) by smtpx15.msoutlookonline.net (207.5.72.103) with Microsoft SMTP Server (TLS) id 8.2.234.1; Fri, 2 Apr 2010 11:58:56 -0700 Message-ID: <4BB63E6F.5030805@p6m7g8.com> Date: Fri, 2 Apr 2010 18:58:55 +0000 From: "Philip M. Gollucci" Organization: P6M7G8 Inc. User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.7) Gecko/20100220 Thunderbird/3.0.1 MIME-Version: 1.0 To: dev@httpd.apache.org, dev@apr.apache.org, ASF Infra Private Subject: Fwd: cvs commit: ports/security/openssl Makefile distinfo pkg-plist ports/security/openssl/files patch-Configure patch-crypto-dso-Makefile Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit -------- Original Message -------- Subject: cvs commit: ports/security/openssl Makefile distinfo pkg-plist ports/security/openssl/files patch-Configure patch-crypto-dso-Makefile Date: Fri, 2 Apr 2010 18:42:11 +0000 (UTC) From: Dirk Meyer To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org dinoex 2010-04-02 18:42:11 UTC FreeBSD ports repository Modified files: security/openssl Makefile distinfo pkg-plist security/openssl/files patch-Configure Removed files: security/openssl/files patch-crypto-dso-Makefile Log: - update to 1.0.0 - regression tested on i386, amd64 and ia64 - use DIST_SUBDIR to resolve conflicts with old patchfiles - new options DTLS_RENEGOTIATION, DTLS_HEARTBEAT, TLS_EXTRACTOR, SCTP Revision Changes Path 1.167 +220 -122 ports/security/openssl/Makefile 1.58 +18 -3 ports/security/openssl/distinfo 1.11 +16 -16 ports/security/openssl/files/patch-Configure 1.2 +0 -14 ports/security/openssl/files/patch-crypto-dso-Makefile (dead) http://cvsweb.FreeBSD.org/ports/security/openssl/files/patch-crypto-dso-Makefile?rev=1.1&content-type=text/x-cvsweb-markup 1.40 +13 -8 ports/security/openssl/pkg-plist http://cvsweb.FreeBSD.org/ports/security/openssl/Makefile.diff?r1=1.166&r2=1.167&f=h | --- ports/security/openssl/Makefile 2010/03/30 19:07:14 1.166 | +++ ports/security/openssl/Makefile 2010/04/02 18:42:11 1.167 | @@ -2,22 +2,24 @@ | # Date created: Sun Jan 3 19:36:27 CET 1999 | # Whom: Dirk Froemberg | # | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/security/openssl/Makefile,v 1.166 2010/03/30 19:07:14 dinoex Exp $ | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/security/openssl/Makefile,v 1.167 2010/04/02 18:42:11 dinoex Exp $ | # | | PORTNAME= openssl | -PORTVERSION= 0.9.8n | -PORTREVISION= 0 | +PORTVERSION= 1.0.0 | CATEGORIES= security devel | MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ | ftp://ftp.openssl.org/%SUBDIR%/ \ | ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/ | MASTER_SITE_SUBDIR= source | -DISTNAME= ${PORTNAME}-${PORTVERSION} | +DIST_SUBDIR= ${DISTNAME} | | MAINTAINER= dinoex@FreeBSD.org | COMMENT= SSL and crypto library | | +PATCH_SITES= http://sctp.fh-muenster.de/dtls/ | +PATCHFILES= # | + | BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend | | .ifdef USE_OPENSSL | @@ -27,35 +29,44 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/de | OPTIONS= I386 "Use optimized assembler for 80386" off \ | SSE2 "Use runtime SSE2 detection" on \ | ZLIB "Build with zlib compression" on \ | + DTLS_RENEGOTIATION "Build with DTLS Abbreviated renegotiations" off \ | + DTLS_HEARTBEAT "Build with DTLS Heartbeat Extension" off \ | + TLS_EXTRACTOR "Build with TLS key material extractor" off \ | + SCTP "Build with SCTP support" off \ | | MAKE_JOBS_UNSAFE= yes | NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch | NOPRECIOUSSOFTMAKEVARS= Too many _MLINKS for fetch | | USE_PERL5_BUILD= yes | -EXTRACONFIGURE+= enable-camellia | MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive | MAKE_ENV+= LIBRPATH="${PREFIX}/lib" | OPENSSLDIR= ${PREFIX}/openssl | MANPREFIX= ${PREFIX} | | -MAN1= CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 dhparam.1 \ | - dsa.1 dsaparam.1 ec.1 ecparam.1 enc.1 errstr.1 gendsa.1 genrsa.1 \ | - nseq.1 ocsp.1 openssl.1 passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 \ | - req.1 rsa.1 rsautl.1 s_client.1 s_server.1 s_time.1 sess_id.1 smime.1 \ | - speed.1 spkac.1 verify.1 version.1 x509.1 | - | -MAN3= ASN1_generate_nconf.3 ASN1_OBJECT_new.3 ASN1_STRING_length.3 \ | - ASN1_STRING_new.3 ASN1_STRING_print_ex.3 BIO_ctrl.3 BIO_f_base64.3 \ | - BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3 BIO_f_ssl.3 \ | - BIO_find_type.3 BIO_new.3 BIO_new_bio_pair.3 BIO_push.3 BIO_read.3 \ | - BIO_s_accept.3 BIO_s_bio.3 BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3 \ | - BIO_s_mem.3 BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3 \ | - BIO_should_retry.3 BN_BLINDING_new.3 BN_CTX_new.3 BN_CTX_start.3 \ | - BN_add.3 BN_add_word.3 BN_bn2bin.3 BN_cmp.3 BN_copy.3 \ | - BN_generate_prime.3 BN_mod_inverse.3 BN_mod_mul_montgomery.3 \ | - BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3 \ | - BN_set_bit.3 BN_swap.3 BN_zero.3 CONF_modules_free.3 \ | +MAN1= CA.pl.1 asn1parse.1 ca.1 ciphers.1 cms.1 crl.1 crl2pkcs7.1 dgst.1 \ | + dhparam.1 dsa.1 dsaparam.1 ec.1 ecparam.1 enc.1 errstr.1 gendsa.1 \ | + genpkey.1 genrsa.1 nseq.1 ocsp.1 openssl.1 passwd.1 pkcs12.1 pkcs7.1 \ | + pkcs8.1 pkey.1 pkeyparam.1 pkeyutl.1 rand.1 req.1 rsa.1 rsautl.1 \ | + s_client.1 s_server.1 s_time.1 sess_id.1 smime.1 speed.1 spkac.1 ts.1 \ | + tsget.1 verify.1 version.1 x509.1 | + | +MAN3= ASN1_OBJECT_new.3 ASN1_STRING_length.3 ASN1_STRING_new.3 \ | + ASN1_STRING_print_ex.3 ASN1_generate_nconf.3 BIO_ctrl.3 \ | + BIO_f_base64.3 BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3 \ | + BIO_f_ssl.3 BIO_find_type.3 BIO_new.3 BIO_new_CMS.3 \ | + BIO_new_bio_pair.3 BIO_push.3 BIO_read.3 BIO_s_accept.3 BIO_s_bio.3 \ | + BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3 BIO_s_mem.3 BIO_s_null.3 \ | + BIO_s_socket.3 BIO_set_callback.3 BIO_should_retry.3 \ | + BN_BLINDING_new.3 BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 \ | + BN_bn2bin.3 BN_cmp.3 BN_copy.3 BN_generate_prime.3 BN_mod_inverse.3 \ | + BN_mod_mul_montgomery.3 BN_mod_mul_reciprocal.3 BN_new.3 \ | + BN_num_bytes.3 BN_rand.3 BN_set_bit.3 BN_swap.3 BN_zero.3 \ | + CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_compress.3 \ | + CMS_decrypt.3 CMS_encrypt.3 CMS_final.3 CMS_get0_RecipientInfos.3 \ | + CMS_get0_SignerInfos.3 CMS_get0_type.3 CMS_get1_ReceiptRequest.3 \ | + CMS_sign.3 CMS_sign_add1_signer.3 CMS_sign_receipt.3 CMS_uncompress.3 \ | + CMS_verify.3 CMS_verify_receipt.3 CONF_modules_free.3 \ | CONF_modules_load_file.3 CRYPTO_set_ex_data.3 DH_generate_key.3 \ | DH_generate_parameters.3 DH_get_ex_new_index.3 DH_new.3 \ | DH_set_method.3 DH_size.3 DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3 \ | @@ -64,75 +75,82 @@ MAN3= ASN1_generate_nconf.3 ASN1_OBJECT_ | ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3 \ | ERR_load_crypto_strings.3 ERR_load_strings.3 ERR_print_errors.3 \ | ERR_put_error.3 ERR_remove_state.3 ERR_set_mark.3 EVP_BytesToKey.3 \ | - EVP_DigestInit.3 EVP_EncryptInit.3 EVP_OpenInit.3 EVP_PKEY_new.3 \ | - EVP_PKEY_set1_RSA.3 EVP_SealInit.3 EVP_SignInit.3 EVP_VerifyInit.3 \ | - OBJ_nid2obj.3 OPENSSL_VERSION_NUMBER.3 OPENSSL_Applink.3 \ | - OpenSSL_add_all_algorithms.3 OPENSSL_config.3 OPENSSL_ia32cap.3 \ | - OPENSSL_load_builtin_modules.3 PKCS12_create.3 PKCS12_parse.3 \ | - PKCS7_sign.3 PKCS7_verify.3 PKCS7_encrypt.3 PKCS7_decrypt.3 \ | - RAND_add.3 RAND_bytes.3 RAND_cleanup.3 RAND_egd.3 RAND_load_file.3 \ | + EVP_DigestInit.3 EVP_DigestSignInit.3 EVP_DigestVerifyInit.3 \ | + EVP_EncryptInit.3 EVP_OpenInit.3 EVP_PKEY_CTX_ctrl.3 \ | + EVP_PKEY_CTX_new.3 EVP_PKEY_cmp.3 EVP_PKEY_decrypt.3 \ | + EVP_PKEY_derive.3 EVP_PKEY_encrypt.3 EVP_PKEY_get_default_digest.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_new.3 EVP_PKEY_print_private.3 \ | + EVP_PKEY_set1_RSA.3 EVP_PKEY_sign.3 EVP_PKEY_verify.3 \ | + EVP_PKEY_verifyrecover.3 EVP_SealInit.3 EVP_SignInit.3 \ | + EVP_VerifyInit.3 OBJ_nid2obj.3 OPENSSL_Applink.3 \ | + OPENSSL_VERSION_NUMBER.3 OPENSSL_config.3 OPENSSL_ia32cap.3 \ | + OPENSSL_load_builtin_modules.3 OpenSSL_add_all_algorithms.3 \ | + PEM_write_bio_CMS_stream.3 PEM_write_bio_PKCS7_stream.3 \ | + PKCS12_create.3 PKCS12_parse.3 PKCS7_decrypt.3 PKCS7_encrypt.3 \ | + PKCS7_sign.3 PKCS7_sign_add_signer.3 PKCS7_verify.3 RAND_add.3 \ | + RAND_bytes.3 RAND_cleanup.3 RAND_egd.3 RAND_load_file.3 \ | RAND_set_rand_method.3 RSA_blinding_on.3 RSA_check_key.3 \ | RSA_generate_key.3 RSA_get_ex_new_index.3 RSA_new.3 \ | RSA_padding_add_PKCS1_type_1.3 RSA_print.3 RSA_private_encrypt.3 \ | RSA_public_encrypt.3 RSA_set_method.3 RSA_sign.3 \ | - RSA_sign_ASN1_OCTET_STRING.3 RSA_size.3 SSL_CIPHER_get_name.3 \ | - SSL_COMP_add_compression_method.3 SSL_CTX_add_extra_chain_cert.3 \ | - SSL_CTX_add_session.3 SSL_CTX_ctrl.3 SSL_CTX_flush_sessions.3 \ | - SSL_CTX_free.3 SSL_CTX_get_ex_new_index.3 SSL_CTX_get_verify_mode.3 \ | - SSL_CTX_load_verify_locations.3 SSL_CTX_new.3 SSL_CTX_sess_number.3 \ | - SSL_CTX_sess_set_cache_size.3 SSL_CTX_sess_set_get_cb.3 \ | - SSL_CTX_sessions.3 SSL_CTX_set_cert_store.3 \ | + RSA_sign_ASN1_OCTET_STRING.3 RSA_size.3 SMIME_read_CMS.3 \ | + SMIME_read_PKCS7.3 SMIME_write_CMS.3 SMIME_write_PKCS7.3 \ | + SSL_CIPHER_get_name.3 SSL_COMP_add_compression_method.3 \ | + SSL_CTX_add_extra_chain_cert.3 SSL_CTX_add_session.3 SSL_CTX_ctrl.3 \ | + SSL_CTX_flush_sessions.3 SSL_CTX_free.3 SSL_CTX_get_ex_new_index.3 \ | + SSL_CTX_get_verify_mode.3 SSL_CTX_load_verify_locations.3 \ | + SSL_CTX_new.3 SSL_CTX_sess_number.3 SSL_CTX_sess_set_cache_size.3 \ | + SSL_CTX_sess_set_get_cb.3 SSL_CTX_sessions.3 SSL_CTX_set_cert_store.3 \ | SSL_CTX_set_cert_verify_callback.3 SSL_CTX_set_cipher_list.3 \ | SSL_CTX_set_client_CA_list.3 SSL_CTX_set_client_cert_cb.3 \ | SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_generate_session_id.3 \ | SSL_CTX_set_info_callback.3 SSL_CTX_set_max_cert_list.3 \ | SSL_CTX_set_mode.3 SSL_CTX_set_msg_callback.3 SSL_CTX_set_options.3 \ | - SSL_CTX_set_quiet_shutdown.3 SSL_CTX_set_session_cache_mode.3 \ | - SSL_CTX_set_session_id_context.3 SSL_CTX_set_ssl_version.3 \ | + SSL_CTX_set_psk_client_callback.3 SSL_CTX_set_quiet_shutdown.3 \ | + SSL_CTX_set_session_cache_mode.3 SSL_CTX_set_session_id_context.3 \ | + SSL_CTX_set_ssl_version.3 SSL_CTX_set_timeout.3 \ | SSL_CTX_set_tmp_dh_callback.3 SSL_CTX_set_tmp_rsa_callback.3 \ | - SSL_CTX_set_timeout.3 SSL_CTX_set_verify.3 SSL_CTX_use_certificate.3 \ | - SSL_SESSION_free.3 SSL_SESSION_get_ex_new_index.3 \ | - SSL_SESSION_get_time.3 SSL_accept.3 SSL_alert_type_string.3 \ | - SSL_clear.3 SSL_connect.3 SSL_do_handshake.3 SSL_free.3 \ | - SSL_get_SSL_CTX.3 SSL_get_ciphers.3 SSL_get_client_CA_list.3 \ | - SSL_get_current_cipher.3 SSL_get_default_timeout.3 SSL_get_error.3 \ | + SSL_CTX_set_verify.3 SSL_CTX_use_certificate.3 \ | + SSL_CTX_use_psk_identity_hint.3 SSL_SESSION_free.3 \ | + SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_time.3 SSL_accept.3 \ | + SSL_alert_type_string.3 SSL_clear.3 SSL_connect.3 SSL_do_handshake.3 \ | + SSL_free.3 SSL_get_SSL_CTX.3 SSL_get_ciphers.3 \ | + SSL_get_client_CA_list.3 SSL_get_current_cipher.3 \ | + SSL_get_default_timeout.3 SSL_get_error.3 \ | SSL_get_ex_data_X509_STORE_CTX_idx.3 SSL_get_ex_new_index.3 \ | SSL_get_fd.3 SSL_get_peer_cert_chain.3 SSL_get_peer_certificate.3 \ | - SSL_get_rbio.3 SSL_get_session.3 SSL_get_verify_result.3 \ | - SSL_get_version.3 SSL_library_init.3 SSL_load_client_CA_file.3 \ | - SSL_new.3 SSL_pending.3 SSL_read.3 SSL_rstate_string.3 \ | - SSL_session_reused.3 SSL_set_bio.3 SSL_set_connect_state.3 \ | - SSL_set_fd.3 SSL_set_session.3 SSL_set_shutdown.3 \ | - SSL_set_verify_result.3 SSL_shutdown.3 SSL_state_string.3 SSL_want.3 \ | - SSL_write.3 SMIME_write_PKCS7.3 SMIME_read_PKCS7.3 \ | + SSL_get_psk_identity.3 SSL_get_rbio.3 SSL_get_session.3 \ | + SSL_get_verify_result.3 SSL_get_version.3 SSL_library_init.3 \ | + SSL_load_client_CA_file.3 SSL_new.3 SSL_pending.3 SSL_read.3 \ | + SSL_rstate_string.3 SSL_session_reused.3 SSL_set_bio.3 \ | + SSL_set_connect_state.3 SSL_set_fd.3 SSL_set_session.3 \ | + SSL_set_shutdown.3 SSL_set_verify_result.3 SSL_shutdown.3 \ | + SSL_state_string.3 SSL_want.3 SSL_write.3 \ | X509_NAME_ENTRY_get_object.3 X509_NAME_add_entry_by_txt.3 \ | - X509_NAME_get_index_by_NID.3 X509_new.3 X509_NAME_print_ex.3 \ | - blowfish.3 bn.3 bn_internal.3 bio.3 buffer.3 crypto.3 \ | - d2i_ASN1_OBJECT.3 d2i_DHparams.3 d2i_DSAPublicKey.3 \ | - d2i_PKCS8PrivateKey.3 d2i_RSAPublicKey.3 d2i_X509_ALGOR.3 \ | - d2i_X509_CRL.3 d2i_X509.3 d2i_X509_NAME.3 d2i_X509_REQ.3 \ | - d2i_X509_SIG.3 d2i_SSL_SESSION.3 des.3 dh.3 dsa.3 ecdsa.3 engine.3 \ | - err.3 evp.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 pem.3 rand.3 \ | - rc4.3 ripemd.3 rsa.3 sha.3 ssl.3 threads.3 ui.3 ui_compat.3 x509.3 | + X509_NAME_get_index_by_NID.3 X509_NAME_print_ex.3 \ | + X509_STORE_CTX_get_error.3 X509_STORE_CTX_get_ex_new_index.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_set_verify_cb.3 \ | + X509_STORE_set_verify_cb_func.3 X509_VERIFY_PARAM_set_flags.3 \ | + X509_new.3 X509_verify_cert.3 bio.3 blowfish.3 bn.3 bn_internal.3 \ | + buffer.3 crypto.3 d2i_ASN1_OBJECT.3 d2i_DHparams.3 d2i_DSAPublicKey.3 \ | + d2i_PKCS8PrivateKey.3 d2i_RSAPublicKey.3 d2i_SSL_SESSION.3 d2i_X509.3 \ | + d2i_X509_ALGOR.3 d2i_X509_CRL.3 d2i_X509_NAME.3 d2i_X509_REQ.3 \ | + d2i_X509_SIG.3 des.3 dh.3 dsa.3 ecdsa.3 engine.3 err.3 evp.3 hmac.3 \ | + i2d_CMS_bio_stream.3 i2d_PKCS7_bio_stream.3 lh_stats.3 lhash.3 md5.3 \ | + mdc2.3 pem.3 rand.3 rc4.3 ripemd.3 rsa.3 sha.3 ssl.3 threads.3 ui.3 \ | + ui_compat.3 x509.3 | | MAN5= config.5 x509v3_config.5 | | MAN7= des_modes.7 | | -MLINKS= dgst.1 md4.1 \ | - dgst.1 sha.1 \ | - dgst.1 mdc2.1 \ | - dgst.1 ripemd160.1 \ | - dgst.1 md2.1 \ | - dgst.1 sha1.1 \ | - dgst.1 md5.1 \ | - ASN1_OBJECT_new.3 ASN1_OBJECT_free.3 \ | +MLINKS= ASN1_OBJECT_new.3 ASN1_OBJECT_free.3 \ | ASN1_STRING_length.3 ASN1_STRING_cmp.3 \ | ASN1_STRING_length.3 ASN1_STRING_data.3 \ | ASN1_STRING_length.3 ASN1_STRING_dup.3 \ | + ASN1_STRING_length.3 ASN1_STRING_length_set.3 \ | ASN1_STRING_length.3 ASN1_STRING_set.3 \ | ASN1_STRING_length.3 ASN1_STRING_type.3 \ | - ASN1_STRING_length.3 ASN1_STRING_length_set.3 \ | ASN1_STRING_new.3 ASN1_STRING_free.3 \ | ASN1_STRING_new.3 ASN1_STRING_type_new.3 \ | ASN1_STRING_print_ex.3 ASN1_STRING_print_ex_fp.3 \ | @@ -234,16 +252,16 @@ MLINKS= dgst.1 md4.1 \ | BIO_should_retry.3 BIO_should_read.3 \ | BIO_should_retry.3 BIO_should_write.3 \ | BN_BLINDING_new.3 BN_BLINDING_convert.3 \ | + BN_BLINDING_new.3 BN_BLINDING_convert_ex.3 \ | + BN_BLINDING_new.3 BN_BLINDING_create_param.3 \ | BN_BLINDING_new.3 BN_BLINDING_free.3 \ | - BN_BLINDING_new.3 BN_BLINDING_update.3 \ | + BN_BLINDING_new.3 BN_BLINDING_get_flags.3 \ | + BN_BLINDING_new.3 BN_BLINDING_get_thread_id.3 \ | BN_BLINDING_new.3 BN_BLINDING_invert.3 \ | - BN_BLINDING_new.3 BN_BLINDING_convert_ex.3 \ | BN_BLINDING_new.3 BN_BLINDING_invert_ex.3 \ | - BN_BLINDING_new.3 BN_BLINDING_get_thread_id.3 \ | - BN_BLINDING_new.3 BN_BLINDING_set_thread_id.3 \ | - BN_BLINDING_new.3 BN_BLINDING_get_flags.3 \ | BN_BLINDING_new.3 BN_BLINDING_set_flags.3 \ | - BN_BLINDING_new.3 BN_BLINDING_create_param.3 \ | + BN_BLINDING_new.3 BN_BLINDING_set_thread_id.3 \ | + BN_BLINDING_new.3 BN_BLINDING_update.3 \ | BN_CTX_new.3 BN_CTX_free.3 \ | BN_CTX_new.3 BN_CTX_init.3 \ | BN_CTX_start.3 BN_CTX_end.3 \ | @@ -312,6 +330,28 @@ MLINKS= dgst.1 md4.1 \ | BN_zero.3 BN_one.3 \ | BN_zero.3 BN_set_word.3 \ | BN_zero.3 BN_value_one.3 \ | + CMS_add0_cert.3 CMS_add0_crl.3 \ | + CMS_add0_cert.3 CMS_add1_cert.3 \ | + CMS_add0_cert.3 CMS_get1_certs.3 \ | + CMS_add0_cert.3 CMS_get1_crls.3 \ | + CMS_add1_recipient_cert.3 CMS_add0_recipient_key.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_decrypt.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_kekri_get0_id.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_kekri_id_cmp.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_ktri_cert_cmp.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_ktri_get0_signer_id.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_set0_key.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_set0_pkey.3 \ | + CMS_get0_RecipientInfos.3 CMS_RecipientInfo_type.3 \ | + CMS_get0_SignerInfos.3 CMS_SignerInfo_cert_cmp.3 \ | + CMS_get0_SignerInfos.3 CMS_SignerInfo_get0_signer_id.3 \ | + CMS_get0_SignerInfos.3 CMS_set1_signer_certs.3 \ | + CMS_get0_type.3 CMS_get0_eContentType.3 \ | + CMS_get0_type.3 CMS_set1_eContentType.3 \ | + CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_create0.3 \ | + CMS_get1_ReceiptRequest.3 CMS_ReceiptRequest_get0_values.3 \ | + CMS_get1_ReceiptRequest.3 CMS_add1_ReceiptRequest.3 \ | + CMS_sign_add1_signer.3 CMS_SignerInfo_sign.3 \ | CONF_modules_free.3 CONF_modules_finish.3 \ | CONF_modules_free.3 CONF_modules_unload.3 \ | CONF_modules_load_file.3 CONF_modules_load.3 \ | @@ -387,6 +427,10 @@ MLINKS= dgst.1 md4.1 \ | EVP_DigestInit.3 EVP_ripemd160.3 \ | EVP_DigestInit.3 EVP_sha.3 \ | EVP_DigestInit.3 EVP_sha1.3 \ | + EVP_DigestSignInit.3 EVP_DigestSignFinal.3 \ | + EVP_DigestSignInit.3 EVP_DigestSignUpdate.3 \ | + EVP_DigestVerifyInit.3 EVP_DigestVerifyFinal.3 \ | + EVP_DigestVerifyInit.3 EVP_DigestVerifyUpdate.3 \ | EVP_EncryptInit.3 EVP_CIPHER_CTX_block_size.3 \ | EVP_EncryptInit.3 EVP_CIPHER_CTX_cipher.3 \ | EVP_EncryptInit.3 EVP_CIPHER_CTX_cleanup.3 \ | @@ -422,15 +466,38 @@ MLINKS= dgst.1 md4.1 \ | EVP_EncryptInit.3 EVP_DecryptInit_ex.3 \ | EVP_EncryptInit.3 EVP_DecryptUpdate.3 \ | EVP_EncryptInit.3 EVP_EncryptFinal.3 \ | - EVP_EncryptInit.3 EVP_EncryptInit_ex.3 \ | EVP_EncryptInit.3 EVP_EncryptFinal_ex.3 \ | + EVP_EncryptInit.3 EVP_EncryptInit_ex.3 \ | EVP_EncryptInit.3 EVP_EncryptUpdate.3 \ | EVP_EncryptInit.3 EVP_get_cipherbyname.3 \ | EVP_EncryptInit.3 EVP_get_cipherbynid.3 \ | EVP_EncryptInit.3 EVP_get_cipherbyobj.3 \ | EVP_OpenInit.3 EVP_OpenFinal.3 \ | EVP_OpenInit.3 EVP_OpenUpdate.3 \ | + EVP_PKEY_CTX_ctrl.3 EVP_PKEY_ctrl.3 \ | + EVP_PKEY_CTX_ctrl.3 EVP_PKEY_ctrl_str.3 \ | + EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_dup.3 \ | + EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_free.3 \ | + EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_new_id.3 \ | + EVP_PKEY_cmp.3 EVP_PKEY_cmp_parameters.3 \ | + EVP_PKEY_cmp.3 EVP_PKEY_copy_parameters.3 \ | + EVP_PKEY_cmp.3 EVP_PKEY_missing_parameters.3 \ | + EVP_PKEY_decrypt.3 EVP_PKEY_decrypt_init.3 \ | + EVP_PKEY_derive.3 EVP_PKEY_derive_init.3 \ | + EVP_PKEY_derive.3 EVP_PKEY_derive_set_peer.3 \ | + EVP_PKEY_encrypt.3 EVP_PKEY_encrypt_init.3 \ | + EVP_PKEY_get_default_digest.3 EVP_PKEY_get_default_digest_nid.3 \ | + EVP_PKEY_keygen.3 EVP_PKEVP_PKEY_CTX_set_app_data.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_app_data.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_cb.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_CTX_get_keygen_info.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_CTX_set_cb.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_keygen_init.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_paramgen.3 \ | + EVP_PKEY_keygen.3 EVP_PKEY_paramgen_init.3 \ | EVP_PKEY_new.3 EVP_PKEY_free.3 \ | + EVP_PKEY_print_private.3 EVP_PKEY_print_params.3 \ | + EVP_PKEY_print_private.3 EVP_PKEY_print_public.3 \ | EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DH.3 \ | EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_DSA.3 \ | EVP_PKEY_set1_RSA.3 EVP_PKEY_assign_EC_KEY.3 \ | @@ -443,6 +510,9 @@ MLINKS= dgst.1 md4.1 \ | EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_DSA.3 \ | EVP_PKEY_set1_RSA.3 EVP_PKEY_set1_EC_KEY.3 \ | EVP_PKEY_set1_RSA.3 EVP_PKEY_type.3 \ | + EVP_PKEY_sign.3 EVP_PKEY_sign_init.3 \ | + EVP_PKEY_verify.3 EVP_PKEY_verify_init.3 \ | + EVP_PKEY_verifyrecover.3 EVP_PKEY_verifyrecover_init.3 \ | EVP_SealInit.3 EVP_SealFinal.3 \ | EVP_SealInit.3 EVP_SealUpdate.3 \ | EVP_SignInit.3 EVP_SignFinal.3 \ | @@ -463,9 +533,9 @@ MLINKS= dgst.1 md4.1 \ | OBJ_nid2obj.3 OBJ_txt2obj.3 \ | OPENSSL_VERSION_NUMBER.3 SSLeay.3 \ | OPENSSL_VERSION_NUMBER.3 SSLeay_version.3 \ | + OPENSSL_config.3 OPENSSL_no_config.3 \ | OpenSSL_add_all_algorithms.3 OpenSSL_add_all_ciphers.3 \ | OpenSSL_add_all_algorithms.3 OpenSSL_add_all_digests.3 \ | - OPENSSL_config.3 OPENSSL_no_config.3 \ | RAND_add.3 RAND_event.3 \ | RAND_add.3 RAND_screen.3 \ | RAND_add.3 RAND_seed.3 \ | @@ -567,6 +637,7 @@ MLINKS= dgst.1 md4.1 \ | SSL_CTX_set_options.3 SSL_get_options.3 \ | SSL_CTX_set_options.3 SSL_get_secure_renegotiation_support.3 \ | SSL_CTX_set_options.3 SSL_set_options.3 \ | + SSL_CTX_set_psk_client_callback.3 SSL_set_psk_client_callback.3 \ | SSL_CTX_set_quiet_shutdown.3 SSL_CTX_get_quiet_shutdown.3 \ | SSL_CTX_set_quiet_shutdown.3 SSL_get_quiet_shutdown.3 \ | SSL_CTX_set_quiet_shutdown.3 SSL_set_quiet_shutdown.3 \ | @@ -594,8 +665,8 @@ MLINKS= dgst.1 md4.1 \ | SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_ASN1.3 \ | SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_file.3 \ | SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_ASN1.3 \ | - SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_file.3 \ | SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_chain_file.3 \ | + SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_file.3 \ | SSL_CTX_use_certificate.3 SSL_check_private_key.3 \ | SSL_CTX_use_certificate.3 SSL_use_PrivateKey.3 \ | SSL_CTX_use_certificate.3 SSL_use_PrivateKey_ASN1.3 \ | @@ -606,6 +677,9 @@ MLINKS= dgst.1 md4.1 \ | SSL_CTX_use_certificate.3 SSL_use_certificate.3 \ | SSL_CTX_use_certificate.3 SSL_use_certificate_ASN1.3 \ | SSL_CTX_use_certificate.3 SSL_use_certificate_file.3 \ | + SSL_CTX_use_psk_identity_hint.3 SSL_CTX_set_psk_server_callback.3 \ | + SSL_CTX_use_psk_identity_hint.3 SSL_set_psk_server_callback.3 \ | + SSL_CTX_use_psk_identity_hint.3 SSL_use_psk_identity_hint.3 \ | SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_ex_data.3 \ | SSL_SESSION_get_ex_new_index.3 SSL_SESSION_set_ex_data.3 \ | SSL_SESSION_get_time.3 SSL_SESSION_get_timeout.3 \ | @@ -622,6 +696,7 @@ MLINKS= dgst.1 md4.1 \ | SSL_get_current_cipher.3 SSL_get_cipher_version.3 \ | SSL_get_ex_new_index.3 SSL_get_ex_data.3 \ | SSL_get_ex_new_index.3 SSL_set_ex_data.3 \ | + SSL_get_psk_identity.3 SSL_get_psk_identity_hint.3 \ | SSL_library_init.3 OpenSSL_add_ssl_algorithms.3 \ | SSL_library_init.3 SSLeay_add_ssl_algorithms.3 \ | SSL_rstate_string.3 SSL_rstate_string_long.3 \ | @@ -650,6 +725,33 @@ MLINKS= dgst.1 md4.1 \ | X509_NAME_print_ex.3 X509_NAME_oneline.3 \ | X509_NAME_print_ex.3 X509_NAME_print.3 \ | X509_NAME_print_ex.3 X509_NAME_print_ex_fp.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_cleanup.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_free.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_get0_param.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_init.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_set0_crls.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_set0_param.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_set_cert.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_set_chain.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_set_default.3 \ | + X509_STORE_CTX_new.3 X509_STORE_CTX_trusted_stack.3 \ | + X509_STORE_CTX_get_error.3 X509_STORE_CTX_get1_chain.3 \ | + X509_STORE_CTX_get_error.3 X509_STORE_CTX_get_current_cert.3 \ | + X509_STORE_CTX_get_error.3 X509_STORE_CTX_get_error_depth.3 \ | + X509_STORE_CTX_get_error.3 X509_STORE_CTX_set_error.3 \ | + X509_STORE_CTX_get_error.3 X509_verify_cert_error_string.3 \ | + X509_STORE_CTX_get_ex_new_index.3 X509_STORE_CTX_get_ex_data.3 \ | + X509_STORE_CTX_get_ex_new_index.3 X509_STORE_CTX_set_ex_data.3 \ | + X509_STORE_set_verify_cb_func.3 X509_STORE_set_verify_cb.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_add0_policy.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_clear_flags.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_get_depth.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_get_flags.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set1_policies.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_depth.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_purpose.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_time.3 \ | + X509_VERIFY_PARAM_set_flags.3 X509_VERIFY_PARAM_set_trust.3 \ | X509_new.3 X509_free.3 \ | blowfish.3 BF_cbc_encrypt.3 \ | blowfish.3 BF_cfb64_encrypt.3 \ | @@ -715,9 +817,9 @@ MLINKS= dgst.1 md4.1 \ | d2i_RSAPublicKey.3 i2d_RSAPublicKey.3 \ | d2i_RSAPublicKey.3 i2d_RSA_PUBKEY.3 \ | d2i_SSL_SESSION.3 i2d_SSL_SESSION.3 \ | - d2i_X509.3 i2d_X509.3 \ | d2i_X509.3 d2i_X509_REQ_bio.3 \ | d2i_X509.3 d2i_X509_REQ_fp.3 \ | + d2i_X509.3 i2d_X509.3 \ | d2i_X509.3 i2d_X509_bio.3 \ | d2i_X509.3 i2d_X509_fp.3 \ | d2i_X509_ALGOR.3 i2d_X509_ALGOR.3 \ | @@ -727,12 +829,12 @@ MLINKS= dgst.1 md4.1 \ | d2i_X509_CRL.3 i2d_X509_CRL_bio.3 \ | d2i_X509_CRL.3 i2d_X509_CRL_fp.3 \ | d2i_X509_NAME.3 i2d_X509_NAME.3 \ | + d2i_X509_REQ.3 d2i_X509_CRL_bio.3 \ | + d2i_X509_REQ.3 d2i_X509_fp.3 \ | d2i_X509_REQ.3 i2d_X509_REQ.3 \ | d2i_X509_REQ.3 i2d_X509_REQ_bio.3 \ | d2i_X509_REQ.3 i2d_X509_REQ_fp.3 \ | d2i_X509_SIG.3 i2d_X509_SIG.3 \ | - d2i_X509_REQ.3 d2i_X509_fp.3 \ | - d2i_X509_REQ.3 d2i_X509_CRL_bio.3 \ | des.3 DES_cbc_cksum.3 \ | des.3 DES_cfb64_encrypt.3 \ | des.3 DES_cfb_encrypt.3 \ | @@ -765,6 +867,14 @@ MLINKS= dgst.1 md4.1 \ | des.3 DES_string_to_2keys.3 \ | des.3 DES_string_to_key.3 \ | des.3 DES_xcbc_encrypt.3 \ | + des_modes.7 Modes_of_DES.7 \ | + dgst.1 md2.1 \ | + dgst.1 md4.1 \ | + dgst.1 md5.1 \ | + dgst.1 mdc2.1 \ | + dgst.1 ripemd160.1 \ | + dgst.1 sha.1 \ | + dgst.1 sha1.1 \ | hmac.3 HMAC.3 \ | hmac.3 HMAC_Final.3 \ | hmac.3 HMAC_Init.3 \ | @@ -800,7 +910,7 @@ MLINKS= dgst.1 md4.1 \ | mdc2.3 MDC2_Init.3 \ | mdc2.3 MDC2_Update.3 \ | pem.3 PEM.3 \ | - pem.3 PEM_read_DHparams.3 \ | + pem.3 PEM_read_DHparams.3 \ | pem.3 PEM_read_DSAPrivateKey.3 \ | pem.3 PEM_read_DSA_PUBKEY.3 \ | pem.3 PEM_read_DSAparams.3 \ | @@ -877,6 +987,12 @@ MLINKS= dgst.1 md4.1 \ | sha.3 SHA1_Init.3 \ | sha.3 SHA1_Update.3 \ | ssl.3 SSL.3 \ | + threads.3 CRYPTO_THREADID_cmp.3 \ | + threads.3 CRYPTO_THREADID_cpy.3 \ | + threads.3 CRYPTO_THREADID_current.3 \ | + threads.3 CRYPTO_THREADID_get_callback.3 \ | + threads.3 CRYPTO_THREADID_hash.3 \ | + threads.3 CRYPTO_THREADID_set_callback.3 \ | threads.3 CRYPTO_destroy_dynlockid.3 \ | threads.3 CRYPTO_get_new_dynlockid.3 \ | threads.3 CRYPTO_lock.3 \ | @@ -914,8 +1030,7 @@ MLINKS= dgst.1 md4.1 \ | ui_compat.3 des_read_2passwords.3 \ | ui_compat.3 des_read_password.3 \ | ui_compat.3 des_read_pw.3 \ | - ui_compat.3 des_read_pw_string.3 \ | - des_modes.7 Modes_of_DES.7 | + ui_compat.3 des_read_pw_string.3 | | .include | | @@ -935,12 +1050,6 @@ EXTRACONFIGURE+= 386 | EXTRACONFIGURE+= no-sse2 | .endif | | -.if !defined(WITH_FIPS) | -EXTRACONFIGURE+= no-fips | -.else | -EXTRACONFIGURE+= fips no-asm | -.endif | - | .if defined(NOSHARED) | PLIST_SUB+= SHARED="@comment " | .else | @@ -957,6 +1066,28 @@ EXTRACONFIGURE+= zlib | EXTRACONFIGURE+= no-zlib | .endif | | +.if defined(WITH_SCTP) | +WITH_DTLS_RENEGOTIATION?= yes | +WITH_TLS_EXTRACTOR?= yes | +EXTRACONFIGURE+= sctp | +.if defined(WITH_DTLS_HEARTBEAT) | +BROKEN= Patches do not merge, please change options | +.endif | +.endif | +# order of PATCHFILES is important | +.if defined(WITH_DTLS_RENEGOTIATION) || make(makesum) | +PATCHFILES+= abbreviated-renegotiation.patch | +.endif | +.if defined(WITH_TLS_EXTRACTOR) || make(makesum) | +PATCHFILES+= tls-extractor.patch | +.endif | +.if defined(WITH_SCTP) || make(makesum) | +PATCHFILES+= dtls-sctp-16.patch | +.endif | +.if defined(WITH_DTLS_HEARTBEAT) || make(makesum) | +PATCHFILES+= dtls-heartbeats.patch | +.endif | + | .if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER} | pre-everything:: | @${ECHO_CMD} "#" | @@ -970,12 +1101,7 @@ pre-everything:: | | do-configure: | @${REINPLACE_CMD} -e "s|options 386|options|" \ | - ${WRKSRC}/config | -.if !defined(WITH_FIPS) | - ${RM} -rf ${WRKSRC}/fips | - ${RM} -f ${WRKSRC}/include/openssl/fips.h | - ${RM} -f ${WRKSRC}/include/openssl/fips_rand.h | -.endif | + ${WRKSRC}/config | .if defined(WITH_OPENSSL_THREADS) | cd ${WRKSRC} \ | && ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \ | @@ -988,39 +1114,11 @@ do-configure: | ./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \ | -L${PREFIX}/lib ${EXTRACONFIGURE} | .endif | -.if defined(WITH_FIPS) | - @${REINPLACE_CMD} \ | - -e 's|^MANDIR=.*$$|MANDIR=$$(MANPREFIX)/man|' \ | - -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ | - -e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \ | - ${WRKSRC}/Makefile | -.else | @${REINPLACE_CMD} \ | -e 's|^MANDIR=.*$$|MANDIR=$$(MANPREFIX)/man|' \ | -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ | -e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \ | - -e 's| build_fips | |' \ | ${WRKSRC}/Makefile | - @${REINPLACE_CMD} \ | - -e 's| fips_err.c||' \ | - -e 's| fips_err.o | |' \ | - ${WRKSRC}/crypto/Makefile | - @${REINPLACE_CMD} \ | - -e 's|$$(FIPS_SHATEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_DESTEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_RANDTEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_AESTEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_HMACTEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_RSAVTEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_RSASTEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_RSAGTEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_DSSVS)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_DSATEST)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_RNGVS)$$(EXE_EXT)||' \ | - -e 's|$$(FIPS_TEST_SUITE)$$(EXE_EXT)||' \ | - ${WRKSRC}/test/Makefile | -.endif | - @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} depend) | | post-install: | .if !defined(NOSHARED) http://cvsweb.FreeBSD.org/ports/security/openssl/distinfo.diff?r1=1.57&r2=1.58&f=h | --- ports/security/openssl/distinfo 2010/03/30 19:07:14 1.57 | +++ ports/security/openssl/distinfo 2010/04/02 18:42:11 1.58 | @@ -1,3 +1,18 @@ | -MD5 (openssl-0.9.8n.tar.gz) = 076d8efc3ed93646bd01f04e23c07066 | -SHA256 (openssl-0.9.8n.tar.gz) = b01abc28376b866515df58f1b004da8453166291783d4e7477cda89b000c1f01 | -SIZE (openssl-0.9.8n.tar.gz) = 3770041 | +MD5 (openssl-1.0.0/openssl-1.0.0.tar.gz) = 89eaa86e25b2845f920ec00ae4c864ed | +SHA256 (openssl-1.0.0/openssl-1.0.0.tar.gz) = 1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca | +SIZE (openssl-1.0.0/openssl-1.0.0.tar.gz) = 4010166 | +MD5 (openssl-1.0.0/dtls-sctp-16.patch) = d2d9e318dcf297df05ccb00ac7197676 | +SHA256 (openssl-1.0.0/dtls-sctp-16.patch) = 8e6b5aa8430203801f86bb08e3d7813fade0a75f0afe260277184666fb61d20b | +SIZE (openssl-1.0.0/dtls-sctp-16.patch) = 50055 | +MD5 (openssl-1.0.0/dtls-bugs-1.0.0.patch) = 70e19be97bf375005132b2b764f0fb11 | +SHA256 (openssl-1.0.0/dtls-bugs-1.0.0.patch) = 638141568f155ff64dbc2545863783d3723e811ff3c3bd02881c5ede58beb11c | +SIZE (openssl-1.0.0/dtls-bugs-1.0.0.patch) = 1333 | +MD5 (openssl-1.0.0/abbreviated-renegotiation.patch) = ede88c89aa5278d65308f0609009a136 | +SHA256 (openssl-1.0.0/abbreviated-renegotiation.patch) = e4e2a4d8a352f606658f175ba603fe2355feb96eeef679decf3e10792e4e5725 | +SIZE (openssl-1.0.0/abbreviated-renegotiation.patch) = 6577 | +MD5 (openssl-1.0.0/tls-extractor.patch) = 23a88cd05cdb3f2040b0866b87586460 | +SHA256 (openssl-1.0.0/tls-extractor.patch) = bb1aa486327fd96f9d6b870f0a1ad2c83dd4c06a96284eb64dde3f833ba5e0d0 | +SIZE (openssl-1.0.0/tls-extractor.patch) = 1234 | +MD5 (openssl-1.0.0/dtls-heartbeats.patch) = 446c4632a49ab1293e203891a0fc3317 | +SHA256 (openssl-1.0.0/dtls-heartbeats.patch) = 4da57a6e9cd779a3f8f1f2055919cbea09eb09b281337b2108f952cb77764355 | +SIZE (openssl-1.0.0/dtls-heartbeats.patch) = 14113 http://cvsweb.FreeBSD.org/ports/security/openssl/files/patch-Configure.diff?r1=1.10&r2=1.11&f=h | --- ports/security/openssl/files/patch-Configure 2010/01/23 18:00:29 1.10 | +++ ports/security/openssl/files/patch-Configure 2010/04/02 18:42:11 1.11 | @@ -1,40 +1,40 @@ | ---- Configure.orig 2008-05-02 01:11:30.000000000 +0200 | -+++ Configure 2008-05-29 13:55:51.000000000 +0200 | -@@ -132,7 +132,7 @@ | +--- Configure.orig 2009-07-08 10:50:52.000000000 +0200 | ++++ Configure 2009-09-11 14:02:22.000000000 +0200 | +@@ -144,7 +144,7 @@ | # which has to be accompanied by explicit -D_THREAD_SAFE and | # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which | # seems to be sufficient? | -my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT"; | +my $BSDthreads="$ENV{'PTHREAD_LIBS'} -D_REENTRANT $ENV{'PTHREAD_CFLAGS'}"; | | - #config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags | + #config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib | | -@@ -359,19 +359,20 @@ | - "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", | +@@ -376,19 +376,20 @@ | + "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", | | #### *BSD [do see comment about ${BSDthreads} above!] | -"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | --"BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | +-"BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | -"BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | -"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | --"BSD-sparcv8", "gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | +-"BSD-sparcv8", "gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | +"BSD-generic32","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | -+"BSD-x86", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", | ++"BSD-x86", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", | +"BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", | +"debug-BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", | -+"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | ++"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | | -"BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | +"BSD-generic64","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it | # simply *happens* to work around a compiler bug in gcc 3.3.3, | # triggered by RIPEMD160 code. | --"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | --"BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | --"BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | -+"BSD-sparc64", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | -+"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | -+"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | +-"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | +-"BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | +-"BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ++"BSD-sparc64", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | ++"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | ++"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | +"BSD-alpha", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", | | "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", http://cvsweb.FreeBSD.org/ports/security/openssl/pkg-plist.diff?r1=1.39&r2=1.40&f=h | --- ports/security/openssl/pkg-plist 2009/07/07 04:31:07 1.39 | +++ ports/security/openssl/pkg-plist 2010/04/02 18:42:11 1.40 | @@ -8,8 +8,9 @@ include/openssl/bio.h | include/openssl/blowfish.h | include/openssl/bn.h | include/openssl/buffer.h | -include/openssl/cast.h | include/openssl/camellia.h | +include/openssl/cast.h | +include/openssl/cms.h | include/openssl/comp.h | include/openssl/conf.h | include/openssl/conf_api.h | @@ -23,8 +24,8 @@ include/openssl/dtls1.h | include/openssl/e_os2.h | include/openssl/ebcdic.h | include/openssl/ec.h | -include/openssl/ecdsa.h | include/openssl/ecdh.h | +include/openssl/ecdsa.h | include/openssl/engine.h | include/openssl/err.h | include/openssl/evp.h | @@ -33,12 +34,13 @@ include/openssl/idea.h | include/openssl/krb5_asn.h | include/openssl/kssl.h | include/openssl/lhash.h | -include/openssl/md2.h | include/openssl/md4.h | include/openssl/md5.h | -include/openssl/ocsp.h | +include/openssl/mdc2.h | +include/openssl/modes.h | include/openssl/obj_mac.h | include/openssl/objects.h | +include/openssl/ocsp.h | include/openssl/opensslconf.h | include/openssl/opensslv.h | include/openssl/ossl_typ.h | @@ -47,26 +49,26 @@ include/openssl/pem2.h | include/openssl/pkcs12.h | include/openssl/pkcs7.h | include/openssl/pqueue.h | -include/openssl/pq_compat.h | include/openssl/rand.h | include/openssl/rc2.h | include/openssl/rc4.h | include/openssl/ripemd.h | include/openssl/rsa.h | include/openssl/safestack.h | +include/openssl/seed.h | include/openssl/sha.h | include/openssl/ssl.h | include/openssl/ssl2.h | include/openssl/ssl23.h | include/openssl/ssl3.h | include/openssl/stack.h | -include/openssl/store.h | include/openssl/symhacks.h | include/openssl/tls1.h | -include/openssl/tmdiff.h | +include/openssl/ts.h | include/openssl/txt_db.h | include/openssl/ui.h | include/openssl/ui_compat.h | +include/openssl/whrlpool.h | include/openssl/x509.h | include/openssl/x509_vfy.h | include/openssl/x509v3.h | @@ -77,7 +79,9 @@ lib/engines/libcapi.so | lib/engines/libchil.so | lib/engines/libcswift.so | lib/engines/libgmp.so | +lib/engines/libgost.so | lib/engines/libnuron.so | +lib/engines/libpadlock.so | lib/engines/libsureware.so | lib/engines/libubsec.so | lib/libcrypto.a | @@ -87,8 +91,8 @@ lib/libssl.a | %%SHARED%%lib/libssl.so | %%SHARED%%lib/libssl.so.%%SHLIBVER%% | libdata/pkgconfig/libcrypto.pc | -libdata/pkgconfig/openssl.pc | libdata/pkgconfig/libssl.pc | +libdata/pkgconfig/openssl.pc | @dirrm lib/engines | openssl/misc/CA.pl | openssl/misc/CA.sh | @@ -96,6 +100,7 @@ openssl/misc/c_hash | openssl/misc/c_info | openssl/misc/c_issuer | openssl/misc/c_name | +openssl/misc/tsget | openssl/openssl.cnf.sample | %%PORTDOCS%%%%DOCSDIR%%/openssl.txt | @dirrm include/openssl