svn commit: r267277 - in projects/sendfile: . bin/ed bin/ps bin/rmail bin/sh contrib/openpam/lib/libpam crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/asn1 crypto/op...

Gleb Smirnoff glebius at FreeBSD.org
Mon Jun 9 14:46:43 UTC 2014 

Author: glebius
Date: Mon Jun  9 14:46:32 2014
New Revision: 267277
URL: http://svnweb.freebsd.org/changeset/base/267277

Log:
  Merge head r258543 through r267276.

Added:
  projects/sendfile/.arclint
     - copied unchanged from r267276, head/.arclint
  projects/sendfile/crypto/openssl/ssl/heartbeat_test.c
     - copied unchanged from r267276, head/crypto/openssl/ssl/heartbeat_test.c
  projects/sendfile/include/xlocale/_strings.h
     - copied unchanged from r267276, head/include/xlocale/_strings.h
  projects/sendfile/libexec/atf/atf-sh/
     - copied from r267276, head/libexec/atf/atf-sh/
  projects/sendfile/share/vt/
     - copied from r267276, head/share/vt/
  projects/sendfile/sys/arm/conf/ARNDALE-OCTA
     - copied unchanged from r267276, head/sys/arm/conf/ARNDALE-OCTA
  projects/sendfile/sys/arm/conf/EXYNOS5.common
     - copied unchanged from r267276, head/sys/arm/conf/EXYNOS5.common
  projects/sendfile/sys/arm/conf/EXYNOS5250
     - copied unchanged from r267276, head/sys/arm/conf/EXYNOS5250
  projects/sendfile/sys/arm/conf/EXYNOS5420
     - copied unchanged from r267276, head/sys/arm/conf/EXYNOS5420
  projects/sendfile/sys/arm/conf/RADXA-LITE
     - copied unchanged from r267276, head/sys/arm/conf/RADXA-LITE
  projects/sendfile/sys/arm/conf/RK3188
     - copied unchanged from r267276, head/sys/arm/conf/RK3188
  projects/sendfile/sys/arm/samsung/exynos/exynos_uart.c
     - copied unchanged from r267276, head/sys/arm/samsung/exynos/exynos_uart.c
  projects/sendfile/sys/arm/samsung/exynos/exynos_uart.h
     - copied unchanged from r267276, head/sys/arm/samsung/exynos/exynos_uart.h
  projects/sendfile/sys/arm/samsung/exynos/std.exynos5250
     - copied unchanged from r267276, head/sys/arm/samsung/exynos/std.exynos5250
  projects/sendfile/sys/arm/samsung/exynos/std.exynos5420
     - copied unchanged from r267276, head/sys/arm/samsung/exynos/std.exynos5420
  projects/sendfile/sys/boot/fdt/dts/Makefile
     - copied unchanged from r267276, head/sys/boot/fdt/dts/Makefile
  projects/sendfile/sys/boot/fdt/dts/Makefile.inc
     - copied unchanged from r267276, head/sys/boot/fdt/dts/Makefile.inc
  projects/sendfile/sys/boot/fdt/dts/arm/Makefile
     - copied unchanged from r267276, head/sys/boot/fdt/dts/arm/Makefile
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5.dtsi
     - copied unchanged from r267276, head/sys/boot/fdt/dts/arm/exynos5.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
     - copied unchanged from r267276, head/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5420.dtsi
     - copied unchanged from r267276, head/sys/boot/fdt/dts/arm/exynos5420.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
     - copied unchanged from r267276, head/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
  projects/sendfile/sys/boot/fdt/dts/mips/Makefile
     - copied unchanged from r267276, head/sys/boot/fdt/dts/mips/Makefile
  projects/sendfile/sys/boot/fdt/dts/powerpc/Makefile
     - copied unchanged from r267276, head/sys/boot/fdt/dts/powerpc/Makefile
  projects/sendfile/sys/boot/fdt/dts/powerpc/p2041rdb.dts
     - copied unchanged from r267276, head/sys/boot/fdt/dts/powerpc/p2041rdb.dts
  projects/sendfile/sys/boot/fdt/dts/powerpc/p3041ds.dts
     - copied unchanged from r267276, head/sys/boot/fdt/dts/powerpc/p3041ds.dts
  projects/sendfile/sys/boot/fdt/dts/powerpc/p5020ds.dts
     - copied unchanged from r267276, head/sys/boot/fdt/dts/powerpc/p5020ds.dts
  projects/sendfile/sys/boot/usb/storage/
     - copied from r267276, head/sys/boot/usb/storage/
  projects/sendfile/sys/dev/usb/controller/saf1761_otg_boot.c
     - copied unchanged from r267276, head/sys/dev/usb/controller/saf1761_otg_boot.c
  projects/sendfile/sys/dev/virtio/virtio_config.h
     - copied unchanged from r267276, head/sys/dev/virtio/virtio_config.h
  projects/sendfile/sys/dev/virtio/virtio_ids.h
     - copied unchanged from r267276, head/sys/dev/virtio/virtio_ids.h
  projects/sendfile/sys/modules/usb/saf1761otg/
     - copied from r267276, head/sys/modules/usb/saf1761otg/
  projects/sendfile/tools/build/options/WITHOUT_VT_SUPPORT
     - copied unchanged from r267276, head/tools/build/options/WITHOUT_VT_SUPPORT
  projects/sendfile/tools/build/options/WITH_PIE
     - copied unchanged from r267276, head/tools/build/options/WITH_PIE
  projects/sendfile/tools/ifnet/
     - copied from r267276, head/tools/ifnet/
  projects/sendfile/usr.bin/truncate/tests/
     - copied from r267276, head/usr.bin/truncate/tests/
  projects/sendfile/usr.sbin/bsnmpd/modules/snmp_lm75/
     - copied from r267276, head/usr.sbin/bsnmpd/modules/snmp_lm75/
Deleted:
  projects/sendfile/sys/arm/conf/EXYNOS5250.common
  projects/sendfile/sys/arm/samsung/exynos/std.exynos5
  projects/sendfile/sys/arm/samsung/exynos/uart.c
  projects/sendfile/sys/arm/samsung/exynos/uart.h
  projects/sendfile/sys/boot/fdt/dts/arm/p2041rdb.dts
  projects/sendfile/sys/boot/fdt/dts/arm/p3041ds.dts
  projects/sendfile/sys/boot/fdt/dts/arm/p5020ds.dts
  projects/sendfile/sys/dev/vt/hw/xboxfb/
  projects/sendfile/sys/modules/usb/saf1761/
  projects/sendfile/tools/build/options/WITHOUT_TESTS
  projects/sendfile/usr.bin/atf/
Modified:
  projects/sendfile/.arcconfig
  projects/sendfile/Makefile.inc1
  projects/sendfile/UPDATING
  projects/sendfile/bin/ed/Makefile
  projects/sendfile/bin/ps/keyword.c
  projects/sendfile/bin/ps/ps.1
  projects/sendfile/bin/rmail/Makefile
  projects/sendfile/bin/sh/arith_yacc.c
  projects/sendfile/bin/sh/exec.c
  projects/sendfile/contrib/openpam/lib/libpam/openpam_configure.c
  projects/sendfile/crypto/openssl/ACKNOWLEDGMENTS
  projects/sendfile/crypto/openssl/CHANGES
  projects/sendfile/crypto/openssl/Makefile
  projects/sendfile/crypto/openssl/NEWS
  projects/sendfile/crypto/openssl/README
  projects/sendfile/crypto/openssl/apps/enc.c
  projects/sendfile/crypto/openssl/apps/ocsp.c
  projects/sendfile/crypto/openssl/apps/req.c
  projects/sendfile/crypto/openssl/apps/s_cb.c
  projects/sendfile/crypto/openssl/apps/s_socket.c
  projects/sendfile/crypto/openssl/apps/smime.c
  projects/sendfile/crypto/openssl/crypto/asn1/a_strnid.c
  projects/sendfile/crypto/openssl/crypto/bio/bss_dgram.c
  projects/sendfile/crypto/openssl/crypto/bn/bn_mont.c
  projects/sendfile/crypto/openssl/crypto/cms/cms_env.c
  projects/sendfile/crypto/openssl/crypto/cms/cms_sd.c
  projects/sendfile/crypto/openssl/crypto/cms/cms_smime.c
  projects/sendfile/crypto/openssl/crypto/dso/dso_dlfcn.c
  projects/sendfile/crypto/openssl/crypto/ec/ec_ameth.c
  projects/sendfile/crypto/openssl/crypto/ec/ec_asn1.c
  projects/sendfile/crypto/openssl/crypto/ec/ec_lcl.h
  projects/sendfile/crypto/openssl/crypto/evp/bio_b64.c
  projects/sendfile/crypto/openssl/crypto/evp/encode.c
  projects/sendfile/crypto/openssl/crypto/opensslv.h
  projects/sendfile/crypto/openssl/crypto/pkcs12/p12_crt.c
  projects/sendfile/crypto/openssl/crypto/pkcs12/p12_kiss.c
  projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_doit.c
  projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7.h
  projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7err.c
  projects/sendfile/crypto/openssl/crypto/rsa/rsa_ameth.c
  projects/sendfile/crypto/openssl/crypto/srp/srp_vfy.c
  projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_verify.c
  projects/sendfile/crypto/openssl/crypto/x509v3/v3_purp.c
  projects/sendfile/crypto/openssl/doc/apps/cms.pod
  projects/sendfile/crypto/openssl/doc/apps/enc.pod
  projects/sendfile/crypto/openssl/doc/apps/s_server.pod
  projects/sendfile/crypto/openssl/doc/apps/smime.pod
  projects/sendfile/crypto/openssl/doc/apps/verify.pod
  projects/sendfile/crypto/openssl/doc/apps/version.pod
  projects/sendfile/crypto/openssl/doc/apps/x509v3_config.pod
  projects/sendfile/crypto/openssl/doc/crypto/CMS_decrypt.pod
  projects/sendfile/crypto/openssl/doc/crypto/CONF_modules_free.pod
  projects/sendfile/crypto/openssl/doc/crypto/CONF_modules_load_file.pod
  projects/sendfile/crypto/openssl/doc/crypto/OPENSSL_config.pod
  projects/sendfile/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod
  projects/sendfile/crypto/openssl/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod
  projects/sendfile/crypto/openssl/doc/fingerprints.txt
  projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_set_msg_callback.pod
  projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
  projects/sendfile/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod
  projects/sendfile/crypto/openssl/engines/ccgost/gost_ameth.c
  projects/sendfile/crypto/openssl/ssl/Makefile
  projects/sendfile/crypto/openssl/ssl/d1_both.c
  projects/sendfile/crypto/openssl/ssl/d1_lib.c
  projects/sendfile/crypto/openssl/ssl/d1_pkt.c
  projects/sendfile/crypto/openssl/ssl/d1_srvr.c
  projects/sendfile/crypto/openssl/ssl/s3_clnt.c
  projects/sendfile/crypto/openssl/ssl/s3_pkt.c
  projects/sendfile/crypto/openssl/ssl/s3_srvr.c
  projects/sendfile/crypto/openssl/ssl/ssl.h
  projects/sendfile/crypto/openssl/ssl/ssl3.h
  projects/sendfile/crypto/openssl/ssl/ssl_asn1.c
  projects/sendfile/crypto/openssl/ssl/ssl_err.c
  projects/sendfile/crypto/openssl/ssl/ssl_lib.c
  projects/sendfile/crypto/openssl/ssl/t1_enc.c
  projects/sendfile/crypto/openssl/ssl/t1_lib.c
  projects/sendfile/etc/etc.amd64/ttys
  projects/sendfile/etc/etc.i386/ttys
  projects/sendfile/etc/mtree/BSD.tests.dist
  projects/sendfile/etc/mtree/BSD.usr.dist
  projects/sendfile/etc/mtree/BSD.var.dist
  projects/sendfile/etc/snmpd.config
  projects/sendfile/gnu/usr.bin/binutils/addr2line/Makefile
  projects/sendfile/gnu/usr.bin/binutils/nm/Makefile
  projects/sendfile/gnu/usr.bin/binutils/objcopy/Makefile
  projects/sendfile/gnu/usr.bin/binutils/objdump/Makefile
  projects/sendfile/gnu/usr.bin/binutils/readelf/Makefile
  projects/sendfile/gnu/usr.bin/binutils/size/Makefile
  projects/sendfile/gnu/usr.bin/binutils/strings/Makefile
  projects/sendfile/gnu/usr.bin/binutils/strip/Makefile
  projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile
  projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile
  projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/devices/grodvi/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/devices/grohtml/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/devices/grolbp/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/devices/grolj4/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/devices/grops/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/devices/grotty/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/preproc/eqn/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/preproc/grn/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/preproc/html/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/preproc/pic/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/preproc/refer/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/preproc/soelim/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/preproc/tbl/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/roff/groff/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/roff/troff/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/utils/indxbib/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/utils/lkbib/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/utils/lookbib/Makefile
  projects/sendfile/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
  projects/sendfile/gnu/usr.bin/groff/tmac/mdoc.local
  projects/sendfile/gnu/usr.bin/rcs/Makefile.inc
  projects/sendfile/gnu/usr.bin/texinfo/info/Makefile
  projects/sendfile/gnu/usr.bin/texinfo/infokey/Makefile
  projects/sendfile/gnu/usr.bin/texinfo/install-info/Makefile
  projects/sendfile/gnu/usr.bin/texinfo/makeinfo/Makefile
  projects/sendfile/gnu/usr.bin/texinfo/texindex/Makefile
  projects/sendfile/include/strings.h
  projects/sendfile/include/xlocale/Makefile
  projects/sendfile/include/xlocale/_string.h
  projects/sendfile/kerberos5/libexec/digest-service/Makefile
  projects/sendfile/kerberos5/libexec/hprop/Makefile
  projects/sendfile/kerberos5/libexec/hpropd/Makefile
  projects/sendfile/kerberos5/libexec/ipropd-master/Makefile
  projects/sendfile/kerberos5/libexec/ipropd-slave/Makefile
  projects/sendfile/kerberos5/libexec/kadmind/Makefile
  projects/sendfile/kerberos5/libexec/kcm/Makefile
  projects/sendfile/kerberos5/libexec/kdc/Makefile
  projects/sendfile/kerberos5/libexec/kdigest/Makefile
  projects/sendfile/kerberos5/libexec/kfd/Makefile
  projects/sendfile/kerberos5/libexec/kimpersonate/Makefile
  projects/sendfile/kerberos5/libexec/kpasswdd/Makefile
  projects/sendfile/kerberos5/tools/asn1_compile/Makefile
  projects/sendfile/kerberos5/tools/slc/Makefile
  projects/sendfile/kerberos5/usr.bin/hxtool/Makefile
  projects/sendfile/kerberos5/usr.bin/kadmin/Makefile
  projects/sendfile/kerberos5/usr.bin/kcc/Makefile
  projects/sendfile/kerberos5/usr.bin/kdestroy/Makefile
  projects/sendfile/kerberos5/usr.bin/kf/Makefile
  projects/sendfile/kerberos5/usr.bin/kgetcred/Makefile
  projects/sendfile/kerberos5/usr.bin/kinit/Makefile
  projects/sendfile/kerberos5/usr.bin/kpasswd/Makefile
  projects/sendfile/kerberos5/usr.bin/ksu/Makefile
  projects/sendfile/kerberos5/usr.bin/string2key/Makefile
  projects/sendfile/kerberos5/usr.bin/verify_krb5_conf/Makefile
  projects/sendfile/kerberos5/usr.sbin/iprop-log/Makefile
  projects/sendfile/kerberos5/usr.sbin/kstash/Makefile
  projects/sendfile/kerberos5/usr.sbin/ktutil/Makefile
  projects/sendfile/lib/atf/libatf-c++/Makefile
  projects/sendfile/lib/atf/libatf-c/Makefile
  projects/sendfile/lib/csu/amd64/Makefile
  projects/sendfile/lib/csu/i386-elf/Makefile
  projects/sendfile/lib/libc/gen/sem_wait.3
  projects/sendfile/lib/libc/stdio/fmemopen.c
  projects/sendfile/lib/libc/stdio/fopen.3
  projects/sendfile/lib/libc/string/strcasecmp.3
  projects/sendfile/lib/libc/sys/mlock.2
  projects/sendfile/lib/libcrypt/crypt.c
  projects/sendfile/lib/libcuse/Makefile
  projects/sendfile/lib/libcuse/cuse.3
  projects/sendfile/lib/libfetch/common.h
  projects/sendfile/lib/libfetch/fetch.3
  projects/sendfile/lib/libfetch/fetch.h
  projects/sendfile/lib/libfetch/http.c
  projects/sendfile/lib/libpmc/libpmc.c
  projects/sendfile/lib/libstand/printf.c
  projects/sendfile/lib/libstand/stand.h
  projects/sendfile/lib/libtelnet/Makefile
  projects/sendfile/lib/libusb/libusb-1.0.pc
  projects/sendfile/lib/libvmmapi/vmmapi.c
  projects/sendfile/lib/libvmmapi/vmmapi.h
  projects/sendfile/libexec/atf/Makefile
  projects/sendfile/libexec/atf/Makefile.inc
  projects/sendfile/libexec/atf/atf-check/Makefile
  projects/sendfile/libexec/mail.local/Makefile
  projects/sendfile/libexec/rtld-elf/Makefile
  projects/sendfile/libexec/smrsh/Makefile
  projects/sendfile/libexec/telnetd/Makefile
  projects/sendfile/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/sendfile/release/picobsd/bridge/crunch.conf
  projects/sendfile/release/picobsd/qemu/crunch.conf
  projects/sendfile/sbin/fsck/Makefile
  projects/sendfile/sbin/geom/class/label/glabel.8
  projects/sendfile/sbin/geom/class/stripe/geom_stripe.c
  projects/sendfile/sbin/ifconfig/ifconfig.8
  projects/sendfile/sbin/ipf/ipf/Makefile
  projects/sendfile/sbin/ipf/ipfstat/Makefile
  projects/sendfile/sbin/ipf/ipftest/Makefile
  projects/sendfile/sbin/ipf/ipmon/Makefile
  projects/sendfile/sbin/ipf/ipnat/Makefile
  projects/sendfile/sbin/ipf/ippool/Makefile
  projects/sendfile/sbin/ipf/ipresend/Makefile
  projects/sendfile/sbin/ipfw/dummynet.c
  projects/sendfile/sbin/ipfw/ipfw.8
  projects/sendfile/sbin/ipfw/ipfw2.h
  projects/sendfile/sbin/rcorder/Makefile
  projects/sendfile/sbin/reboot/boot_i386.8
  projects/sendfile/secure/lib/libcrypto/Makefile.inc
  projects/sendfile/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_length.3
  projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_new.3
  projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  projects/sendfile/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_ctrl.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_f_base64.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_f_buffer.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_f_cipher.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_f_md.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_f_null.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_f_ssl.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_find_type.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_new.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_new_CMS.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_push.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_read.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_accept.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_bio.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_connect.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_fd.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_file.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_mem.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_null.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_s_socket.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_set_callback.3
  projects/sendfile/secure/lib/libcrypto/man/BIO_should_retry.3
  projects/sendfile/secure/lib/libcrypto/man/BN_BLINDING_new.3
  projects/sendfile/secure/lib/libcrypto/man/BN_CTX_new.3
  projects/sendfile/secure/lib/libcrypto/man/BN_CTX_start.3
  projects/sendfile/secure/lib/libcrypto/man/BN_add.3
  projects/sendfile/secure/lib/libcrypto/man/BN_add_word.3
  projects/sendfile/secure/lib/libcrypto/man/BN_bn2bin.3
  projects/sendfile/secure/lib/libcrypto/man/BN_cmp.3
  projects/sendfile/secure/lib/libcrypto/man/BN_copy.3
  projects/sendfile/secure/lib/libcrypto/man/BN_generate_prime.3
  projects/sendfile/secure/lib/libcrypto/man/BN_mod_inverse.3
  projects/sendfile/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  projects/sendfile/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  projects/sendfile/secure/lib/libcrypto/man/BN_new.3
  projects/sendfile/secure/lib/libcrypto/man/BN_num_bytes.3
  projects/sendfile/secure/lib/libcrypto/man/BN_rand.3
  projects/sendfile/secure/lib/libcrypto/man/BN_set_bit.3
  projects/sendfile/secure/lib/libcrypto/man/BN_swap.3
  projects/sendfile/secure/lib/libcrypto/man/BN_zero.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_add0_cert.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_compress.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_decrypt.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_encrypt.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_final.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_get0_type.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_sign.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_sign_add1_signer.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_sign_receipt.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_uncompress.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_verify.3
  projects/sendfile/secure/lib/libcrypto/man/CMS_verify_receipt.3
  projects/sendfile/secure/lib/libcrypto/man/CONF_modules_free.3
  projects/sendfile/secure/lib/libcrypto/man/CONF_modules_load_file.3
  projects/sendfile/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  projects/sendfile/secure/lib/libcrypto/man/DH_generate_key.3
  projects/sendfile/secure/lib/libcrypto/man/DH_generate_parameters.3
  projects/sendfile/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  projects/sendfile/secure/lib/libcrypto/man/DH_new.3
  projects/sendfile/secure/lib/libcrypto/man/DH_set_method.3
  projects/sendfile/secure/lib/libcrypto/man/DH_size.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_SIG_new.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_do_sign.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_dup_DH.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_generate_key.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_generate_parameters.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_new.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_set_method.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_sign.3
  projects/sendfile/secure/lib/libcrypto/man/DSA_size.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_GET_LIB.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_clear_error.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_error_string.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_get_error.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_load_strings.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_print_errors.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_put_error.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_remove_state.3
  projects/sendfile/secure/lib/libcrypto/man/ERR_set_mark.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_BytesToKey.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_DigestInit.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_DigestSignInit.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_EncryptInit.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_OpenInit.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_derive.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_new.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_sign.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_verify.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_SealInit.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_SignInit.3
  projects/sendfile/secure/lib/libcrypto/man/EVP_VerifyInit.3
  projects/sendfile/secure/lib/libcrypto/man/OBJ_nid2obj.3
  projects/sendfile/secure/lib/libcrypto/man/OPENSSL_Applink.3
  projects/sendfile/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  projects/sendfile/secure/lib/libcrypto/man/OPENSSL_config.3
  projects/sendfile/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  projects/sendfile/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  projects/sendfile/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  projects/sendfile/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
  projects/sendfile/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
  projects/sendfile/secure/lib/libcrypto/man/PKCS12_create.3
  projects/sendfile/secure/lib/libcrypto/man/PKCS12_parse.3
  projects/sendfile/secure/lib/libcrypto/man/PKCS7_decrypt.3
  projects/sendfile/secure/lib/libcrypto/man/PKCS7_encrypt.3
  projects/sendfile/secure/lib/libcrypto/man/PKCS7_sign.3
  projects/sendfile/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
  projects/sendfile/secure/lib/libcrypto/man/PKCS7_verify.3
  projects/sendfile/secure/lib/libcrypto/man/RAND_add.3
  projects/sendfile/secure/lib/libcrypto/man/RAND_bytes.3
  projects/sendfile/secure/lib/libcrypto/man/RAND_cleanup.3
  projects/sendfile/secure/lib/libcrypto/man/RAND_egd.3
  projects/sendfile/secure/lib/libcrypto/man/RAND_load_file.3
  projects/sendfile/secure/lib/libcrypto/man/RAND_set_rand_method.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_blinding_on.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_check_key.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_generate_key.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_new.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_print.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_private_encrypt.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_public_encrypt.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_set_method.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_sign.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  projects/sendfile/secure/lib/libcrypto/man/RSA_size.3
  projects/sendfile/secure/lib/libcrypto/man/SMIME_read_CMS.3
  projects/sendfile/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  projects/sendfile/secure/lib/libcrypto/man/SMIME_write_CMS.3
  projects/sendfile/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  projects/sendfile/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  projects/sendfile/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  projects/sendfile/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  projects/sendfile/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
  projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
  projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
  projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
  projects/sendfile/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
  projects/sendfile/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
  projects/sendfile/secure/lib/libcrypto/man/X509_new.3
  projects/sendfile/secure/lib/libcrypto/man/X509_verify_cert.3
  projects/sendfile/secure/lib/libcrypto/man/bio.3
  projects/sendfile/secure/lib/libcrypto/man/blowfish.3
  projects/sendfile/secure/lib/libcrypto/man/bn.3
  projects/sendfile/secure/lib/libcrypto/man/bn_internal.3
  projects/sendfile/secure/lib/libcrypto/man/buffer.3
  projects/sendfile/secure/lib/libcrypto/man/crypto.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_DHparams.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_X509.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_X509_CRL.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_X509_NAME.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_X509_REQ.3
  projects/sendfile/secure/lib/libcrypto/man/d2i_X509_SIG.3
  projects/sendfile/secure/lib/libcrypto/man/des.3
  projects/sendfile/secure/lib/libcrypto/man/dh.3
  projects/sendfile/secure/lib/libcrypto/man/dsa.3
  projects/sendfile/secure/lib/libcrypto/man/ecdsa.3
  projects/sendfile/secure/lib/libcrypto/man/engine.3
  projects/sendfile/secure/lib/libcrypto/man/err.3
  projects/sendfile/secure/lib/libcrypto/man/evp.3
  projects/sendfile/secure/lib/libcrypto/man/hmac.3
  projects/sendfile/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
  projects/sendfile/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
  projects/sendfile/secure/lib/libcrypto/man/lh_stats.3
  projects/sendfile/secure/lib/libcrypto/man/lhash.3
  projects/sendfile/secure/lib/libcrypto/man/md5.3
  projects/sendfile/secure/lib/libcrypto/man/mdc2.3
  projects/sendfile/secure/lib/libcrypto/man/pem.3
  projects/sendfile/secure/lib/libcrypto/man/rand.3
  projects/sendfile/secure/lib/libcrypto/man/rc4.3
  projects/sendfile/secure/lib/libcrypto/man/ripemd.3
  projects/sendfile/secure/lib/libcrypto/man/rsa.3
  projects/sendfile/secure/lib/libcrypto/man/sha.3
  projects/sendfile/secure/lib/libcrypto/man/threads.3
  projects/sendfile/secure/lib/libcrypto/man/ui.3
  projects/sendfile/secure/lib/libcrypto/man/ui_compat.3
  projects/sendfile/secure/lib/libcrypto/man/x509.3
  projects/sendfile/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  projects/sendfile/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_add_session.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_ctrl.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_free.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_new.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_number.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_sessions.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_mode.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_options.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_verify.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  projects/sendfile/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
  projects/sendfile/secure/lib/libssl/man/SSL_SESSION_free.3
  projects/sendfile/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  projects/sendfile/secure/lib/libssl/man/SSL_SESSION_get_time.3
  projects/sendfile/secure/lib/libssl/man/SSL_accept.3
  projects/sendfile/secure/lib/libssl/man/SSL_alert_type_string.3
  projects/sendfile/secure/lib/libssl/man/SSL_clear.3
  projects/sendfile/secure/lib/libssl/man/SSL_connect.3
  projects/sendfile/secure/lib/libssl/man/SSL_do_handshake.3
  projects/sendfile/secure/lib/libssl/man/SSL_free.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_ciphers.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_client_CA_list.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_current_cipher.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_default_timeout.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_error.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_ex_new_index.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_fd.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_peer_certificate.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_psk_identity.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_rbio.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_session.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_verify_result.3
  projects/sendfile/secure/lib/libssl/man/SSL_get_version.3
  projects/sendfile/secure/lib/libssl/man/SSL_library_init.3
  projects/sendfile/secure/lib/libssl/man/SSL_load_client_CA_file.3
  projects/sendfile/secure/lib/libssl/man/SSL_new.3
  projects/sendfile/secure/lib/libssl/man/SSL_pending.3
  projects/sendfile/secure/lib/libssl/man/SSL_read.3
  projects/sendfile/secure/lib/libssl/man/SSL_rstate_string.3
  projects/sendfile/secure/lib/libssl/man/SSL_session_reused.3
  projects/sendfile/secure/lib/libssl/man/SSL_set_bio.3
  projects/sendfile/secure/lib/libssl/man/SSL_set_connect_state.3
  projects/sendfile/secure/lib/libssl/man/SSL_set_fd.3
  projects/sendfile/secure/lib/libssl/man/SSL_set_session.3
  projects/sendfile/secure/lib/libssl/man/SSL_set_shutdown.3
  projects/sendfile/secure/lib/libssl/man/SSL_set_verify_result.3
  projects/sendfile/secure/lib/libssl/man/SSL_shutdown.3
  projects/sendfile/secure/lib/libssl/man/SSL_state_string.3
  projects/sendfile/secure/lib/libssl/man/SSL_want.3
  projects/sendfile/secure/lib/libssl/man/SSL_write.3
  projects/sendfile/secure/lib/libssl/man/d2i_SSL_SESSION.3
  projects/sendfile/secure/lib/libssl/man/ssl.3
  projects/sendfile/secure/usr.bin/openssl/man/CA.pl.1
  projects/sendfile/secure/usr.bin/openssl/man/asn1parse.1
  projects/sendfile/secure/usr.bin/openssl/man/ca.1
  projects/sendfile/secure/usr.bin/openssl/man/ciphers.1
  projects/sendfile/secure/usr.bin/openssl/man/cms.1
  projects/sendfile/secure/usr.bin/openssl/man/crl.1
  projects/sendfile/secure/usr.bin/openssl/man/crl2pkcs7.1
  projects/sendfile/secure/usr.bin/openssl/man/dgst.1
  projects/sendfile/secure/usr.bin/openssl/man/dhparam.1
  projects/sendfile/secure/usr.bin/openssl/man/dsa.1
  projects/sendfile/secure/usr.bin/openssl/man/dsaparam.1
  projects/sendfile/secure/usr.bin/openssl/man/ec.1
  projects/sendfile/secure/usr.bin/openssl/man/ecparam.1
  projects/sendfile/secure/usr.bin/openssl/man/enc.1
  projects/sendfile/secure/usr.bin/openssl/man/errstr.1
  projects/sendfile/secure/usr.bin/openssl/man/gendsa.1
  projects/sendfile/secure/usr.bin/openssl/man/genpkey.1
  projects/sendfile/secure/usr.bin/openssl/man/genrsa.1
  projects/sendfile/secure/usr.bin/openssl/man/nseq.1
  projects/sendfile/secure/usr.bin/openssl/man/ocsp.1
  projects/sendfile/secure/usr.bin/openssl/man/openssl.1
  projects/sendfile/secure/usr.bin/openssl/man/passwd.1
  projects/sendfile/secure/usr.bin/openssl/man/pkcs12.1
  projects/sendfile/secure/usr.bin/openssl/man/pkcs7.1
  projects/sendfile/secure/usr.bin/openssl/man/pkcs8.1
  projects/sendfile/secure/usr.bin/openssl/man/pkey.1
  projects/sendfile/secure/usr.bin/openssl/man/pkeyparam.1
  projects/sendfile/secure/usr.bin/openssl/man/pkeyutl.1
  projects/sendfile/secure/usr.bin/openssl/man/rand.1
  projects/sendfile/secure/usr.bin/openssl/man/req.1
  projects/sendfile/secure/usr.bin/openssl/man/rsa.1
  projects/sendfile/secure/usr.bin/openssl/man/rsautl.1
  projects/sendfile/secure/usr.bin/openssl/man/s_client.1
  projects/sendfile/secure/usr.bin/openssl/man/s_server.1
  projects/sendfile/secure/usr.bin/openssl/man/s_time.1
  projects/sendfile/secure/usr.bin/openssl/man/sess_id.1
  projects/sendfile/secure/usr.bin/openssl/man/smime.1
  projects/sendfile/secure/usr.bin/openssl/man/speed.1
  projects/sendfile/secure/usr.bin/openssl/man/spkac.1
  projects/sendfile/secure/usr.bin/openssl/man/ts.1
  projects/sendfile/secure/usr.bin/openssl/man/tsget.1
  projects/sendfile/secure/usr.bin/openssl/man/verify.1
  projects/sendfile/secure/usr.bin/openssl/man/version.1
  projects/sendfile/secure/usr.bin/openssl/man/x509.1
  projects/sendfile/secure/usr.bin/openssl/man/x509v3_config.1
  projects/sendfile/share/Makefile
  projects/sendfile/share/man/man4/carp.4
  projects/sendfile/share/man/man4/man4.arm/ti_adc.4
  projects/sendfile/share/man/man4/mrsas.4
  projects/sendfile/share/man/man4/netmap.4
  projects/sendfile/share/man/man4/ng_bridge.4
  projects/sendfile/share/man/man4/ng_ppp.4
  projects/sendfile/share/man/man4/nvme.4
  projects/sendfile/share/man/man4/snd_envy24.4
  projects/sendfile/share/man/man4/snd_envy24ht.4
  projects/sendfile/share/man/man4/xnb.4
  projects/sendfile/share/man/man5/passwd.5
  projects/sendfile/share/man/man5/src.conf.5
  projects/sendfile/share/man/man7/ports.7
  projects/sendfile/share/man/man9/Makefile
  projects/sendfile/share/man/man9/mbuf.9
  projects/sendfile/share/man/man9/socket.9
  projects/sendfile/share/misc/bsd-family-tree
  projects/sendfile/share/misc/committers-src.dot
  projects/sendfile/share/mk/atf.test.mk
  projects/sendfile/share/mk/bsd.files.mk
  projects/sendfile/share/mk/bsd.opts.mk
  projects/sendfile/share/mk/bsd.prog.mk
  projects/sendfile/share/mk/bsd.test.mk
  projects/sendfile/share/mk/src.opts.mk
  projects/sendfile/sys/Makefile
  projects/sendfile/sys/amd64/amd64/exception.S
  projects/sendfile/sys/amd64/amd64/pmap.c
  projects/sendfile/sys/amd64/amd64/sys_machdep.c
  projects/sendfile/sys/amd64/amd64/trap.c
  projects/sendfile/sys/amd64/conf/GENERIC
  projects/sendfile/sys/amd64/include/vmm.h   (contents, props changed)
  projects/sendfile/sys/amd64/include/vmm_dev.h   (contents, props changed)
  projects/sendfile/sys/amd64/linux32/linux32_sysvec.c
  projects/sendfile/sys/amd64/vmm/intel/vmx.c
  projects/sendfile/sys/amd64/vmm/io/vlapic.c
  projects/sendfile/sys/amd64/vmm/io/vlapic.h
  projects/sendfile/sys/amd64/vmm/vmm.c
  projects/sendfile/sys/amd64/vmm/vmm_dev.c
  projects/sendfile/sys/amd64/vmm/vmm_stat.c
  projects/sendfile/sys/amd64/vmm/vmm_stat.h
  projects/sendfile/sys/arm/arm/locore.S
  projects/sendfile/sys/arm/arm/pmap-v6.c
  projects/sendfile/sys/arm/at91/board_tsc4370.c
  projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  projects/sendfile/sys/arm/broadcom/bcm2835/files.bcm2835
  projects/sendfile/sys/arm/conf/ARNDALE
  projects/sendfile/sys/arm/conf/CHROMEBOOK
  projects/sendfile/sys/arm/conf/RADXA
  projects/sendfile/sys/arm/conf/ZEDBOARD
  projects/sendfile/sys/arm/freescale/imx/imx_sdhci.c
  projects/sendfile/sys/arm/mv/armadaxp/armadaxp_mp.c
  projects/sendfile/sys/arm/mv/armadaxp/mptramp.S
  projects/sendfile/sys/arm/rockchip/files.rk30xx
  projects/sendfile/sys/arm/samsung/exynos/chrome_ec.c
  projects/sendfile/sys/arm/samsung/exynos/chrome_kb.c
  projects/sendfile/sys/arm/samsung/exynos/chrome_kb.h
  projects/sendfile/sys/arm/samsung/exynos/exynos5_ehci.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_i2c.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_pad.c
  projects/sendfile/sys/arm/samsung/exynos/files.exynos5
  projects/sendfile/sys/arm/ti/am335x/am335x_lcd.c
  projects/sendfile/sys/arm/ti/am335x/am335x_pwm.c
  projects/sendfile/sys/arm/ti/ti_adc.c
  projects/sendfile/sys/arm/ti/ti_adcreg.h
  projects/sendfile/sys/arm/ti/ti_adcvar.h
  projects/sendfile/sys/arm/ti/ti_i2c.c
  projects/sendfile/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/sendfile/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/sendfile/sys/arm/xscale/i8134x/crb_machdep.c
  projects/sendfile/sys/arm/xscale/ixp425/avila_machdep.c
  projects/sendfile/sys/arm/xscale/pxa/pxa_machdep.c
  projects/sendfile/sys/boot/fdt/dts/arm/beaglebone-black.dts
  projects/sendfile/sys/boot/fdt/dts/arm/beaglebone.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250.dtsi
  projects/sendfile/sys/boot/fdt/dts/mips/beripad-de4.dts
  projects/sendfile/sys/boot/forth/brand.4th
  projects/sendfile/sys/boot/i386/boot2/Makefile
  projects/sendfile/sys/boot/i386/btx/btx/Makefile
  projects/sendfile/sys/boot/i386/btx/btxldr/Makefile
  projects/sendfile/sys/boot/i386/btx/lib/Makefile
  projects/sendfile/sys/boot/i386/loader/Makefile
  projects/sendfile/sys/boot/mips/beri/boot2/Makefile
  projects/sendfile/sys/boot/mips/beri/loader/Makefile
  projects/sendfile/sys/boot/mips/beri/loader/loader.ldscript
  projects/sendfile/sys/boot/mips/beri/loader/main.c
  projects/sendfile/sys/boot/pc98/boot2/Makefile
  projects/sendfile/sys/boot/pc98/btx/lib/Makefile
  projects/sendfile/sys/boot/pc98/loader/Makefile
  projects/sendfile/sys/boot/sparc64/boot1/Makefile
  projects/sendfile/sys/boot/sparc64/loader/Makefile
  projects/sendfile/sys/boot/usb/Makefile
  projects/sendfile/sys/boot/usb/bsd_kernel.c
  projects/sendfile/sys/boot/usb/bsd_kernel.h
  projects/sendfile/sys/boot/usb/bsd_usbloader_test.c
  projects/sendfile/sys/boot/usb/usb_busdma_loader.c
  projects/sendfile/sys/cam/ata/ata_da.c
  projects/sendfile/sys/cam/scsi/scsi_da.c
  projects/sendfile/sys/cam/scsi/scsi_sg.c
  projects/sendfile/sys/cam/scsi/scsi_sg.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/sendfile/sys/compat/freebsd32/freebsd32_ioctl.c
  projects/sendfile/sys/compat/freebsd32/freebsd32_ioctl.h
  projects/sendfile/sys/compat/linux/linux_futex.c
  projects/sendfile/sys/compat/linux/linux_ioctl.c
  projects/sendfile/sys/conf/files
  projects/sendfile/sys/ddb/db_command.c
  projects/sendfile/sys/dev/bxe/bxe.c
  projects/sendfile/sys/dev/bxe/bxe.h
  projects/sendfile/sys/dev/bxe/bxe_debug.c
  projects/sendfile/sys/dev/bxe/bxe_stats.c
  projects/sendfile/sys/dev/cfe/cfe_console.c
  projects/sendfile/sys/dev/cxgbe/t4_sge.c
  projects/sendfile/sys/dev/dc/dcphy.c
  projects/sendfile/sys/dev/dc/pnphy.c
  projects/sendfile/sys/dev/e1000/if_em.c
  projects/sendfile/sys/dev/e1000/if_em.h
  projects/sendfile/sys/dev/e1000/if_igb.c
  projects/sendfile/sys/dev/e1000/if_lem.c
  projects/sendfile/sys/dev/e1000/if_lem.h
  projects/sendfile/sys/dev/fxp/if_fxp.c
  projects/sendfile/sys/dev/fxp/if_fxpvar.h
  projects/sendfile/sys/dev/fxp/inphy.c
  projects/sendfile/sys/dev/gpio/gpioiic.c
  projects/sendfile/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/sendfile/sys/dev/hwpmc/hwpmc_core.c
  projects/sendfile/sys/dev/hwpmc/hwpmc_intel.c
  projects/sendfile/sys/dev/hwpmc/pmc_events.h
  projects/sendfile/sys/dev/i40e/i40e_txrx.c
  projects/sendfile/sys/dev/iicbus/iic.c
  projects/sendfile/sys/dev/ixgbe/ixgbe.c
  projects/sendfile/sys/dev/mfi/mfi.c
  projects/sendfile/sys/dev/mfi/mfi_cam.c
  projects/sendfile/sys/dev/mfi/mfi_disk.c
  projects/sendfile/sys/dev/mfi/mfi_syspd.c
  projects/sendfile/sys/dev/mfi/mfivar.h
  projects/sendfile/sys/dev/mii/brgphy.c
  projects/sendfile/sys/dev/mii/e1000phy.c
  projects/sendfile/sys/dev/mii/ip1000phy.c
  projects/sendfile/sys/dev/mii/jmphy.c
  projects/sendfile/sys/dev/mii/mii.c
  projects/sendfile/sys/dev/mii/miivar.h
  projects/sendfile/sys/dev/mii/nsphy.c
  projects/sendfile/sys/dev/mii/rgephy.c
  projects/sendfile/sys/dev/mii/truephy.c
  projects/sendfile/sys/dev/netmap/netmap.c
  projects/sendfile/sys/dev/netmap/netmap_freebsd.c
  projects/sendfile/sys/dev/netmap/netmap_generic.c
  projects/sendfile/sys/dev/netmap/netmap_kern.h
  projects/sendfile/sys/dev/netmap/netmap_mbq.c
  projects/sendfile/sys/dev/netmap/netmap_mbq.h
  projects/sendfile/sys/dev/netmap/netmap_mem2.c
  projects/sendfile/sys/dev/netmap/netmap_pipe.c
  projects/sendfile/sys/dev/netmap/netmap_vale.c
  projects/sendfile/sys/dev/sound/pci/emu10k1.c
  projects/sendfile/sys/dev/uart/uart_dev_ns8250.c
  projects/sendfile/sys/dev/usb/controller/dwc_otg.c
  projects/sendfile/sys/dev/usb/controller/dwc_otg.h
  projects/sendfile/sys/dev/usb/controller/musb_otg.c
  projects/sendfile/sys/dev/usb/controller/musb_otg.h
  projects/sendfile/sys/dev/usb/controller/saf1761_otg.c
  projects/sendfile/sys/dev/usb/controller/saf1761_otg.h
  projects/sendfile/sys/dev/usb/controller/saf1761_otg_fdt.c
  projects/sendfile/sys/dev/usb/controller/saf1761_otg_reg.h
  projects/sendfile/sys/dev/usb/controller/usb_controller.c
  projects/sendfile/sys/dev/usb/usb_busdma.h
  projects/sendfile/sys/dev/usb/usb_dev.c
  projects/sendfile/sys/dev/usb/usb_device.h
  projects/sendfile/sys/dev/usb/usb_freebsd.h
  projects/sendfile/sys/dev/usb/usb_freebsd_loader.h
  projects/sendfile/sys/dev/usb/usb_generic.c
  projects/sendfile/sys/dev/usb/usb_hub.c
  projects/sendfile/sys/dev/usb/usb_hub.h
  projects/sendfile/sys/dev/usb/usb_msctest.c
  projects/sendfile/sys/dev/usb/usb_msctest.h
  projects/sendfile/sys/dev/usb/usbdi.h
  projects/sendfile/sys/dev/usb/wlan/if_rsu.c
  projects/sendfile/sys/dev/usb/wlan/if_rsureg.h
  projects/sendfile/sys/dev/usb/wlan/if_run.c
  projects/sendfile/sys/dev/virtio/network/if_vtnet.c
  projects/sendfile/sys/dev/virtio/pci/virtio_pci.c
  projects/sendfile/sys/dev/virtio/virtio.c
  projects/sendfile/sys/dev/virtio/virtio.h
  projects/sendfile/sys/dev/virtio/virtqueue.c
  projects/sendfile/sys/dev/vmware/vmxnet3/if_vmx.c
  projects/sendfile/sys/dev/vt/font/vt_font_default.c
  projects/sendfile/sys/dev/vt/vt.h
  projects/sendfile/sys/dev/vt/vt_buf.c
  projects/sendfile/sys/dev/vt/vt_core.c
  projects/sendfile/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/sendfile/sys/fs/tmpfs/tmpfs_subr.c
  projects/sendfile/sys/geom/eli/g_eli.c
  projects/sendfile/sys/geom/part/g_part_apm.c
  projects/sendfile/sys/geom/part/g_part_gpt.c
  projects/sendfile/sys/geom/part/g_part_pc98.c
  projects/sendfile/sys/i386/conf/GENERIC
  projects/sendfile/sys/i386/conf/PAE
  projects/sendfile/sys/i386/conf/XEN
  projects/sendfile/sys/i386/i386/pmap.c
  projects/sendfile/sys/i386/i386/trap.c
  projects/sendfile/sys/i386/linux/linux_sysvec.c
  projects/sendfile/sys/ia64/conf/GENERIC
  projects/sendfile/sys/kern/imgact_elf.c
  projects/sendfile/sys/kern/kern_dtrace.c
  projects/sendfile/sys/kern/kern_exec.c
  projects/sendfile/sys/kern/kern_ktrace.c
  projects/sendfile/sys/kern/kern_poll.c
  projects/sendfile/sys/kern/kern_timeout.c
  projects/sendfile/sys/kern/sched_ule.c
  projects/sendfile/sys/kern/subr_rman.c
  projects/sendfile/sys/kern/subr_taskqueue.c
  projects/sendfile/sys/kern/uipc_mbuf.c
  projects/sendfile/sys/kern/vfs_bio.c
  projects/sendfile/sys/kern/vfs_subr.c
  projects/sendfile/sys/mips/conf/BERI_DE4_BASE
  projects/sendfile/sys/mips/mips/trap.c
  projects/sendfile/sys/modules/Makefile
  projects/sendfile/sys/modules/ufs/Makefile
  projects/sendfile/sys/modules/usb/Makefile
  projects/sendfile/sys/net/if.c
  projects/sendfile/sys/net/if_media.h
  projects/sendfile/sys/net/if_var.h
  projects/sendfile/sys/net/ifq.h
  projects/sendfile/sys/net/netmap.h
  projects/sendfile/sys/net/netmap_user.h
  projects/sendfile/sys/net/route.c
  projects/sendfile/sys/net/rtsock.c
  projects/sendfile/sys/netgraph/ng_pipe.c
  projects/sendfile/sys/netinet/in.h
  projects/sendfile/sys/netinet/in_pcb.c
  projects/sendfile/sys/netinet/ip_dummynet.h
  projects/sendfile/sys/netinet/ip_options.c
  projects/sendfile/sys/netinet/ip_output.c
  projects/sendfile/sys/netinet/sctp_output.c
  projects/sendfile/sys/netinet/tcp_timewait.c
  projects/sendfile/sys/netinet/udp_var.h
  projects/sendfile/sys/netinet6/ip6_forward.c
  projects/sendfile/sys/netinet6/nd6.c
  projects/sendfile/sys/netinet6/nd6_nbr.c
  projects/sendfile/sys/netipsec/ipsec_output.c
  projects/sendfile/sys/netpfil/ipfw/ip_dn_io.c
  projects/sendfile/sys/netpfil/ipfw/ip_dummynet.c
  projects/sendfile/sys/netpfil/pf/pf.c
  projects/sendfile/sys/nfs/nfs_fha.c
  projects/sendfile/sys/powerpc/aim/trap.c
  projects/sendfile/sys/rpc/svc.c
  projects/sendfile/sys/rpc/svc.h
  projects/sendfile/sys/rpc/svc_generic.c
  projects/sendfile/sys/sparc64/conf/GENERIC
  projects/sendfile/sys/sys/dtrace_bsd.h
  projects/sendfile/sys/sys/imgact_elf.h
  projects/sendfile/sys/sys/param.h
  projects/sendfile/sys/sys/pmc.h
  projects/sendfile/sys/ufs/ffs/ffs_rawread.c
  projects/sendfile/sys/ufs/ffs/ffs_vfsops.c
  projects/sendfile/sys/vm/vm_map.c
  projects/sendfile/sys/vm/vm_mmap.c
  projects/sendfile/sys/vm/vm_page.c
  projects/sendfile/sys/vm/vm_page.h
  projects/sendfile/sys/vm/vm_reserv.c
  projects/sendfile/tests/sys/netinet/fibs_test.sh
  projects/sendfile/tests/sys/netinet/udp_dontroute.c
  projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc
  projects/sendfile/tools/build/options/WITH_TESTS
  projects/sendfile/tools/regression/lib/libc/stdio/test-fmemopen.c
  projects/sendfile/tools/tools/vt/fontcvt/fontcvt.c
  projects/sendfile/tools/tools/vt/fontcvt/terminus.sh
  projects/sendfile/tools/tools/vt/mkkfont/mkkfont.c
  projects/sendfile/usr.bin/Makefile
  projects/sendfile/usr.bin/calendar/Makefile
  projects/sendfile/usr.bin/calendar/calendars/calendar.freebsd
  projects/sendfile/usr.bin/clang/clang-tblgen/Makefile
  projects/sendfile/usr.bin/clang/clang.prog.mk
  projects/sendfile/usr.bin/clang/tblgen/Makefile
  projects/sendfile/usr.bin/compile_et/Makefile
  projects/sendfile/usr.bin/mandoc/Makefile
  projects/sendfile/usr.bin/mkimg/mkimg.1
  projects/sendfile/usr.bin/netstat/main.c
  projects/sendfile/usr.bin/netstat/netstat.1
  projects/sendfile/usr.bin/printf/printf.c
  projects/sendfile/usr.bin/printf/tests/Makefile
  projects/sendfile/usr.bin/printf/tests/regress.m2.out
  projects/sendfile/usr.bin/printf/tests/regress.sh
  projects/sendfile/usr.bin/rpcgen/rpc_main.c
  projects/sendfile/usr.bin/rpcgen/rpc_sample.c
  projects/sendfile/usr.bin/svn/svn/Makefile
  projects/sendfile/usr.bin/svn/svnadmin/Makefile
  projects/sendfile/usr.bin/svn/svndumpfilter/Makefile
  projects/sendfile/usr.bin/svn/svnlook/Makefile
  projects/sendfile/usr.bin/svn/svnmucc/Makefile
  projects/sendfile/usr.bin/svn/svnrdump/Makefile
  projects/sendfile/usr.bin/svn/svnserve/Makefile
  projects/sendfile/usr.bin/svn/svnsync/Makefile
  projects/sendfile/usr.bin/svn/svnversion/Makefile
  projects/sendfile/usr.bin/telnet/Makefile
  projects/sendfile/usr.bin/top/machine.c
  projects/sendfile/usr.bin/truncate/Makefile
  projects/sendfile/usr.bin/truncate/truncate.c
  projects/sendfile/usr.bin/users/users.c
  projects/sendfile/usr.bin/vacation/Makefile
  projects/sendfile/usr.bin/yes/yes.1
  projects/sendfile/usr.sbin/acpi/acpiconf/acpiconf.8
  projects/sendfile/usr.sbin/amd/amd/Makefile
  projects/sendfile/usr.sbin/amd/amq/Makefile
  projects/sendfile/usr.sbin/amd/fixmount/Makefile
  projects/sendfile/usr.sbin/amd/fsinfo/Makefile
  projects/sendfile/usr.sbin/amd/hlfsd/Makefile
  projects/sendfile/usr.sbin/amd/mk-amd-map/Makefile
  projects/sendfile/usr.sbin/amd/pawd/Makefile
  projects/sendfile/usr.sbin/amd/wire-test/Makefile
  projects/sendfile/usr.sbin/bhyve/bhyverun.c
  projects/sendfile/usr.sbin/bhyve/inout.c
  projects/sendfile/usr.sbin/bhyve/pci_emul.c
  projects/sendfile/usr.sbin/bhyve/pci_lpc.c
  projects/sendfile/usr.sbin/bhyve/pci_virtio_block.c
  projects/sendfile/usr.sbin/bhyvectl/bhyvectl.c
  projects/sendfile/usr.sbin/bhyveload/bhyveload.c
  projects/sendfile/usr.sbin/bsnmpd/modules/Makefile
  projects/sendfile/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
  projects/sendfile/usr.sbin/btxld/Makefile
  projects/sendfile/usr.sbin/cron/cron/Makefile
  projects/sendfile/usr.sbin/cron/crontab/Makefile
  projects/sendfile/usr.sbin/crunch/crunchgen/Makefile
  projects/sendfile/usr.sbin/crunch/crunchide/Makefile
  projects/sendfile/usr.sbin/editmap/Makefile
  projects/sendfile/usr.sbin/fifolog/fifolog_create/Makefile
  projects/sendfile/usr.sbin/fifolog/fifolog_reader/Makefile
  projects/sendfile/usr.sbin/fifolog/fifolog_writer/Makefile
  projects/sendfile/usr.sbin/ftp-proxy/ftp-proxy/Makefile
  projects/sendfile/usr.sbin/kbdcontrol/kbdcontrol.c
  projects/sendfile/usr.sbin/kbdcontrol/path.h
  projects/sendfile/usr.sbin/lpr/chkprintcap/Makefile
  projects/sendfile/usr.sbin/lpr/lpc/Makefile
  projects/sendfile/usr.sbin/lpr/lpd/Makefile
  projects/sendfile/usr.sbin/lpr/lpq/Makefile
  projects/sendfile/usr.sbin/lpr/lpr/Makefile
  projects/sendfile/usr.sbin/lpr/lprm/Makefile
  projects/sendfile/usr.sbin/lpr/pac/Makefile
  projects/sendfile/usr.sbin/mailstats/Makefile
  projects/sendfile/usr.sbin/makefs/Makefile
  projects/sendfile/usr.sbin/makefs/ffs/mkfs.c
  projects/sendfile/usr.sbin/makemap/Makefile
  projects/sendfile/usr.sbin/mixer/mixer.8
  projects/sendfile/usr.sbin/nmtree/Makefile
  projects/sendfile/usr.sbin/ntp/ntp-keygen/Makefile
  projects/sendfile/usr.sbin/ntp/ntpd/Makefile
  projects/sendfile/usr.sbin/ntp/ntpdate/Makefile
  projects/sendfile/usr.sbin/ntp/ntpdc/Makefile
  projects/sendfile/usr.sbin/ntp/ntpq/Makefile
  projects/sendfile/usr.sbin/ntp/ntptime/Makefile
  projects/sendfile/usr.sbin/pmcstat/pmcstat.h
  projects/sendfile/usr.sbin/ppp/Makefile
  projects/sendfile/usr.sbin/praliases/Makefile
  projects/sendfile/usr.sbin/sendmail/Makefile
  projects/sendfile/usr.sbin/tcpdump/tcpdump/Makefile
  projects/sendfile/usr.sbin/unbound/local-setup/local-unbound-setup.sh
  projects/sendfile/usr.sbin/vidcontrol/path.h
  projects/sendfile/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/contrib/openpam/   (props changed)
  projects/sendfile/crypto/openssl/   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/gnu/usr.bin/binutils/   (props changed)
  projects/sendfile/gnu/usr.bin/gdb/   (props changed)
  projects/sendfile/include/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/lib/libvmmapi/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/sbin/ipfw/   (props changed)
  projects/sendfile/share/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/amd64/vmm/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/usr.bin/calendar/   (props changed)
  projects/sendfile/usr.bin/mkimg/   (props changed)
  projects/sendfile/usr.sbin/bhyve/   (props changed)
  projects/sendfile/usr.sbin/bhyvectl/   (props changed)
  projects/sendfile/usr.sbin/bhyveload/   (props changed)

Modified: projects/sendfile/.arcconfig
==============================================================================
--- projects/sendfile/.arcconfig	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/.arcconfig	Mon Jun  9 14:46:32 2014	(r267277)
@@ -1,4 +1,5 @@
 {
 	"project.name": "S",
-	"phabricator.uri" : "https://phabric.freebsd.org/"
+	"phabricator.uri" : "https://phabric.freebsd.org/",
+	"history.immutable" : true
 }

Copied: projects/sendfile/.arclint (from r267276, head/.arclint)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/.arclint	Mon Jun  9 14:46:32 2014	(r267277, copy of r267276, head/.arclint)
@@ -0,0 +1,9 @@
+{
+  "linters": {
+    "python": {
+      "type": "pep8",
+      "exclude": "(contrib)",
+      "include": "(\\.py$)"
+    }
+  }
+}

Modified: projects/sendfile/Makefile.inc1
==============================================================================
--- projects/sendfile/Makefile.inc1	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/Makefile.inc1	Mon Jun  9 14:46:32 2014	(r267277)
@@ -245,7 +245,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		SSP_CFLAGS= \
+		SSP_CFLAGS= MK_PIE=no \
 		MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
@@ -257,7 +257,7 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		SSP_CFLAGS= \
+		SSP_CFLAGS= MK_PIE=no \
 		-DNO_LINT \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no MK_CLANG_FULL=no MK_LLDB=no MK_TESTS=no
 
@@ -275,7 +275,7 @@ KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOB
 		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		SSP_CFLAGS= \
+		SSP_CFLAGS= MK_PIE=no \
 		MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no

Modified: projects/sendfile/UPDATING
==============================================================================
--- projects/sendfile/UPDATING	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/UPDATING	Mon Jun  9 14:46:32 2014	(r267277)
@@ -31,6 +31,27 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140606:
+	The libatf-c and libatf-c++ major versions were downgraded to 0 and
+	1 respectively to match the upstream numbers.  They were out of
+	sync because, when they were originally added to FreeBSD, the
+	upstream versions were not respected.  These libraries are private
+	and not yet built by default, so renumbering them should be a
+	non-issue.  However, unclean source trees will yield broken test
+	programs once the operator executes "make delete-old-libs" after a
+	"make installworld".
+
+	Additionally, the atf-sh binary was made private by moving it into
+	/usr/libexec/.  Already-built shell test programs will keep the
+	path to the old binary so they will break after "make delete-old"
+	is run.
+
+	If you are using WITH_TESTS=yes (not the default), wipe the object
+	tree and rebuild from scratch to prevent spurious test failures.
+	This is only needed once: the misnumbered libraries and misplaced
+	binaries have been added to OptionalObsoleteFiles.inc so they will
+	be removed during a clean upgrade.
+
 20140512:
 	Clang and llvm have been upgraded to 3.4.1 release.
 

Modified: projects/sendfile/bin/ed/Makefile
==============================================================================
--- projects/sendfile/bin/ed/Makefile	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/bin/ed/Makefile	Mon Jun  9 14:46:32 2014	(r267277)
@@ -7,9 +7,7 @@ SRCS=	buf.c cbc.c glbl.c io.c main.c re.
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if !defined(RELEASE_CRUNCH) && \
-	${MK_OPENSSL} != "no" && \
-	${MK_ED_CRYPTO} != "no"
+.if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no"
 CFLAGS+=-DDES
 DPADD=	${LIBCRYPTO}
 LDADD=	-lcrypto

Modified: projects/sendfile/bin/ps/keyword.c
==============================================================================
--- projects/sendfile/bin/ps/keyword.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/bin/ps/keyword.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -87,8 +87,10 @@ static VAR var[] = {
 	{"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0},
 	{"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0},
 	{"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0},
+	{"f2", "F2", NULL, 0, kvar, KOFF(ki_flag2), INT, "08x", 0},
 	{"fib", "FIB", NULL, 0, kvar, KOFF(ki_fibnum), INT, "d", 0},
 	{"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0},
+	{"flags2", "", "f2", 0, NULL, 0, CHAR, NULL, 0},
 	{"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0},
 	{"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0},
 	{"ignored", "", "sigignore", 0, NULL, 0, CHAR, NULL, 0},

Modified: projects/sendfile/bin/ps/ps.1
==============================================================================
--- projects/sendfile/bin/ps/ps.1	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/bin/ps/ps.1	Mon Jun  9 14:46:32 2014	(r267277)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd May 2, 2014
+.Dd June 6, 2014
 .Dt PS 1
 .Os
 .Sh NAME
@@ -340,6 +340,15 @@ the include file
 .It Dv "P_SWAPPINGIN" Ta No "0x40000000" Ta "Process is being swapped in"
 .It Dv "P_PPTRACE" Ta No "0x80000000" Ta "Vforked child issued ptrace(PT_TRACEME)"
 .El
+.It Cm flags2
+The flags kept in
+.Va p_flag2
+associated with the process as in
+the include file
+.In sys/proc.h :
+.Bl -column P2_INHERIT_PROTECTED 0x00000001
+.It Dv "P2_INHERIT_PROTECTED" Ta No "0x00000001" Ta "New children get P_PROTECTED"
+.El
 .It Cm label
 The MAC label of the process.
 .It Cm lim
@@ -534,6 +543,9 @@ default FIB number, see
 .It Cm flags
 the process flags, in hexadecimal (alias
 .Cm f )
+.It Cm flags2
+the additional set of process flags, in hexadecimal (alias
+.Cm f2 )
 .It Cm gid
 effective group ID (alias
 .Cm egid )

Modified: projects/sendfile/bin/rmail/Makefile
==============================================================================
--- projects/sendfile/bin/rmail/Makefile	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/bin/rmail/Makefile	Mon Jun  9 14:46:32 2014	(r267277)
@@ -14,6 +14,8 @@ MAN=	rmail.8
 WARNS?=	2
 CFLAGS+=-I${SENDMAIL_DIR}/include -I.
 
+NO_PIE=	yes
+
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 

Modified: projects/sendfile/bin/sh/arith_yacc.c
==============================================================================
--- projects/sendfile/bin/sh/arith_yacc.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/bin/sh/arith_yacc.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -139,7 +139,7 @@ static arith_t do_binop(int op, arith_t 
 	case ARITH_SUB:
 		return (uintmax_t)a - (uintmax_t)b;
 	case ARITH_LSHIFT:
-		return a << b;
+		return (uintmax_t)a << b;
 	case ARITH_RSHIFT:
 		return a >> b;
 	case ARITH_LT:

Modified: projects/sendfile/bin/sh/exec.c
==============================================================================
--- projects/sendfile/bin/sh/exec.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/bin/sh/exec.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -362,15 +362,13 @@ find_command(const char *name, struct cm
 
 	e = ENOENT;
 	idx = -1;
-loop:
-	while ((fullname = padvance(&path, name)) != NULL) {
-		stunalloc(fullname);
+	for (;(fullname = padvance(&path, name)) != NULL; stunalloc(fullname)) {
 		idx++;
 		if (pathopt) {
 			if (prefix("func", pathopt)) {
 				/* handled below */
 			} else {
-				goto loop;	/* ignore unimplemented options */
+				continue; /* ignore unimplemented options */
 			}
 		}
 		if (fullname[0] != '/')
@@ -378,13 +376,12 @@ loop:
 		if (stat(fullname, &statb) < 0) {
 			if (errno != ENOENT && errno != ENOTDIR)
 				e = errno;
-			goto loop;
+			continue;
 		}
 		e = EACCES;	/* if we fail, this will be the error */
 		if (!S_ISREG(statb.st_mode))
-			goto loop;
+			continue;
 		if (pathopt) {		/* this is a %func directory */
-			stalloc(strlen(fullname) + 1);
 			readcmdfile(fullname);
 			if ((cmdp = cmdlookup(name, 0)) == NULL || cmdp->cmdtype != CMDFUNCTION)
 				error("%s not defined in %s", name, fullname);
@@ -405,6 +402,7 @@ loop:
 #endif
 		TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
 		INTOFF;
+		stunalloc(fullname);
 		cmdp = cmdlookup(name, 1);
 		if (cmdp->cmdtype == CMDFUNCTION)
 			cmdp = &loc_cmd;

Modified: projects/sendfile/contrib/openpam/lib/libpam/openpam_configure.c
==============================================================================
--- projects/sendfile/contrib/openpam/lib/libpam/openpam_configure.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/contrib/openpam/lib/libpam/openpam_configure.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2012 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2014 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -193,6 +193,7 @@ openpam_parse_chain(pam_handle_t *pamh,
 			openpam_log(PAM_LOG_ERROR,
 			    "%s(%d): missing or invalid facility",
 			    filename, lineno);
+			errno = EINVAL;
 			goto fail;
 		}
 		if (facility != fclt && facility != PAM_FACILITY_ANY) {
@@ -208,18 +209,28 @@ openpam_parse_chain(pam_handle_t *pamh,
 				openpam_log(PAM_LOG_ERROR,
 				    "%s(%d): missing or invalid service name",
 				    filename, lineno);
+				errno = EINVAL;
 				goto fail;
 			}
 			if (wordv[i] != NULL) {
 				openpam_log(PAM_LOG_ERROR,
 				    "%s(%d): garbage at end of line",
 				    filename, lineno);
+				errno = EINVAL;
 				goto fail;
 			}
 			ret = openpam_load_chain(pamh, servicename, fclt);
 			FREEV(wordc, wordv);
-			if (ret < 0)
+			if (ret < 0) {
+				/*
+				 * Bogus errno, but this ensures that the
+				 * outer loop does not just ignore the
+				 * error and keep searching.
+				 */
+				if (errno == ENOENT)
+					errno = EINVAL;
 				goto fail;
+			}
 			continue;
 		}
 
@@ -229,6 +240,7 @@ openpam_parse_chain(pam_handle_t *pamh,
 			openpam_log(PAM_LOG_ERROR,
 			    "%s(%d): missing or invalid control flag",
 			    filename, lineno);
+			errno = EINVAL;
 			goto fail;
 		}
 
@@ -238,6 +250,7 @@ openpam_parse_chain(pam_handle_t *pamh,
 			openpam_log(PAM_LOG_ERROR,
 			    "%s(%d): missing or invalid module name",
 			    filename, lineno);
+			errno = EINVAL;
 			goto fail;
 		}
 
@@ -247,8 +260,11 @@ openpam_parse_chain(pam_handle_t *pamh,
 		this->flag = ctlf;
 
 		/* load module */
-		if ((this->module = openpam_load_module(modulename)) == NULL)
+		if ((this->module = openpam_load_module(modulename)) == NULL) {
+			if (errno == ENOENT)
+				errno = ENOEXEC;
 			goto fail;
+		}
 
 		/*
 		 * The remaining items in wordv are the module's
@@ -281,7 +297,11 @@ openpam_parse_chain(pam_handle_t *pamh,
 	 * The loop ended because openpam_readword() returned NULL, which
 	 * can happen for four different reasons: an I/O error (ferror(f)
 	 * is true), a memory allocation failure (ferror(f) is false,
-	 * errno is non-zero)
+	 * feof(f) is false, errno is non-zero), the file ended with an
+	 * unterminated quote or backslash escape (ferror(f) is false,
+	 * feof(f) is true, errno is non-zero), or the end of the file was
+	 * reached without error (ferror(f) is false, feof(f) is true,
+	 * errno is zero).
 	 */
 	if (ferror(f) || errno != 0)
 		goto syserr;
@@ -402,6 +422,9 @@ openpam_load_chain(pam_handle_t *pamh,
 		}
 		ret = openpam_load_file(pamh, service, facility,
 		    filename, style);
+		/* success */
+		if (ret > 0)
+			RETURNN(ret);
 		/* the file exists, but an error occurred */
 		if (ret == -1 && errno != ENOENT)
 			RETURNN(ret);
@@ -411,7 +434,8 @@ openpam_load_chain(pam_handle_t *pamh,
 	}
 
 	/* no hit */
-	RETURNN(0);
+	errno = ENOENT;
+	RETURNN(-1);
 }
 
 /*
@@ -432,8 +456,10 @@ openpam_configure(pam_handle_t *pamh,
 		openpam_log(PAM_LOG_ERROR, "invalid service name");
 		RETURNC(PAM_SYSTEM_ERR);
 	}
-	if (openpam_load_chain(pamh, service, PAM_FACILITY_ANY) < 0)
-		goto load_err;
+	if (openpam_load_chain(pamh, service, PAM_FACILITY_ANY) < 0) {
+		if (errno != ENOENT)
+			goto load_err;
+	}
 	for (fclt = 0; fclt < PAM_NUM_FACILITIES; ++fclt) {
 		if (pamh->chains[fclt] != NULL)
 			continue;

Modified: projects/sendfile/crypto/openssl/ACKNOWLEDGMENTS
==============================================================================
--- projects/sendfile/crypto/openssl/ACKNOWLEDGMENTS	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/ACKNOWLEDGMENTS	Mon Jun  9 14:46:32 2014	(r267277)
@@ -10,13 +10,18 @@ OpenSSL project.
 We would like to identify and thank the following such sponsors for their past
 or current significant support of the OpenSSL project:
 
+Major support:
+
+	Qualys		http://www.qualys.com/
+
 Very significant support:
 
-	OpenGear: www.opengear.com
+	OpenGear:	http://www.opengear.com/
 
 Significant support:
 
-	PSW Group: www.psw.net
+	PSW Group:	http://www.psw.net/
+	Acano Ltd.	http://acano.com/
 
 Please note that we ask permission to identify sponsors and that some sponsors
 we consider eligible for inclusion here have requested to remain anonymous.

Modified: projects/sendfile/crypto/openssl/CHANGES
==============================================================================
--- projects/sendfile/crypto/openssl/CHANGES	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/CHANGES	Mon Jun  9 14:46:32 2014	(r267277)
@@ -2,6 +2,50 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.1g and 1.0.1h [5 Jun 2014]
+
+  *) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted
+     handshake can force the use of weak keying material in OpenSSL
+     SSL/TLS clients and servers.
+
+     Thanks to KIKUCHI Masashi (Lepidum Co. Ltd.) for discovering and
+     researching this issue. (CVE-2014-0224)
+     [KIKUCHI Masashi, Steve Henson]
+
+  *) Fix DTLS recursion flaw. By sending an invalid DTLS handshake to an
+     OpenSSL DTLS client the code can be made to recurse eventually crashing
+     in a DoS attack.
+
+     Thanks to Imre Rad (Search-Lab Ltd.) for discovering this issue.
+     (CVE-2014-0221)
+     [Imre Rad, Steve Henson]
+
+  *) Fix DTLS invalid fragment vulnerability. A buffer overrun attack can
+     be triggered by sending invalid DTLS fragments to an OpenSSL DTLS
+     client or server. This is potentially exploitable to run arbitrary
+     code on a vulnerable client or server.
+
+     Thanks to Jüri Aedla for reporting this issue. (CVE-2014-0195)
+     [Jüri Aedla, Steve Henson]
+
+  *) Fix bug in TLS code where clients enable anonymous ECDH ciphersuites
+     are subject to a denial of service attack.
+
+     Thanks to Felix Gröbert and Ivan Fratric at Google for discovering
+     this issue. (CVE-2014-3470)
+     [Felix Gröbert, Ivan Fratric, Steve Henson]
+
+  *) Harmonize version and its documentation. -f flag is used to display
+     compilation flags.
+     [mancha <mancha1 at zoho.com>]
+
+  *) Fix eckey_priv_encode so it immediately returns an error upon a failure
+     in i2d_ECPrivateKey.
+     [mancha <mancha1 at zoho.com>]
+
+  *) Fix some double frees. These are not thought to be exploitable.
+     [mancha <mancha1 at zoho.com>]
+
  Changes between 1.0.1f and 1.0.1g [7 Apr 2014]
 
   *) A missing bounds check in the handling of the TLS heartbeat extension

Modified: projects/sendfile/crypto/openssl/Makefile
==============================================================================
--- projects/sendfile/crypto/openssl/Makefile	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/Makefile	Mon Jun  9 14:46:32 2014	(r267277)
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.1g
+VERSION=1.0.1h
 MAJOR=1
 MINOR=0.1
 SHLIB_VERSION_NUMBER=1.0.0

Modified: projects/sendfile/crypto/openssl/NEWS
==============================================================================
--- projects/sendfile/crypto/openssl/NEWS	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/NEWS	Mon Jun  9 14:46:32 2014	(r267277)
@@ -5,6 +5,14 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014]
+
+      o Fix for CVE-2014-0224
+      o Fix for CVE-2014-0221
+      o Fix for CVE-2014-0195
+      o Fix for CVE-2014-3470
+      o Fix for CVE-2010-5298
+
   Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014]
 
       o Fix for CVE-2014-0160

Modified: projects/sendfile/crypto/openssl/README
==============================================================================
--- projects/sendfile/crypto/openssl/README	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/README	Mon Jun  9 14:46:32 2014	(r267277)
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1g 7 Apr 2014
+ OpenSSL 1.0.1h 5 Jun 2014
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

Modified: projects/sendfile/crypto/openssl/apps/enc.c
==============================================================================
--- projects/sendfile/crypto/openssl/apps/enc.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/apps/enc.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -331,6 +331,12 @@ bad:
         setup_engine(bio_err, engine, 0);
 #endif
 
+	if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
+		{
+		BIO_printf(bio_err, "AEAD ciphers not supported by the enc utility\n");
+		goto end;
+		}
+
 	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
 		{
 		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);

Modified: projects/sendfile/crypto/openssl/apps/ocsp.c
==============================================================================
--- projects/sendfile/crypto/openssl/apps/ocsp.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/apps/ocsp.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -127,6 +127,7 @@ int MAIN(int argc, char **argv)
 	ENGINE *e = NULL;
 	char **args;
 	char *host = NULL, *port = NULL, *path = "/";
+	char *thost = NULL, *tport = NULL, *tpath = NULL;
 	char *reqin = NULL, *respin = NULL;
 	char *reqout = NULL, *respout = NULL;
 	char *signfile = NULL, *keyfile = NULL;
@@ -204,6 +205,12 @@ int MAIN(int argc, char **argv)
 			}
 		else if (!strcmp(*args, "-url"))
 			{
+			if (thost)
+				OPENSSL_free(thost);
+			if (tport)
+				OPENSSL_free(tport);
+			if (tpath)
+				OPENSSL_free(tpath);
 			if (args[1])
 				{
 				args++;
@@ -212,6 +219,9 @@ int MAIN(int argc, char **argv)
 					BIO_printf(bio_err, "Error parsing URL\n");
 					badarg = 1;
 					}
+				thost = host;
+				tport = port;
+				tpath = path;
 				}
 			else badarg = 1;
 			}
@@ -920,12 +930,12 @@ end:
 	sk_X509_pop_free(verify_other, X509_free);
 	sk_CONF_VALUE_pop_free(headers, X509V3_conf_free);
 
-	if (use_ssl != -1)
-		{
-		OPENSSL_free(host);
-		OPENSSL_free(port);
-		OPENSSL_free(path);
-		}
+	if (thost)
+		OPENSSL_free(thost);
+	if (tport)
+		OPENSSL_free(tport);
+	if (tpath)
+		OPENSSL_free(tpath);
 
 	OPENSSL_EXIT(ret);
 }

Modified: projects/sendfile/crypto/openssl/apps/req.c
==============================================================================
--- projects/sendfile/crypto/openssl/apps/req.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/apps/req.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -1489,7 +1489,13 @@ start:
 #ifdef CHARSET_EBCDIC
 	ebcdic2ascii(buf, buf, i);
 #endif
-	if(!req_check_len(i, n_min, n_max)) goto start;
+	if(!req_check_len(i, n_min, n_max))
+		{
+		if (batch || value)
+			return 0;
+		goto start;
+		}
+
 	if (!X509_NAME_add_entry_by_NID(n,nid, chtype,
 				(unsigned char *) buf, -1,-1,mval)) goto err;
 	ret=1;
@@ -1548,7 +1554,12 @@ start:
 #ifdef CHARSET_EBCDIC
 	ebcdic2ascii(buf, buf, i);
 #endif
-	if(!req_check_len(i, n_min, n_max)) goto start;
+	if(!req_check_len(i, n_min, n_max))
+		{
+		if (batch || value)
+			return 0;
+		goto start;
+		}
 
 	if(!X509_REQ_add1_attr_by_NID(req, nid, chtype,
 					(unsigned char *)buf, -1)) {

Modified: projects/sendfile/crypto/openssl/apps/s_cb.c
==============================================================================
--- projects/sendfile/crypto/openssl/apps/s_cb.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/apps/s_cb.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -747,6 +747,10 @@ void MS_CALLBACK tlsext_cb(SSL *s, int c
 		break;
 #endif
 
+		case TLSEXT_TYPE_padding:
+		extname = "TLS padding";
+		break;
+
 		default:
 		extname = "unknown";
 		break;

Modified: projects/sendfile/crypto/openssl/apps/s_socket.c
==============================================================================
--- projects/sendfile/crypto/openssl/apps/s_socket.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/apps/s_socket.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -274,7 +274,7 @@ static int init_client_ip(int *sock, uns
 		{
 		i=0;
 		i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
-		if (i < 0) { perror("keepalive"); return(0); }
+		if (i < 0) { closesocket(s); perror("keepalive"); return(0); }
 		}
 #endif
 
@@ -450,6 +450,7 @@ redoit:
 		if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL)
 			{
 			perror("OPENSSL_malloc");
+			closesocket(ret);
 			return(0);
 			}
 		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
@@ -458,11 +459,13 @@ redoit:
 		if (h2 == NULL)
 			{
 			BIO_printf(bio_err,"gethostbyname failure\n");
+			closesocket(ret);
 			return(0);
 			}
 		if (h2->h_addrtype != AF_INET)
 			{
 			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
+			closesocket(ret);
 			return(0);
 			}
 		}

Modified: projects/sendfile/crypto/openssl/apps/smime.c
==============================================================================
--- projects/sendfile/crypto/openssl/apps/smime.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/apps/smime.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -541,8 +541,8 @@ int MAIN(int argc, char **argv)
 		{
 		if (!cipher)
 			{
-#ifndef OPENSSL_NO_RC2			
-			cipher = EVP_rc2_40_cbc();
+#ifndef OPENSSL_NO_DES			
+			cipher = EVP_des_ede3_cbc();
 #else
 			BIO_printf(bio_err, "No cipher selected\n");
 			goto end;

Modified: projects/sendfile/crypto/openssl/crypto/asn1/a_strnid.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/asn1/a_strnid.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/asn1/a_strnid.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -74,7 +74,7 @@ static int sk_table_cmp(const ASN1_STRIN
  * certain software (e.g. Netscape) has problems with them.
  */
 
-static unsigned long global_mask = 0xFFFFFFFFL;
+static unsigned long global_mask = B_ASN1_UTF8STRING;
 
 void ASN1_STRING_set_default_mask(unsigned long mask)
 {

Modified: projects/sendfile/crypto/openssl/crypto/bio/bss_dgram.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/bio/bss_dgram.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/bio/bss_dgram.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -1333,7 +1333,7 @@ static long dgram_sctp_ctrl(BIO *b, int 
 	bio_dgram_sctp_data *data = NULL;
 	socklen_t sockopt_len = 0;
 	struct sctp_authkeyid authkeyid;
-	struct sctp_authkey *authkey;
+	struct sctp_authkey *authkey = NULL;
 
 	data = (bio_dgram_sctp_data *)b->ptr;
 
@@ -1388,6 +1388,11 @@ static long dgram_sctp_ctrl(BIO *b, int 
 		/* Add new key */
 		sockopt_len = sizeof(struct sctp_authkey) + 64 * sizeof(uint8_t);
 		authkey = OPENSSL_malloc(sockopt_len);
+		if (authkey == NULL)
+			{
+			ret = -1;
+			break;
+			}
 		memset(authkey, 0x00, sockopt_len);
 		authkey->sca_keynumber = authkeyid.scact_keynumber + 1;
 #ifndef __FreeBSD__
@@ -1399,6 +1404,8 @@ static long dgram_sctp_ctrl(BIO *b, int 
 		memcpy(&authkey->sca_key[0], ptr, 64 * sizeof(uint8_t));
 
 		ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_KEY, authkey, sockopt_len);
+		OPENSSL_free(authkey);
+		authkey = NULL;
 		if (ret < 0) break;
 
 		/* Reset active key */

Modified: projects/sendfile/crypto/openssl/crypto/bn/bn_mont.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/bn/bn_mont.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/bn/bn_mont.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -478,32 +478,38 @@ BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CT
 BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
 					const BIGNUM *mod, BN_CTX *ctx)
 	{
-	int got_write_lock = 0;
 	BN_MONT_CTX *ret;
 
 	CRYPTO_r_lock(lock);
-	if (!*pmont)
+	ret = *pmont;
+	CRYPTO_r_unlock(lock);
+	if (ret)
+		return ret;
+
+	/* We don't want to serialise globally while doing our lazy-init math in
+	 * BN_MONT_CTX_set. That punishes threads that are doing independent
+	 * things. Instead, punish the case where more than one thread tries to
+	 * lazy-init the same 'pmont', by having each do the lazy-init math work
+	 * independently and only use the one from the thread that wins the race
+	 * (the losers throw away the work they've done). */
+	ret = BN_MONT_CTX_new();
+	if (!ret)
+		return NULL;
+	if (!BN_MONT_CTX_set(ret, mod, ctx))
 		{
-		CRYPTO_r_unlock(lock);
-		CRYPTO_w_lock(lock);
-		got_write_lock = 1;
+		BN_MONT_CTX_free(ret);
+		return NULL;
+		}
 
-		if (!*pmont)
-			{
-			ret = BN_MONT_CTX_new();
-			if (ret && !BN_MONT_CTX_set(ret, mod, ctx))
-				BN_MONT_CTX_free(ret);
-			else
-				*pmont = ret;
-			}
+	/* The locked compare-and-set, after the local work is done. */
+	CRYPTO_w_lock(lock);
+	if (*pmont)
+		{
+		BN_MONT_CTX_free(ret);
+		ret = *pmont;
 		}
-	
-	ret = *pmont;
-	
-	if (got_write_lock)
-		CRYPTO_w_unlock(lock);
 	else
-		CRYPTO_r_unlock(lock);
-		
+		*pmont = ret;
+	CRYPTO_w_unlock(lock);
 	return ret;
 	}

Modified: projects/sendfile/crypto/openssl/crypto/cms/cms_env.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/cms/cms_env.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/cms/cms_env.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -185,6 +185,8 @@ CMS_RecipientInfo *CMS_add1_recipient_ce
 	if (flags & CMS_USE_KEYID)
 		{
 		ktri->version = 2;
+		if (env->version < 2)
+			env->version = 2;
 		type = CMS_RECIPINFO_KEYIDENTIFIER;
 		}
 	else

Modified: projects/sendfile/crypto/openssl/crypto/cms/cms_sd.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/cms/cms_sd.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/cms/cms_sd.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -158,8 +158,8 @@ static void cms_sd_set_version(CMS_Signe
 			if (sd->version < 3)
 				sd->version = 3;
 			}
-		else
-			sd->version = 1;
+		else if (si->version < 1)
+			si->version = 1;
 		}
 
 	if (sd->version < 1)

Modified: projects/sendfile/crypto/openssl/crypto/cms/cms_smime.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/cms/cms_smime.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/cms/cms_smime.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -611,7 +611,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInf
 	STACK_OF(CMS_RecipientInfo) *ris;
 	CMS_RecipientInfo *ri;
 	int i, r;
-	int debug = 0;
+	int debug = 0, ri_match = 0;
 	ris = CMS_get0_RecipientInfos(cms);
 	if (ris)
 		debug = cms->d.envelopedData->encryptedContentInfo->debug;
@@ -620,6 +620,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInf
 		ri = sk_CMS_RecipientInfo_value(ris, i);
 		if (CMS_RecipientInfo_type(ri) != CMS_RECIPINFO_TRANS)
 				continue;
+		ri_match = 1;
 		/* If we have a cert try matching RecipientInfo
 		 * otherwise try them all.
 		 */
@@ -655,7 +656,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInf
 			}
 		}
 	/* If no cert and not debugging always return success */
-	if (!cert && !debug)
+	if (ri_match && !cert && !debug)
 		{
 		ERR_clear_error();
 		return 1;

Modified: projects/sendfile/crypto/openssl/crypto/dso/dso_dlfcn.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/dso/dso_dlfcn.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/dso/dso_dlfcn.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -464,7 +464,7 @@ static int dlfcn_pathbyaddr(void *addr,c
 		return len;
 		}
 
-	ERR_add_error_data(4, "dlfcn_pathbyaddr(): ", dlerror());
+	ERR_add_error_data(2, "dlfcn_pathbyaddr(): ", dlerror());
 #endif
 	return -1;
 	}

Modified: projects/sendfile/crypto/openssl/crypto/ec/ec_ameth.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/ec/ec_ameth.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/ec/ec_ameth.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -352,6 +352,7 @@ static int eckey_priv_encode(PKCS8_PRIV_
 		EC_KEY_set_enc_flags(ec_key, old_flags);
 		OPENSSL_free(ep);
 		ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);
+		return 0;
 	}
 	/* restore old encoding flags */
 	EC_KEY_set_enc_flags(ec_key, old_flags);

Modified: projects/sendfile/crypto/openssl/crypto/ec/ec_asn1.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/ec/ec_asn1.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/ec/ec_asn1.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -1435,8 +1435,11 @@ int i2o_ECPublicKey(EC_KEY *a, unsigned 
 				*out, buf_len, NULL))
 		{
 		ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB);
-		OPENSSL_free(*out);
-		*out = NULL;
+		if (new_buffer)
+			{
+			OPENSSL_free(*out);
+			*out = NULL;
+			}
 		return 0;
 		}
 	if (!new_buffer)

Modified: projects/sendfile/crypto/openssl/crypto/ec/ec_lcl.h
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/ec/ec_lcl.h	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/ec/ec_lcl.h	Mon Jun  9 14:46:32 2014	(r267277)
@@ -404,7 +404,7 @@ int ec_GF2m_simple_mul(const EC_GROUP *g
 int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 int ec_GF2m_have_precompute_mult(const EC_GROUP *group);
 
-#ifndef OPENSSL_EC_NISTP_64_GCC_128
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 /* method functions in ecp_nistp224.c */
 int ec_GFp_nistp224_group_init(EC_GROUP *group);
 int ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *);

Modified: projects/sendfile/crypto/openssl/crypto/evp/bio_b64.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/evp/bio_b64.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/evp/bio_b64.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -226,6 +226,7 @@ static int b64_read(BIO *b, char *out, i
 		else if (ctx->start)
 			{
 			q=p=(unsigned char *)ctx->tmp;
+			num = 0;
 			for (j=0; j<i; j++)
 				{
 				if (*(q++) != '\n') continue;

Modified: projects/sendfile/crypto/openssl/crypto/evp/encode.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/evp/encode.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/evp/encode.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -324,6 +324,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx
 				v=EVP_DecodeBlock(out,d,n);
 				n=0;
 				if (v < 0) { rv=0; goto end; }
+				if (eof > v) { rv=-1; goto end; }
 				ret+=(v-eof);
 				}
 			else

Modified: projects/sendfile/crypto/openssl/crypto/opensslv.h
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/opensslv.h	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/opensslv.h	Mon Jun  9 14:46:32 2014	(r267277)
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x1000107fL
+#define OPENSSL_VERSION_NUMBER	0x1000108fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g-fips 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h-fips 5 Jun 2014"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g-freebsd 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h-freebsd 5 Jun 2014"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 

Modified: projects/sendfile/crypto/openssl/crypto/pkcs12/p12_crt.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/pkcs12/p12_crt.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/pkcs12/p12_crt.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -96,7 +96,11 @@ PKCS12 *PKCS12_create(char *pass, char *
 			nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
 		else
 #endif
+#ifdef OPENSSL_NO_RC2
+		nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
+#else
 		nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
+#endif
 		}
 	if (!nid_key)
 		nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
@@ -286,7 +290,11 @@ int PKCS12_add_safe(STACK_OF(PKCS7) **ps
 		free_safes = 0;
 
 	if (nid_safe == 0)
+#ifdef OPENSSL_NO_RC2
+		nid_safe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
+#else
 		nid_safe = NID_pbe_WithSHA1And40BitRC2_CBC;
+#endif
 
 	if (nid_safe == -1)
 		p7 = PKCS12_pack_p7data(bags);

Modified: projects/sendfile/crypto/openssl/crypto/pkcs12/p12_kiss.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/pkcs12/p12_kiss.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/pkcs12/p12_kiss.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -269,7 +269,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag
 			int len, r;
 			unsigned char *data;
 			len = ASN1_STRING_to_UTF8(&data, fname);
-			if(len > 0) {
+			if(len >= 0) {
 				r = X509_alias_set1(x509, data, len);
 				OPENSSL_free(data);
 				if (!r)

Modified: projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_doit.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_doit.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/pkcs7/pk7_doit.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -440,6 +440,11 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKE
 		{
 	case NID_pkcs7_signed:
 		data_body=PKCS7_get_octet_string(p7->d.sign->contents);
+		if (!PKCS7_is_detached(p7) && data_body == NULL)
+			{
+			PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_INVALID_SIGNED_DATA_TYPE);
+			goto err;
+			}
 		md_sk=p7->d.sign->md_algs;
 		break;
 	case NID_pkcs7_signedAndEnveloped:
@@ -928,6 +933,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_
 	if (EVP_DigestSignUpdate(&mctx,abuf,alen) <= 0)
 		goto err;
 	OPENSSL_free(abuf);
+	abuf = NULL;
 	if (EVP_DigestSignFinal(&mctx, NULL, &siglen) <= 0)
 		goto err;
 	abuf = OPENSSL_malloc(siglen);

Modified: projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7.h
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7.h	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7.h	Mon Jun  9 14:46:32 2014	(r267277)
@@ -453,6 +453,7 @@ void ERR_load_PKCS7_strings(void);
 #define PKCS7_R_ERROR_SETTING_CIPHER			 121
 #define PKCS7_R_INVALID_MIME_TYPE			 131
 #define PKCS7_R_INVALID_NULL_POINTER			 143
+#define PKCS7_R_INVALID_SIGNED_DATA_TYPE		 155
 #define PKCS7_R_MIME_NO_CONTENT_TYPE			 132
 #define PKCS7_R_MIME_PARSE_ERROR			 133
 #define PKCS7_R_MIME_SIG_PARSE_ERROR			 134

Modified: projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7err.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7err.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/pkcs7/pkcs7err.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -1,6 +1,6 @@
 /* crypto/pkcs7/pkcs7err.c */
 /* ====================================================================
- * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2014 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -130,6 +130,7 @@ static ERR_STRING_DATA PKCS7_str_reasons
 {ERR_REASON(PKCS7_R_ERROR_SETTING_CIPHER),"error setting cipher"},
 {ERR_REASON(PKCS7_R_INVALID_MIME_TYPE)   ,"invalid mime type"},
 {ERR_REASON(PKCS7_R_INVALID_NULL_POINTER),"invalid null pointer"},
+{ERR_REASON(PKCS7_R_INVALID_SIGNED_DATA_TYPE),"invalid signed data type"},
 {ERR_REASON(PKCS7_R_MIME_NO_CONTENT_TYPE),"mime no content type"},
 {ERR_REASON(PKCS7_R_MIME_PARSE_ERROR)    ,"mime parse error"},
 {ERR_REASON(PKCS7_R_MIME_SIG_PARSE_ERROR),"mime sig parse error"},

Modified: projects/sendfile/crypto/openssl/crypto/rsa/rsa_ameth.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/rsa/rsa_ameth.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/rsa/rsa_ameth.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -358,7 +358,7 @@ static int rsa_pss_param_print(BIO *bp, 
 		if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0)
 			goto err;
 		}
-	else if (BIO_puts(bp, "0x14 (default)") <= 0)
+	else if (BIO_puts(bp, "14 (default)") <= 0)
 		goto err;
 	BIO_puts(bp, "\n");
 

Modified: projects/sendfile/crypto/openssl/crypto/srp/srp_vfy.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/srp/srp_vfy.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/srp/srp_vfy.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -93,6 +93,9 @@ static int t_fromb64(unsigned char *a, c
 		else a[i] = loc - b64table;
 		++i;
 		}
+	/* if nothing valid to process we have a zero length response */
+	if (i == 0)
+		return 0;
 	size = i;
 	i = size - 1;
 	j = size;

Modified: projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_verify.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_verify.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/ts/ts_rsp_verify.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -629,6 +629,7 @@ static int TS_compute_imprint(BIO *data,
 	X509_ALGOR_free(*md_alg);
 	OPENSSL_free(*imprint);
 	*imprint_len = 0;
+	*imprint = NULL;
 	return 0;
 	}
 

Modified: projects/sendfile/crypto/openssl/crypto/x509v3/v3_purp.c
==============================================================================
--- projects/sendfile/crypto/openssl/crypto/x509v3/v3_purp.c	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/crypto/x509v3/v3_purp.c	Mon Jun  9 14:46:32 2014	(r267277)
@@ -389,8 +389,8 @@ static void x509v3_cache_extensions(X509
 	/* Handle proxy certificates */
 	if((pci=X509_get_ext_d2i(x, NID_proxyCertInfo, NULL, NULL))) {
 		if (x->ex_flags & EXFLAG_CA
-		    || X509_get_ext_by_NID(x, NID_subject_alt_name, 0) >= 0
-		    || X509_get_ext_by_NID(x, NID_issuer_alt_name, 0) >= 0) {
+		    || X509_get_ext_by_NID(x, NID_subject_alt_name, -1) >= 0
+		    || X509_get_ext_by_NID(x, NID_issuer_alt_name, -1) >= 0) {
 			x->ex_flags |= EXFLAG_INVALID;
 		}
 		if (pci->pcPathLengthConstraint) {
@@ -670,7 +670,7 @@ static int check_purpose_timestamp_sign(
 		return 0;
 
 	/* Extended Key Usage MUST be critical */
-	i_ext = X509_get_ext_by_NID((X509 *) x, NID_ext_key_usage, 0);
+	i_ext = X509_get_ext_by_NID((X509 *) x, NID_ext_key_usage, -1);
 	if (i_ext >= 0)
 		{
 		X509_EXTENSION *ext = X509_get_ext((X509 *) x, i_ext);

Modified: projects/sendfile/crypto/openssl/doc/apps/cms.pod
==============================================================================
--- projects/sendfile/crypto/openssl/doc/apps/cms.pod	Mon Jun  9 14:36:49 2014	(r267276)
+++ projects/sendfile/crypto/openssl/doc/apps/cms.pod	Mon Jun  9 14:46:32 2014	(r267277)
@@ -90,6 +90,11 @@ decrypt mail using the supplied certific
 encrypted mail message in MIME format for the input file. The decrypted mail
 is written to the output file.
 
+=item B<-debug_decrypt>
+
+this option sets the B<CMS_DEBUG_DECRYPT> flag. This option should be used
+with caution: see the notes section below.
+
 =item B<-sign>
 
 sign mail using the supplied certificate and private key. Input file is
@@ -446,6 +451,16 @@ Streaming is always used for the B<-sign

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list