Date: Thu, 4 Feb 2016 09:39:09 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r295248 - in user/ngie/stable-10-libnv: . contrib/mdocml crypto/openssh crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/aes crypto/openssl/crypto/bio cryp... Message-ID: <201602040939.u149d9ft015604@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Feb 4 09:39:08 2016 New Revision: 295248 URL: https://svnweb.freebsd.org/changeset/base/295248 Log: MFstable/10 @ r295247 Added: user/ngie/stable-10-libnv/crypto/openssh/freebsd-post-merge.sh - copied unchanged from r295247, stable/10/crypto/openssh/freebsd-post-merge.sh user/ngie/stable-10-libnv/crypto/openssh/freebsd-pre-merge.sh - copied unchanged from r295247, stable/10/crypto/openssh/freebsd-pre-merge.sh user/ngie/stable-10-libnv/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod - copied unchanged from r295247, stable/10/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod user/ngie/stable-10-libnv/crypto/openssl/util/pod2mantest - copied unchanged from r295247, stable/10/crypto/openssl/util/pod2mantest user/ngie/stable-10-libnv/lib/libdevctl/ - copied from r295247, stable/10/lib/libdevctl/ user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 - copied unchanged from r295247, stable/10/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 user/ngie/stable-10-libnv/share/dtrace/watch_execve - copied unchanged from r295247, stable/10/share/dtrace/watch_execve user/ngie/stable-10-libnv/share/dtrace/watch_kill - copied unchanged from r295247, stable/10/share/dtrace/watch_kill user/ngie/stable-10-libnv/share/dtrace/watch_vop_remove - copied unchanged from r295247, stable/10/share/dtrace/watch_vop_remove user/ngie/stable-10-libnv/share/man/man4/cfi.4 - copied unchanged from r295247, stable/10/share/man/man4/cfi.4 user/ngie/stable-10-libnv/sys/boot/efi/boot1/boot_module.h - copied unchanged from r295247, stable/10/sys/boot/efi/boot1/boot_module.h user/ngie/stable-10-libnv/sys/boot/efi/boot1/ufs_module.c - copied unchanged from r295247, stable/10/sys/boot/efi/boot1/ufs_module.c user/ngie/stable-10-libnv/sys/boot/efi/boot1/zfs_module.c - copied unchanged from r295247, stable/10/sys/boot/efi/boot1/zfs_module.c user/ngie/stable-10-libnv/sys/dev/syscons/plasma/ - copied from r295247, stable/10/sys/dev/syscons/plasma/ user/ngie/stable-10-libnv/sys/modules/syscons/plasma/ - copied from r295247, stable/10/sys/modules/syscons/plasma/ user/ngie/stable-10-libnv/tools/regression/geom_gate/conf.sh - copied, changed from r293815, head/tools/regression/geom_gate/conf.sh user/ngie/stable-10-libnv/usr.sbin/bhyve/bootrom.c - copied unchanged from r295247, stable/10/usr.sbin/bhyve/bootrom.c user/ngie/stable-10-libnv/usr.sbin/bhyve/bootrom.h - copied unchanged from r295247, stable/10/usr.sbin/bhyve/bootrom.h user/ngie/stable-10-libnv/usr.sbin/bhyve/fwctl.c - copied unchanged from r295247, stable/10/usr.sbin/bhyve/fwctl.c user/ngie/stable-10-libnv/usr.sbin/bhyve/fwctl.h - copied unchanged from r295247, stable/10/usr.sbin/bhyve/fwctl.h user/ngie/stable-10-libnv/usr.sbin/bhyvectl/bhyvectl.8 - copied unchanged from r295247, stable/10/usr.sbin/bhyvectl/bhyvectl.8 user/ngie/stable-10-libnv/usr.sbin/devctl/ - copied from r295247, stable/10/usr.sbin/devctl/ user/ngie/stable-10-libnv/usr.sbin/vigr/ - copied from r295247, stable/10/usr.sbin/vigr/ Deleted: user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-tricks user/ngie/stable-10-libnv/crypto/openssh/README.hpn user/ngie/stable-10-libnv/crypto/openssh/config.h.in user/ngie/stable-10-libnv/crypto/openssh/configure user/ngie/stable-10-libnv/crypto/openssh/schnorr.c user/ngie/stable-10-libnv/tools/build/options/WITH_OPENSSH_NONE_CIPHER user/ngie/stable-10-libnv/tools/regression/geom_gate/runtests.sh user/ngie/stable-10-libnv/tools/regression/geom_gate/test-1.sh user/ngie/stable-10-libnv/tools/regression/geom_gate/test-2.sh user/ngie/stable-10-libnv/tools/regression/geom_gate/test-3.sh Modified: user/ngie/stable-10-libnv/UPDATING user/ngie/stable-10-libnv/contrib/mdocml/lib.in user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/buffer.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/buffer.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/channels.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/channels.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/cipher.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/clientloop.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/compat.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/compat.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/config.h user/ngie/stable-10-libnv/crypto/openssh/configure.ac (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh user/ngie/stable-10-libnv/crypto/openssh/kex.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/kex.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/misc.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/misc.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/moduli.5 user/ngie/stable-10-libnv/crypto/openssh/mux.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/myproposal.h user/ngie/stable-10-libnv/crypto/openssh/packet.c user/ngie/stable-10-libnv/crypto/openssh/packet.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/pathnames.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/readconf.c user/ngie/stable-10-libnv/crypto/openssh/readconf.h user/ngie/stable-10-libnv/crypto/openssh/scp.1 user/ngie/stable-10-libnv/crypto/openssh/servconf.c user/ngie/stable-10-libnv/crypto/openssh/servconf.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/serverloop.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/session.c user/ngie/stable-10-libnv/crypto/openssh/sftp-common.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/sftp-server.8 (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/sftp.1 (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/sftp.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/ssh-add.1 user/ngie/stable-10-libnv/crypto/openssh/ssh-agent.1 user/ngie/stable-10-libnv/crypto/openssh/ssh-gss.h (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/ssh-keygen.1 (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/ssh-keyscan.1 (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/ssh-keysign.8 user/ngie/stable-10-libnv/crypto/openssh/ssh-pkcs11-helper.8 user/ngie/stable-10-libnv/crypto/openssh/ssh.1 user/ngie/stable-10-libnv/crypto/openssh/ssh.c user/ngie/stable-10-libnv/crypto/openssh/ssh_config user/ngie/stable-10-libnv/crypto/openssh/ssh_config.5 user/ngie/stable-10-libnv/crypto/openssh/ssh_namespace.h user/ngie/stable-10-libnv/crypto/openssh/sshconnect.c user/ngie/stable-10-libnv/crypto/openssh/sshconnect2.c (contents, props changed) user/ngie/stable-10-libnv/crypto/openssh/sshd.8 user/ngie/stable-10-libnv/crypto/openssh/sshd.c user/ngie/stable-10-libnv/crypto/openssh/sshd_config user/ngie/stable-10-libnv/crypto/openssh/sshd_config.5 user/ngie/stable-10-libnv/crypto/openssh/version.h user/ngie/stable-10-libnv/crypto/openssl/ACKNOWLEDGMENTS user/ngie/stable-10-libnv/crypto/openssl/CHANGES user/ngie/stable-10-libnv/crypto/openssl/Configure user/ngie/stable-10-libnv/crypto/openssl/INSTALL user/ngie/stable-10-libnv/crypto/openssl/LICENSE user/ngie/stable-10-libnv/crypto/openssl/Makefile user/ngie/stable-10-libnv/crypto/openssl/Makefile.org user/ngie/stable-10-libnv/crypto/openssl/NEWS user/ngie/stable-10-libnv/crypto/openssl/README user/ngie/stable-10-libnv/crypto/openssl/apps/engine.c user/ngie/stable-10-libnv/crypto/openssl/apps/ocsp.c user/ngie/stable-10-libnv/crypto/openssl/apps/pkcs12.c user/ngie/stable-10-libnv/crypto/openssl/apps/speed.c user/ngie/stable-10-libnv/crypto/openssl/apps/x509.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes.h user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_cbc.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_cfb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_core.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ctr.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ecb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ige.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_locl.h user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_misc.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ofb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_x86core.c user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bio.h user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bss_bio.c user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bss_conn.c user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bss_dgram.c user/ngie/stable-10-libnv/crypto/openssl/crypto/bn/bn_exp.c user/ngie/stable-10-libnv/crypto/openssl/crypto/bn/exptest.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/camellia.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/camellia.h user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_cbc.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_cfb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_ctr.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_ecb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_locl.h user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_misc.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_ofb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_utl.c user/ngie/stable-10-libnv/crypto/openssl/crypto/des/des_old.c user/ngie/stable-10-libnv/crypto/openssl/crypto/des/des_old.h user/ngie/stable-10-libnv/crypto/openssl/crypto/des/des_old2.c user/ngie/stable-10-libnv/crypto/openssl/crypto/dsa/dsa_ossl.c user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso.h user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso_dl.c user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso_dlfcn.c user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso_lib.c user/ngie/stable-10-libnv/crypto/openssl/crypto/ec/ectest.c user/ngie/stable-10-libnv/crypto/openssl/crypto/engine/eng_all.c user/ngie/stable-10-libnv/crypto/openssl/crypto/evp/e_camellia.c user/ngie/stable-10-libnv/crypto/openssl/crypto/evp/e_old.c user/ngie/stable-10-libnv/crypto/openssl/crypto/evp/e_seed.c user/ngie/stable-10-libnv/crypto/openssl/crypto/mem_clr.c user/ngie/stable-10-libnv/crypto/openssl/crypto/o_dir.c user/ngie/stable-10-libnv/crypto/openssl/crypto/o_dir.h user/ngie/stable-10-libnv/crypto/openssl/crypto/o_dir_test.c user/ngie/stable-10-libnv/crypto/openssl/crypto/o_str.c user/ngie/stable-10-libnv/crypto/openssl/crypto/o_str.h user/ngie/stable-10-libnv/crypto/openssl/crypto/o_time.c user/ngie/stable-10-libnv/crypto/openssl/crypto/o_time.h user/ngie/stable-10-libnv/crypto/openssl/crypto/opensslv.h user/ngie/stable-10-libnv/crypto/openssl/crypto/rc4/rc4_utl.c user/ngie/stable-10-libnv/crypto/openssl/crypto/rsa/rsa_chk.c user/ngie/stable-10-libnv/crypto/openssl/crypto/rsa/rsa_sign.c user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_cbc.c user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_cfb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_ecb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_ofb.c user/ngie/stable-10-libnv/crypto/openssl/crypto/sha/sha1test.c user/ngie/stable-10-libnv/crypto/openssl/crypto/store/store.h user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_lib.c user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_locl.h user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_mem.c user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_meth.c user/ngie/stable-10-libnv/crypto/openssl/crypto/ts/ts_rsp_verify.c user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui.h user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_compat.c user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_compat.h user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_lib.c user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_locl.h user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_openssl.c user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_util.c user/ngie/stable-10-libnv/crypto/openssl/crypto/x509/x509_vfy.c user/ngie/stable-10-libnv/crypto/openssl/crypto/x509/x509_vfy.h user/ngie/stable-10-libnv/crypto/openssl/crypto/x509v3/v3_pci.c user/ngie/stable-10-libnv/crypto/openssl/crypto/x509v3/v3_pcia.c user/ngie/stable-10-libnv/crypto/openssl/doc/apps/s_time.pod user/ngie/stable-10-libnv/crypto/openssl/doc/crypto/BIO_s_connect.pod user/ngie/stable-10-libnv/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod user/ngie/stable-10-libnv/crypto/openssl/engines/e_chil.c user/ngie/stable-10-libnv/crypto/openssl/ssl/d1_both.c user/ngie/stable-10-libnv/crypto/openssl/ssl/kssl.c user/ngie/stable-10-libnv/crypto/openssl/ssl/kssl.h user/ngie/stable-10-libnv/crypto/openssl/ssl/kssl_lcl.h user/ngie/stable-10-libnv/crypto/openssl/ssl/s2_srvr.c user/ngie/stable-10-libnv/crypto/openssl/ssl/s3_clnt.c user/ngie/stable-10-libnv/crypto/openssl/ssl/s3_lib.c user/ngie/stable-10-libnv/crypto/openssl/ssl/s3_srvr.c user/ngie/stable-10-libnv/crypto/openssl/ssl/ssl.h user/ngie/stable-10-libnv/crypto/openssl/ssl/ssl_sess.c user/ngie/stable-10-libnv/crypto/openssl/ssl/t1_enc.c user/ngie/stable-10-libnv/crypto/openssl/ssl/t1_lib.c user/ngie/stable-10-libnv/crypto/openssl/util/pl/VC-32.pl user/ngie/stable-10-libnv/etc/defaults/rc.conf user/ngie/stable-10-libnv/etc/netstart user/ngie/stable-10-libnv/etc/periodic/daily/400.status-disks user/ngie/stable-10-libnv/etc/periodic/security/security.functions user/ngie/stable-10-libnv/etc/rc.d/NETWORKING user/ngie/stable-10-libnv/etc/rc.d/jail user/ngie/stable-10-libnv/etc/rc.d/local_unbound user/ngie/stable-10-libnv/etc/rc.d/netwait user/ngie/stable-10-libnv/etc/rc.d/othermta user/ngie/stable-10-libnv/etc/rc.shutdown user/ngie/stable-10-libnv/lib/Makefile user/ngie/stable-10-libnv/lib/libc/gen/readpassphrase.c user/ngie/stable-10-libnv/lib/libc/gen/sem_new.c user/ngie/stable-10-libnv/lib/libc/mips/SYS.h user/ngie/stable-10-libnv/lib/libc/net/sctp_sys_calls.c user/ngie/stable-10-libnv/lib/libc/stdio/fopen.3 user/ngie/stable-10-libnv/lib/libc/stdlib/tdelete.c user/ngie/stable-10-libnv/lib/libdpv/dialog_util.c user/ngie/stable-10-libnv/lib/libdpv/dialog_util.h user/ngie/stable-10-libnv/lib/libdpv/dpv.3 user/ngie/stable-10-libnv/lib/libdpv/dpv.c user/ngie/stable-10-libnv/lib/libdpv/dpv.h user/ngie/stable-10-libnv/lib/libdpv/dpv_private.h user/ngie/stable-10-libnv/lib/libvmmapi/vmmapi.c user/ngie/stable-10-libnv/lib/libvmmapi/vmmapi.h user/ngie/stable-10-libnv/release/amd64/mkisoimages-uefi.sh user/ngie/stable-10-libnv/release/doc/share/xml/security.xml user/ngie/stable-10-libnv/secure/lib/libcrypto/Makefile.inc user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_STRING_length.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_STRING_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_generate_nconf.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_ctrl.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_base64.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_buffer.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_cipher.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_md.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_null.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_ssl.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_find_type.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_new_CMS.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_push.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_read.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_accept.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_bio.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_connect.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_fd.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_file.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_mem.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_null.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_socket.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_set_callback.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_should_retry.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_BLINDING_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_CTX_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_CTX_start.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_add.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_add_word.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_bn2bin.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_cmp.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_copy.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_generate_prime.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_mod_inverse.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_num_bytes.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_rand.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_set_bit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_swap.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_zero.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_add0_cert.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_add1_signer.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_compress.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_decrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_encrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_final.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get0_type.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_sign.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_sign_receipt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_uncompress.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_verify.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_verify_receipt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CONF_modules_free.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CONF_modules_load_file.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_generate_key.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_generate_parameters.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_get_ex_new_index.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_set_method.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_size.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_SIG_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_do_sign.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_dup_DH.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_generate_key.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_generate_parameters.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_set_method.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_sign.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_size.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_GET_LIB.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_clear_error.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_error_string.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_get_error.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_load_strings.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_print_errors.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_put_error.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_remove_state.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_set_mark.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_BytesToKey.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_DigestInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_DigestSignInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_EncryptInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_OpenInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_derive.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_sign.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_verify.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_SealInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_SignInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_VerifyInit.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OBJ_nid2obj.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_Applink.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_config.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS12_create.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS12_parse.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_decrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_encrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_sign.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_verify.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_add.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_bytes.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_cleanup.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_egd.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_load_file.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_set_rand_method.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_blinding_on.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_check_key.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_generate_key.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_print.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_private_encrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_public_encrypt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_set_method.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_sign.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_size.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_read_CMS.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_write_CMS.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_print_ex.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_new.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_verify_cert.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/bio.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/blowfish.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/bn.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/bn_internal.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/buffer.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/crypto.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_DHparams.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_CRL.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_NAME.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_REQ.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_SIG.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/des.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/dh.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/dsa.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ecdsa.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/engine.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/err.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/evp.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/hmac.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/lh_stats.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/lhash.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/md5.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/mdc2.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/pem.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/rand.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/rc4.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ripemd.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/rsa.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/sha.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/threads.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ui.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ui_compat.3 user/ngie/stable-10-libnv/secure/lib/libcrypto/man/x509.3 user/ngie/stable-10-libnv/secure/lib/libssh/Makefile user/ngie/stable-10-libnv/secure/lib/libssl/Makefile.man user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CIPHER_get_name.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_add_session.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_ctrl.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_free.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_new.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sess_number.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sessions.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_mode.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_options.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_timeout.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_verify.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_use_certificate.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_SESSION_free.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_SESSION_get_time.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_accept.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_alert_type_string.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_clear.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_connect.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_do_handshake.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_free.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_SSL_CTX.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_ciphers.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_client_CA_list.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_current_cipher.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_default_timeout.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_error.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_ex_new_index.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_fd.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_peer_certificate.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_psk_identity.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_rbio.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_session.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_verify_result.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_version.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_library_init.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_load_client_CA_file.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_new.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_pending.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_read.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_rstate_string.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_session_reused.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_bio.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_connect_state.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_fd.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_session.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_shutdown.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_verify_result.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_shutdown.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_state_string.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_want.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_write.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/d2i_SSL_SESSION.3 user/ngie/stable-10-libnv/secure/lib/libssl/man/ssl.3 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/CA.pl.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/asn1parse.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/c_rehash.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ca.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ciphers.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/cms.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/crl.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/crl2pkcs7.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dgst.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dhparam.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dsa.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dsaparam.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ec.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ecparam.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/enc.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/errstr.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/gendsa.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/genpkey.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/genrsa.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/nseq.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ocsp.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/openssl.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/passwd.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkcs12.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkcs7.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkcs8.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkey.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkeyparam.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkeyutl.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/rand.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/req.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/rsa.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/rsautl.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/s_client.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/s_server.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/s_time.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/sess_id.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/smime.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/speed.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/spkac.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ts.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/tsget.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/verify.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/version.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/x509.1 user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/x509v3_config.1 user/ngie/stable-10-libnv/secure/usr.bin/ssh/Makefile user/ngie/stable-10-libnv/secure/usr.sbin/sshd/Makefile user/ngie/stable-10-libnv/share/dtrace/Makefile user/ngie/stable-10-libnv/share/examples/bhyve/vmrun.sh user/ngie/stable-10-libnv/share/man/man4/Makefile user/ngie/stable-10-libnv/share/man/man4/em.4 user/ngie/stable-10-libnv/share/man/man4/ismt.4 user/ngie/stable-10-libnv/share/man/man4/splash.4 user/ngie/stable-10-libnv/share/man/man9/Makefile user/ngie/stable-10-libnv/share/man/man9/make_dev.9 user/ngie/stable-10-libnv/share/mk/bsd.dep.mk user/ngie/stable-10-libnv/share/mk/bsd.libnames.mk user/ngie/stable-10-libnv/share/mk/bsd.own.mk user/ngie/stable-10-libnv/share/mk/bsd.sys.mk user/ngie/stable-10-libnv/sys/amd64/amd64/fpu.c user/ngie/stable-10-libnv/sys/amd64/amd64/machdep.c user/ngie/stable-10-libnv/sys/amd64/include/vmm.h user/ngie/stable-10-libnv/sys/amd64/include/vmm_dev.h user/ngie/stable-10-libnv/sys/amd64/linux/linux.h user/ngie/stable-10-libnv/sys/amd64/linux/linux_machdep.c user/ngie/stable-10-libnv/sys/amd64/linux/linux_sysvec.c user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysvec.c user/ngie/stable-10-libnv/sys/amd64/vmm/amd/svm.c user/ngie/stable-10-libnv/sys/amd64/vmm/intel/vmx.c user/ngie/stable-10-libnv/sys/amd64/vmm/io/ppt.c user/ngie/stable-10-libnv/sys/amd64/vmm/vmm.c user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_dev.c user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_instruction_emul.c user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_mem.c user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_mem.h user/ngie/stable-10-libnv/sys/arm/arm/bcopyinout.S user/ngie/stable-10-libnv/sys/arm/arm/bcopyinout_xscale.S user/ngie/stable-10-libnv/sys/arm/arm/busdma_machdep.c user/ngie/stable-10-libnv/sys/arm/arm/copystr.S user/ngie/stable-10-libnv/sys/arm/arm/fusu.S user/ngie/stable-10-libnv/sys/arm/arm/locore-v4.S user/ngie/stable-10-libnv/sys/arm/arm/locore-v6.S user/ngie/stable-10-libnv/sys/arm/arm/machdep.c user/ngie/stable-10-libnv/sys/arm/arm/physmem.c user/ngie/stable-10-libnv/sys/arm/arm/trap.c user/ngie/stable-10-libnv/sys/arm/at91/at91_mci.c user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx6_anatop.c user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx6_machdep.c user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_machdep.c user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_machdep.h user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_sdhci.c user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_wdogreg.h user/ngie/stable-10-libnv/sys/arm/mv/std-pj4b.mv user/ngie/stable-10-libnv/sys/arm/xscale/ixp425/avila_machdep.c user/ngie/stable-10-libnv/sys/boot/common/bootstrap.h user/ngie/stable-10-libnv/sys/boot/common/console.c user/ngie/stable-10-libnv/sys/boot/common/interp_forth.c user/ngie/stable-10-libnv/sys/boot/common/load_elf.c user/ngie/stable-10-libnv/sys/boot/common/load_elf_obj.c user/ngie/stable-10-libnv/sys/boot/common/misc.c user/ngie/stable-10-libnv/sys/boot/common/module.c user/ngie/stable-10-libnv/sys/boot/common/part.c user/ngie/stable-10-libnv/sys/boot/common/self_reloc.c user/ngie/stable-10-libnv/sys/boot/common/ufsread.c user/ngie/stable-10-libnv/sys/boot/efi/Makefile user/ngie/stable-10-libnv/sys/boot/efi/boot1/Makefile user/ngie/stable-10-libnv/sys/boot/efi/boot1/boot1.c user/ngie/stable-10-libnv/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu user/ngie/stable-10-libnv/sys/boot/efi/include/amd64/efibind.h user/ngie/stable-10-libnv/sys/boot/efi/include/efi_nii.h user/ngie/stable-10-libnv/sys/boot/efi/include/efiapi.h user/ngie/stable-10-libnv/sys/boot/efi/include/eficon.h user/ngie/stable-10-libnv/sys/boot/efi/include/eficonsctl.h user/ngie/stable-10-libnv/sys/boot/efi/include/efidevp.h user/ngie/stable-10-libnv/sys/boot/efi/include/efierr.h user/ngie/stable-10-libnv/sys/boot/efi/include/efifpswa.h user/ngie/stable-10-libnv/sys/boot/efi/include/efigop.h user/ngie/stable-10-libnv/sys/boot/efi/include/efilib.h user/ngie/stable-10-libnv/sys/boot/efi/include/efinet.h user/ngie/stable-10-libnv/sys/boot/efi/include/efiprot.h user/ngie/stable-10-libnv/sys/boot/efi/include/efipxebc.h user/ngie/stable-10-libnv/sys/boot/efi/include/efiser.h user/ngie/stable-10-libnv/sys/boot/efi/include/i386/efibind.h user/ngie/stable-10-libnv/sys/boot/efi/include/ia64/efibind.h user/ngie/stable-10-libnv/sys/boot/efi/libefi/Makefile user/ngie/stable-10-libnv/sys/boot/efi/libefi/efi_console.c user/ngie/stable-10-libnv/sys/boot/efi/libefi/efipart.c user/ngie/stable-10-libnv/sys/boot/efi/libefi/handles.c user/ngie/stable-10-libnv/sys/boot/efi/libefi/libefi.c user/ngie/stable-10-libnv/sys/boot/efi/loader/Makefile user/ngie/stable-10-libnv/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c user/ngie/stable-10-libnv/sys/boot/efi/loader/arch/amd64/framebuffer.c user/ngie/stable-10-libnv/sys/boot/efi/loader/arch/amd64/reloc.c user/ngie/stable-10-libnv/sys/boot/efi/loader/autoload.c user/ngie/stable-10-libnv/sys/boot/efi/loader/bootinfo.c user/ngie/stable-10-libnv/sys/boot/efi/loader/conf.c user/ngie/stable-10-libnv/sys/boot/efi/loader/copy.c user/ngie/stable-10-libnv/sys/boot/efi/loader/devicename.c user/ngie/stable-10-libnv/sys/boot/efi/loader/loader_efi.h user/ngie/stable-10-libnv/sys/boot/efi/loader/main.c user/ngie/stable-10-libnv/sys/boot/fdt/dts/arm/beaglebone-black.dts user/ngie/stable-10-libnv/sys/boot/fdt/dts/arm/beaglebone.dts user/ngie/stable-10-libnv/sys/boot/fdt/fdt_loader_cmd.c user/ngie/stable-10-libnv/sys/boot/ficl/i386/sysdep.c user/ngie/stable-10-libnv/sys/boot/forth/support.4th user/ngie/stable-10-libnv/sys/boot/i386/libi386/Makefile user/ngie/stable-10-libnv/sys/boot/i386/libi386/smbios.c user/ngie/stable-10-libnv/sys/boot/powerpc/boot1.chrp/boot1.c user/ngie/stable-10-libnv/sys/boot/uboot/lib/copy.c user/ngie/stable-10-libnv/sys/boot/zfs/zfs.c user/ngie/stable-10-libnv/sys/boot/zfs/zfsimpl.c user/ngie/stable-10-libnv/sys/cam/ctl/ctl.c user/ngie/stable-10-libnv/sys/cam/scsi/scsi_ch.c user/ngie/stable-10-libnv/sys/cam/scsi/scsi_enc.c user/ngie/stable-10-libnv/sys/cam/scsi/scsi_pass.c user/ngie/stable-10-libnv/sys/cam/scsi/scsi_pt.c user/ngie/stable-10-libnv/sys/cam/scsi/scsi_sa.c user/ngie/stable-10-libnv/sys/cam/scsi/scsi_sg.c user/ngie/stable-10-libnv/sys/cddl/boot/zfs/lz4.c user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/ngie/stable-10-libnv/sys/conf/files user/ngie/stable-10-libnv/sys/conf/kmod.mk user/ngie/stable-10-libnv/sys/dev/acpica/acpi.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_80003es2lan.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_80003es2lan.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82540.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82541.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82541.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82542.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82543.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82543.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82571.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82571.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82575.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82575.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_api.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_api.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_defines.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_hw.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_i210.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_i210.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_ich8lan.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_ich8lan.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mac.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mac.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_manage.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_manage.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mbx.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mbx.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_nvm.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_nvm.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_osdep.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_osdep.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_phy.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_phy.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_regs.h user/ngie/stable-10-libnv/sys/dev/e1000/e1000_vf.c user/ngie/stable-10-libnv/sys/dev/e1000/e1000_vf.h user/ngie/stable-10-libnv/sys/dev/e1000/if_em.c user/ngie/stable-10-libnv/sys/dev/e1000/if_em.h user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.c user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.h user/ngie/stable-10-libnv/sys/dev/e1000/if_lem.c user/ngie/stable-10-libnv/sys/dev/e1000/if_lem.h user/ngie/stable-10-libnv/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c user/ngie/stable-10-libnv/sys/dev/iicbus/icee.c user/ngie/stable-10-libnv/sys/dev/iicbus/iiconf.c user/ngie/stable-10-libnv/sys/dev/iicbus/iiconf.h user/ngie/stable-10-libnv/sys/dev/iscsi/iscsi.c user/ngie/stable-10-libnv/sys/dev/iscsi/iscsi.h user/ngie/stable-10-libnv/sys/dev/ixgb/if_ixgb.c user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ix.c user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ixv.c user/ngie/stable-10-libnv/sys/dev/ixgbe/ix_txrx.c user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe.h user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_mbx.h user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_vf.c user/ngie/stable-10-libnv/sys/dev/ixl/if_ixl.c user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/en.h user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/stable-10-libnv/sys/dev/netmap/if_em_netmap.h user/ngie/stable-10-libnv/sys/dev/netmap/ixgbe_netmap.h user/ngie/stable-10-libnv/sys/dev/nvd/nvd.c user/ngie/stable-10-libnv/sys/dev/nvme/nvme.h user/ngie/stable-10-libnv/sys/dev/nvme/nvme_ns.c user/ngie/stable-10-libnv/sys/dev/nvme/nvme_sysctl.c user/ngie/stable-10-libnv/sys/dev/ofw/ofw_iicbus.c user/ngie/stable-10-libnv/sys/dev/pci/pci.c user/ngie/stable-10-libnv/sys/dev/pty/pty.c user/ngie/stable-10-libnv/sys/dev/puc/pucdata.c user/ngie/stable-10-libnv/sys/dev/rt/if_rt.c user/ngie/stable-10-libnv/sys/dev/uart/uart_tty.c user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2_inode_cnv.c user/ngie/stable-10-libnv/sys/fs/nandfs/nandfs_segment.c user/ngie/stable-10-libnv/sys/geom/multipath/g_multipath.c user/ngie/stable-10-libnv/sys/i386/i386/machdep.c user/ngie/stable-10-libnv/sys/i386/isa/npx.c user/ngie/stable-10-libnv/sys/i386/linux/linux_sysvec.c user/ngie/stable-10-libnv/sys/kern/kern_condvar.c user/ngie/stable-10-libnv/sys/kern/kern_conf.c user/ngie/stable-10-libnv/sys/kern/kern_environment.c user/ngie/stable-10-libnv/sys/kern/subr_bus.c user/ngie/stable-10-libnv/sys/kern/subr_busdma_bufalloc.c user/ngie/stable-10-libnv/sys/kern/subr_hints.c user/ngie/stable-10-libnv/sys/kern/tty.c user/ngie/stable-10-libnv/sys/mips/include/asm.h user/ngie/stable-10-libnv/sys/modules/syscons/Makefile user/ngie/stable-10-libnv/sys/netinet/sctp_input.c user/ngie/stable-10-libnv/sys/netinet/sctp_output.c user/ngie/stable-10-libnv/sys/netinet/sctp_output.h user/ngie/stable-10-libnv/sys/netinet/sctp_pcb.c user/ngie/stable-10-libnv/sys/netinet/sctp_var.h user/ngie/stable-10-libnv/sys/netinet/tcp_output.c user/ngie/stable-10-libnv/sys/netinet/tcp_subr.c user/ngie/stable-10-libnv/sys/netinet/tcp_timer.c user/ngie/stable-10-libnv/sys/netinet/tcp_timer.h user/ngie/stable-10-libnv/sys/powerpc/powerpc/busdma_machdep.c user/ngie/stable-10-libnv/sys/sparc64/sparc64/bus_machdep.c user/ngie/stable-10-libnv/sys/sparc64/sparc64/machdep.c user/ngie/stable-10-libnv/sys/sys/ata.h user/ngie/stable-10-libnv/sys/sys/bus.h user/ngie/stable-10-libnv/sys/sys/conf.h user/ngie/stable-10-libnv/sys/sys/elf_common.h user/ngie/stable-10-libnv/sys/sys/param.h user/ngie/stable-10-libnv/sys/sys/ttydevsw.h user/ngie/stable-10-libnv/sys/x86/x86/busdma_bounce.c user/ngie/stable-10-libnv/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/stable-10-libnv/tools/regression/geom_gate/test-1.t user/ngie/stable-10-libnv/tools/regression/geom_gate/test-2.t user/ngie/stable-10-libnv/tools/regression/geom_gate/test-3.t user/ngie/stable-10-libnv/tools/regression/posixsem2/semtest.c user/ngie/stable-10-libnv/usr.bin/dpv/dpv.1 user/ngie/stable-10-libnv/usr.bin/dpv/dpv.c user/ngie/stable-10-libnv/usr.bin/locate/locate/locate.rc user/ngie/stable-10-libnv/usr.bin/locate/locate/updatedb.sh user/ngie/stable-10-libnv/usr.bin/truncate/tests/truncate_test.sh user/ngie/stable-10-libnv/usr.sbin/Makefile user/ngie/stable-10-libnv/usr.sbin/bhyve/Makefile user/ngie/stable-10-libnv/usr.sbin/bhyve/bhyve.8 user/ngie/stable-10-libnv/usr.sbin/bhyve/bhyverun.c user/ngie/stable-10-libnv/usr.sbin/bhyve/dbgport.c user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_ahci.c user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_lpc.c user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_lpc.h user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_passthru.c user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_virtio_net.c user/ngie/stable-10-libnv/usr.sbin/bhyve/uart_emul.c user/ngie/stable-10-libnv/usr.sbin/bhyvectl/Makefile user/ngie/stable-10-libnv/usr.sbin/bhyvectl/bhyvectl.c user/ngie/stable-10-libnv/usr.sbin/bhyveload/bhyveload.8 user/ngie/stable-10-libnv/usr.sbin/bhyveload/bhyveload.c user/ngie/stable-10-libnv/usr.sbin/bsdconfig/share/dialog.subr user/ngie/stable-10-libnv/usr.sbin/bsdconfig/share/strings.subr Directory Properties: user/ngie/stable-10-libnv/ (props changed) user/ngie/stable-10-libnv/crypto/openssh/sandbox-capsicum.c (props changed) Modified: user/ngie/stable-10-libnv/UPDATING ============================================================================== --- user/ngie/stable-10-libnv/UPDATING Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/UPDATING Thu Feb 4 09:39:08 2016 (r295248) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20160124: + The NONE and HPN patches has been removed from OpenSSH. They are + still available in the security/openssh-portable port. + 20151214: r292223 changed the internal interface between the nfsd.ko and nfscommon.ko modules. As such, they must both be upgraded to-gether. Modified: user/ngie/stable-10-libnv/contrib/mdocml/lib.in ============================================================================== --- user/ngie/stable-10-libnv/contrib/mdocml/lib.in Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/contrib/mdocml/lib.in Thu Feb 4 09:39:08 2016 (r295248) @@ -37,6 +37,7 @@ LINE("libcipher", "FreeSec Crypt Library LINE("libcompat", "Compatibility Library (libcompat, \\-lcompat)") LINE("libcrypt", "Crypt Library (libcrypt, \\-lcrypt)") LINE("libcurses", "Curses Library (libcurses, \\-lcurses)") +LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)") LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)") LINE("libdevstat", "Device Statistics Library (libdevstat, \\-ldevstat)") LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)") Modified: user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade Thu Feb 4 09:39:08 2016 (r295248) @@ -3,81 +3,97 @@ FreeBSD maintainer's guide to OpenSSH-portable ============================================== -XXX -XXX this needs a complete rewrite -XXX svn merge from vendor branch, resolve conflicts manually -XXX (see FREEBSD-tricks for tips on how to reduce conflicts) -XXX run freebsd-configure.sh to generate config.h and krb5_config.h -XXX svn diff Makefile.in to see if the Makefiles need adjusting -XXX +00) Make sure your mail spool has plenty of free space. It'll fill up + pretty fast once you're done with this checklist. -0) Make sure your mail spool has plenty of free space. It'll fill up - pretty fast once you're done with this checklist. +01) Download the latest OpenSSH-portable tarball and signature from + OpenBSD (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/). -1) Grab the latest OpenSSH-portable tarball from the OpenBSD FTP - site (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/) +02) Verify the signature: -2) Unpack the tarball in a suitable directory. + $ gpg --verify openssh-X.YpZ.tar.gz.asc - $ tar xf openssh-X.YpZ.tar.gz \ - -X /usr/src/crypto/openssh/FREEBSD-Xlist +03) Unpack the tarball in a suitable directory: -3) Remove trash: + $ tar xf openssh-X.YpZ.tar.gz - Make sure -X took care of everything, and if it didn't, make sure - to update FREEBSD-Xlist so you won't miss it the next time. A good - way to do this is to run a test import and see if any new files - show up: +04) Copy to the vendor directory: - $ cvs -n import src/crypto/openssh OPENSSH x | grep \^N + $ svn co svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist + $ rsync --archive --delete openssh-X.YpZ/ dist/ -4) Import the sources: +05) Take care of added / deleted files: - $ cvs import src/crypto/openssh OPENSSH OpenSSH_X_YpZ + $ svn rm $(svn stat dist | awk '$1 == "!" { print $2 }') + $ svn add --no-auto-props $(svn stat dist | awk '$1 == "?" { print $2 }') -5) Resolve conflicts. Remember to bump the version number and - addendum in version.h, and update the default value in - ssh{,d}_config and ssh{,d}_config.5. +06) Commit: -6) Generate configure and config.h.in: + $ svn commit -m "Vendor import of OpenSSH X.YpZ." dist - $ autoconf - $ autoheader +07) Tag: - Note: this requires a recent version of autoconf, not autoconf213. + $ svn copy -m "Tag OpenSSH X.YpZ." \ + svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist \ + svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/X.YpZ -7) Run configure with the appropriate arguments: +08) Check out head and run the pre-merge script: - $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-pam --with-tcp-wrappers --with-libedit \ - --with-ssl-engine + $ svn co svn+ssh://svn.freebsd.org/base/head + $ cd head/crypto/openssh + $ sh freebsd-pre-merge.sh - This will regenerate config.h, which must be committed along with - the rest. +09) Merge from the vendor branch: - Note that we don't want to configure OpenSSH for Kerberos using - configure since we have to be able to turn it on or off depending - on the value of MK_KERBEROS. Our Makefiles take care of this. + $ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist . -8) If source files have been added or removed, update the appropriate - makefiles to reflect changes in the vendor's Makefile.in. +0A) Resolve conflicts. Remember to bump the version addendum in + version.h, and update the default value in ssh{,d}_config and + ssh{,d}_config.5. -9) Build libssh. Follow the instructions in ssh_namespace.h to get a - list of new symbols. Update ssh_namespace.h, build everything, - install and test. +0B) Diff against the vendor branch: -A) Build and test the pam_ssh PAM module. It gropes around libssh's - internals and will break if something significant changes or if - ssh_namespace.h is out of whack. + $ svn diff \^/vendor-crypto/openssh/dist . -B) Re-commit everything on repoman (you *did* use a test repo for - this, didn't you?) + Files that have modifications relative to the vendor code, and + only those files, must have the svn:keywords property set to + FreeBSD=%H and be listed in the 'keywords' file created by the + pre-merge script. + +0C) Run the post-merge script: + + $ sh freebsd-post-merge.sh + +0D) Run the configure script: + + $ sh freebsd-configure.sh + +0E) Check config.h very carefully. + +0F) If source files have been added or removed, update the appropriate + makefiles to reflect changes in the vendor's Makefile.in. + +10) Build libssh: + + $ cd ../../secure/lib/libssh && make obj && make depend && make + +11) Follow the instructions in ssh_namespace.h to get a list of new + symbols, and them to ssh_namespace.h. Keep it sorted! + +12) Build and install world, reboot, test. Pay particular attention + to pam_ssh(8), which gropes inside libssh and will break if + something significant changes or if ssh_namespace.h is out of + whack. + +13) Commit, and hunker down for the inevitable storm of complaints. An overview of FreeBSD changes to OpenSSH-portable ================================================== +XXX This section is out of date + 0) VersionAddendum The SSH protocol allows for a human-readable version string of up Modified: user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c Thu Feb 4 09:39:08 2016 (r295248) @@ -2,7 +2,7 @@ /* * Kerberos v5 authentication and ticket-passing routines. * - * $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $ + * $FreeBSD$ */ /* * Copyright (c) 2002 Daniel Kouril. All rights reserved. Modified: user/ngie/stable-10-libnv/crypto/openssh/buffer.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/buffer.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/buffer.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: buffer.c,v 1.35 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -27,7 +26,7 @@ #include "log.h" #define BUFFER_MAX_CHUNK 0x100000 -#define BUFFER_MAX_LEN 0x4000000 /* 64MB */ +#define BUFFER_MAX_LEN 0xa00000 #define BUFFER_ALLOCSZ 0x008000 /* Initializes the buffer structure. */ @@ -167,13 +166,6 @@ buffer_len(const Buffer *buffer) return buffer->end - buffer->offset; } -/* Returns the maximum number of bytes of data that may be in the buffer. */ -u_int -buffer_get_max_len(void) -{ - return (BUFFER_MAX_LEN); -} - /* Gets data from the beginning of the buffer. */ int Modified: user/ngie/stable-10-libnv/crypto/openssh/buffer.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/buffer.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/buffer.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: buffer.h,v 1.23 2014/01/12 08:13:13 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -47,8 +46,6 @@ int buffer_get_ret(Buffer *, void *, u_ int buffer_consume_ret(Buffer *, u_int); int buffer_consume_end_ret(Buffer *, u_int); -u_int buffer_get_max_len(void); - #include <openssl/bn.h> void buffer_put_bignum(Buffer *, const BIGNUM *); Modified: user/ngie/stable-10-libnv/crypto/openssh/channels.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/channels.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/channels.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: channels.c,v 1.331 2014/02/26 20:29:29 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -174,11 +173,6 @@ static void port_open_helper(Channel *c, static int connect_next(struct channel_connect *); static void channel_connect_ctx_free(struct channel_connect *); -/* -- HPN */ - -static int hpn_disabled = 0; -static u_int buffer_size = CHAN_HPN_MIN_WINDOW_DEFAULT; - /* -- channel core */ Channel * @@ -325,7 +319,6 @@ channel_new(char *ctype, int type, int r c->self = found; c->type = type; c->ctype = ctype; - c->dynamic_window = 0; c->local_window = window; c->local_window_max = window; c->local_consumed = 0; @@ -826,45 +819,10 @@ channel_pre_open_13(Channel *c, fd_set * FD_SET(c->sock, writeset); } -static u_int -channel_tcpwinsz(void) -{ - u_int32_t tcpwinsz; - socklen_t optsz; - int ret, sd; - u_int maxlen; - - /* If we are not on a socket return 128KB. */ - if (!packet_connection_is_on_socket()) - return (128 * 1024); - - tcpwinsz = 0; - optsz = sizeof(tcpwinsz); - sd = packet_get_connection_in(); - ret = getsockopt(sd, SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz); - - /* Return no more than the maximum buffer size. */ - maxlen = buffer_get_max_len(); - if ((ret == 0) && tcpwinsz > maxlen) - tcpwinsz = maxlen; - /* In case getsockopt() failed return a minimum. */ - if (tcpwinsz == 0) - tcpwinsz = CHAN_TCP_WINDOW_DEFAULT; - debug2("tcpwinsz: %d for connection: %d", tcpwinsz, sd); - return (tcpwinsz); -} - static void channel_pre_open(Channel *c, fd_set *readset, fd_set *writeset) { - u_int limit; - - /* Check buffer limits. */ - if (!c->tcpwinsz || c->dynamic_window > 0) - c->tcpwinsz = channel_tcpwinsz(); - - limit = MIN(compat20 ? c->remote_window : packet_get_maxsize(), - 2 * c->tcpwinsz); + u_int limit = compat20 ? c->remote_window : packet_get_maxsize(); if (c->istate == CHAN_INPUT_OPEN && limit > 0 && @@ -1857,25 +1815,14 @@ channel_check_window(Channel *c) c->local_maxpacket*3) || c->local_window < c->local_window_max/2) && c->local_consumed > 0) { - u_int addition = 0; - - /* Adjust max window size if we are in a dynamic environment. */ - if (c->dynamic_window && c->tcpwinsz > c->local_window_max) { - /* - * Grow the window somewhat aggressively to maintain - * pressure. - */ - addition = 1.5 * (c->tcpwinsz - c->local_window_max); - c->local_window_max += addition; - } packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST); packet_put_int(c->remote_id); - packet_put_int(c->local_consumed + addition); + packet_put_int(c->local_consumed); packet_send(); debug2("channel %d: window %d sent adjust %d", c->self, c->local_window, c->local_consumed); - c->local_window += c->local_consumed + addition; + c->local_window += c->local_consumed; c->local_consumed = 0; } return 1; @@ -2739,14 +2686,6 @@ channel_set_af(int af) IPv4or6 = af; } -void -channel_set_hpn(int disabled, u_int buf_size) -{ - hpn_disabled = disabled; - buffer_size = buf_size; - debug("HPN Disabled: %d, HPN Buffer Size: %d", - hpn_disabled, buffer_size); -} /* * Determine whether or not a port forward listens to loopback, the @@ -2924,18 +2863,10 @@ channel_setup_fwd_listener(int type, con *allocated_listen_port); } - /* - * Allocate a channel number for the socket. Explicitly test - * for hpn disabled option. If true use smaller window size. - */ - if (hpn_disabled) - c = channel_new("port listener", type, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, - 0, "port listener", 1); - else - c = channel_new("port listener", type, sock, sock, -1, - buffer_size, CHAN_TCP_PACKET_DEFAULT, - 0, "port listener", 1); + /* Allocate a channel number for the socket. */ + c = channel_new("port listener", type, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, + 0, "port listener", 1); c->path = xstrdup(host); c->host_port = port_to_connect; c->listening_addr = addr == NULL ? NULL : xstrdup(addr); @@ -3583,16 +3514,10 @@ x11_create_display_inet(int x11_display_ *chanids = xcalloc(num_socks + 1, sizeof(**chanids)); for (n = 0; n < num_socks; n++) { sock = socks[n]; - if (hpn_disabled) - nc = channel_new("x11 listener", - SSH_CHANNEL_X11_LISTENER, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, - 0, "X11 inet listener", 1); - else - nc = channel_new("x11 listener", - SSH_CHANNEL_X11_LISTENER, sock, sock, -1, - buffer_size, CHAN_X11_PACKET_DEFAULT, - 0, "X11 inet listener", 1); + nc = channel_new("x11 listener", + SSH_CHANNEL_X11_LISTENER, sock, sock, -1, + CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, + 0, "X11 inet listener", 1); nc->single_connection = single_connection; (*chanids)[n] = nc->self; } Modified: user/ngie/stable-10-libnv/crypto/openssh/channels.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/channels.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/channels.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: channels.h,v 1.113 2013/06/07 15:37:52 dtucker Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -133,8 +132,6 @@ struct Channel { u_int local_window_max; u_int local_consumed; u_int local_maxpacket; - u_int tcpwinsz; - int dynamic_window; int extended_usage; int single_connection; @@ -176,7 +173,6 @@ struct Channel { #define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT) #define CHAN_X11_PACKET_DEFAULT (16*1024) #define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT) -#define CHAN_HPN_MIN_WINDOW_DEFAULT (2*1024*1024) /* possible input states */ #define CHAN_INPUT_OPEN 0 @@ -310,8 +306,4 @@ void chan_rcvd_ieof(Channel *); void chan_write_failed(Channel *); void chan_obuf_empty(Channel *); -/* hpn handler */ - -void channel_set_hpn(int, u_int); - #endif Modified: user/ngie/stable-10-libnv/crypto/openssh/cipher.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/cipher.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/cipher.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: cipher.c,v 1.97 2014/02/07 06:55:54 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -225,12 +224,7 @@ ciphers_valid(const char *names) for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; (p = strsep(&cp, CIPHER_SEP))) { c = cipher_by_name(p); -#ifdef NONE_CIPHER_ENABLED - if (c == NULL || (c->number != SSH_CIPHER_SSH2 && - c->number != SSH_CIPHER_NONE)) { -#else - if (c == NULL || (c->number != SSH_CIPHER_SSH2)) { -#endif + if (c == NULL || c->number != SSH_CIPHER_SSH2) { debug("bad cipher %s [%s]", p, names); free(cipher_list); return 0; @@ -485,9 +479,6 @@ cipher_get_keyiv(CipherContext *cc, u_ch } switch (c->number) { -#ifdef NONE_CIPHER_ENABLED - case SSH_CIPHER_NONE: -#endif case SSH_CIPHER_SSH2: case SSH_CIPHER_DES: case SSH_CIPHER_BLOWFISH: @@ -527,9 +518,6 @@ cipher_set_keyiv(CipherContext *cc, u_ch return; switch (c->number) { -#ifdef NONE_CIPHER_ENABLED - case SSH_CIPHER_NONE: -#endif case SSH_CIPHER_SSH2: case SSH_CIPHER_DES: case SSH_CIPHER_BLOWFISH: Modified: user/ngie/stable-10-libnv/crypto/openssh/clientloop.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/clientloop.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/clientloop.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: clientloop.c,v 1.258 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1892,14 +1891,9 @@ client_request_x11(const char *request_t sock = x11_connect_display(); if (sock < 0) return NULL; - if (options.hpn_disabled) - c = channel_new("x11", SSH_CHANNEL_X11_OPEN, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, - 0, "x11", 1); - else - c = channel_new("x11", SSH_CHANNEL_X11_OPEN, sock, sock, -1, - options.hpn_buffer_size, CHAN_X11_PACKET_DEFAULT, - 0, "x11", 1); + c = channel_new("x11", + SSH_CHANNEL_X11_OPEN, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); c->force_drain = 1; return c; } @@ -1919,16 +1913,10 @@ client_request_agent(const char *request sock = ssh_get_authentication_socket(); if (sock < 0) return NULL; - if (options.hpn_disabled) - c = channel_new("authentication agent connection", - SSH_CHANNEL_OPEN, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, - "authentication agent connection", 1); - else - c = channel_new("authentication agent connection", - SSH_CHANNEL_OPEN, sock, sock, -1, - options.hpn_buffer_size, options.hpn_buffer_size, 0, - "authentication agent connection", 1); + c = channel_new("authentication agent connection", + SSH_CHANNEL_OPEN, sock, sock, -1, + CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, + "authentication agent connection", 1); c->force_drain = 1; return c; } @@ -1955,14 +1943,8 @@ client_request_tun_fwd(int tun_mode, int return -1; } - if (options.hpn_disabled) - c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, - 0, "tun", 1); - else - c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, - options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, - 0, "tun", 1); + c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); c->datagram = 1; #if defined(SSH_TUN_FILTER) Modified: user/ngie/stable-10-libnv/crypto/openssh/compat.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/compat.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/compat.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: compat.c,v 1.82 2013/12/30 23:52:27 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -178,16 +177,6 @@ compat_datafellows(const char *version) datafellows = check[i].bugs; debug("match: %s pat %s compat 0x%08x", version, check[i].pat, datafellows); - /* - * Check to see if the remote side is OpenSSH and not - * HPN. It is utterly strange to check it from the - * version string and expose the option that way. - */ - if (strstr(version,"OpenSSH") != NULL && - strstr(version,"hpn") == NULL) { - datafellows |= SSH_BUG_LARGEWINDOW; - debug("Remote is not HPN-aware"); - } return; } } Modified: user/ngie/stable-10-libnv/crypto/openssh/compat.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/compat.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/compat.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: compat.h,v 1.44 2013/12/30 23:52:27 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. @@ -62,8 +61,6 @@ #define SSH_BUG_DYNAMIC_RPORT 0x08000000 #define SSH_BUG_CURVE25519PAD 0x10000000 -#define SSH_BUG_LARGEWINDOW 0x80000000 - void enable_compat13(void); void enable_compat20(void); void compat_datafellows(const char *); Modified: user/ngie/stable-10-libnv/crypto/openssh/config.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/config.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/config.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1681,6 +1681,11 @@ /* Define if xauth is found in your path */ /* #undef XAUTH_PATH */ +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ Modified: user/ngie/stable-10-libnv/crypto/openssh/configure.ac ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/configure.ac Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/configure.ac Thu Feb 4 09:39:08 2016 (r295248) @@ -1,4 +1,5 @@ # $Id: configure.ac,v 1.571 2014/02/21 17:09:34 tim Exp $ +# $FreeBSD$ # # Copyright (c) 1999-2004 Damien Miller # Modified: user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh Thu Feb 4 09:39:08 2016 (r295248) @@ -7,6 +7,7 @@ configure_args=" --prefix=/usr --sysconfdir=/etc/ssh --with-pam + --with-ssl-dir=/usr --with-tcp-wrappers --with-libedit --with-ssl-engine @@ -15,6 +16,19 @@ configure_args=" set -e +# make sure configure uses the correct compiler +export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC) +export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP) +unset CFLAGS CPPFLAGS LDFLAGS LIBS + +# regenerate configure and config.h.in +autoheader +autoconf + +# reset PATH to avoid picking up the wrong libraries +export PATH=/bin:/sbin:/usr/bin:/usr/sbin +unset LD_LIBRARY_PATH + # generate config.h with krb5 and stash it sh configure $configure_args --with-kerberos5 mv config.log config.log.orig Copied: user/ngie/stable-10-libnv/crypto/openssh/freebsd-post-merge.sh (from r295247, stable/10/crypto/openssh/freebsd-post-merge.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/stable-10-libnv/crypto/openssh/freebsd-post-merge.sh Thu Feb 4 09:39:08 2016 (r295248, copy of r295247, stable/10/crypto/openssh/freebsd-post-merge.sh) @@ -0,0 +1,14 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +xargs perl -n -i -e ' + print; + s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print; +' <keywords + +xargs perl -n -i -e ' + print; + m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n"; +' <rcsid Copied: user/ngie/stable-10-libnv/crypto/openssh/freebsd-pre-merge.sh (from r295247, stable/10/crypto/openssh/freebsd-pre-merge.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/stable-10-libnv/crypto/openssh/freebsd-pre-merge.sh Thu Feb 4 09:39:08 2016 (r295248, copy of r295247, stable/10/crypto/openssh/freebsd-pre-merge.sh) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +:>keywords +:>rcsid +svn list -R | grep -v '/$' | \ +while read f ; do + svn proplist -v $f | grep -q 'FreeBSD=%H' || continue + egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords + egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid +done +sort -u keywords rcsid | xargs perl -n -i -e ' + $strip = $ARGV if /\$(Id|OpenBSD):.*\$/; + print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/); +' Modified: user/ngie/stable-10-libnv/crypto/openssh/kex.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/kex.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/kex.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: kex.c,v 1.98 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -146,13 +145,8 @@ kex_names_valid(const char *names) return 1; } -/* put algorithm proposal into buffer. */ -#ifndef NONE_CIPHER_ENABLED +/* put algorithm proposal into buffer */ static void -#else -/* Also used in sshconnect2.c. */ -void -#endif kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX]) { u_int i; @@ -466,9 +460,6 @@ kex_choose_conf(Kex *kex) int nenc, nmac, ncomp; u_int mode, ctos, need, dh_need, authlen; int first_kex_follows, type; -#ifdef NONE_CIPHER_ENABLED - int auth_flag; -#endif my = kex_buf2prop(&kex->my, NULL); peer = kex_buf2prop(&kex->peer, &first_kex_follows); @@ -492,10 +483,6 @@ kex_choose_conf(Kex *kex) } /* Algorithm Negotiation */ -#ifdef NONE_CIPHER_ENABLED - auth_flag = packet_get_authentication_state(); - debug ("AUTH STATE is %d", auth_flag); -#endif for (mode = 0; mode < MODE_MAX; mode++) { newkeys = xcalloc(1, sizeof(*newkeys)); kex->newkeys[mode] = newkeys; @@ -510,17 +497,6 @@ kex_choose_conf(Kex *kex) if (authlen == 0) choose_mac(&newkeys->mac, cprop[nmac], sprop[nmac]); choose_comp(&newkeys->comp, cprop[ncomp], sprop[ncomp]); -#ifdef NONE_CIPHER_ENABLED - debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); - if (strcmp(newkeys->enc.name, "none") == 0) { - debug("Requesting NONE. Authflag is %d", auth_flag); - if (auth_flag == 1) - debug("None requested post authentication."); - else - fatal("Pre-authentication none cipher requests " - "are not allowed."); - } -#endif debug("kex: %s %s %s %s", ctos ? "client->server" : "server->client", newkeys->enc.name, Modified: user/ngie/stable-10-libnv/crypto/openssh/kex.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/kex.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/kex.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -149,10 +148,6 @@ struct Kex { int kex_names_valid(const char *); char *kex_alg_list(char); -#ifdef NONE_CIPHER_ENABLED -void kex_prop2buf(Buffer *, char *[PROPOSAL_MAX]); -#endif - Kex *kex_setup(char *[PROPOSAL_MAX]); void kex_finish(Kex *); Modified: user/ngie/stable-10-libnv/crypto/openssh/misc.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/misc.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/misc.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: misc.c,v 1.92 2013/10/14 23:28:23 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -1037,34 +1036,3 @@ sock_set_v6only(int s) error("setsockopt IPV6_V6ONLY: %s", strerror(errno)); #endif } - -void -sock_get_rcvbuf(int *size, int rcvbuf) -{ - int sock, socksize; - socklen_t socksizelen = sizeof(socksize); - - /* - * Create a socket but do not connect it. We use it - * only to get the rcv socket size. - */ - sock = socket(AF_INET6, SOCK_STREAM, 0); - if (sock < 0) - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock < 0) - return; - - /* - * If the tcp_rcv_buf option is set and passed in, attempt to set the - * buffer size to its value. - */ - if (rcvbuf) - setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (void *)&rcvbuf, - sizeof(rcvbuf)); - - if (getsockopt(sock, SOL_SOCKET, SO_RCVBUF, - &socksize, &socksizelen) == 0) - if (size != NULL) - *size = socksize; - close(sock); -} Modified: user/ngie/stable-10-libnv/crypto/openssh/misc.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/misc.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/misc.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: misc.h,v 1.50 2013/10/14 23:28:23 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -40,7 +39,6 @@ time_t monotime(void); void lowercase(char *s); void sock_set_v6only(int); -void sock_get_rcvbuf(int *, int); struct passwd *pwcopy(struct passwd *); const char *ssh_gai_strerror(int); Modified: user/ngie/stable-10-libnv/crypto/openssh/moduli.5 ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/moduli.5 Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/moduli.5 Thu Feb 4 09:39:08 2016 (r295248) @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd September 26, 2012 +.Dd $Mdocdate: September 26 2012 $ .Dt MODULI 5 .Os .Sh NAME Modified: user/ngie/stable-10-libnv/crypto/openssh/mux.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/mux.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/mux.c Thu Feb 4 09:39:08 2016 (r295248) @@ -31,6 +31,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> Modified: user/ngie/stable-10-libnv/crypto/openssh/myproposal.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/myproposal.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/myproposal.h Thu Feb 4 09:39:08 2016 (r295248) @@ -110,10 +110,6 @@ "chacha20-poly1305@openssh.com," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" -#ifdef NONE_CIPHER_ENABLED -#define KEX_ENCRYPT_INCLUDE_NONE KEX_DEFAULT_ENCRYPT \ - ",none" -#endif #define KEX_DEFAULT_MAC \ "hmac-md5-etm@openssh.com," \ Modified: user/ngie/stable-10-libnv/crypto/openssh/packet.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/packet.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/packet.c Thu Feb 4 09:39:08 2016 (r295248) @@ -38,6 +38,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include "openbsd-compat/sys-queue.h" @@ -201,9 +202,6 @@ struct session_state { }; static struct session_state *active_state, *backup_state; -#ifdef NONE_CIPHER_ENABLED -static int rekey_requested = 0; -#endif static struct session_state * alloc_session_state(void) @@ -1315,7 +1313,6 @@ packet_read_poll2(u_int32_t *seqnr_p) buffer_ptr(&active_state->input), block_size, 0, 0) != 0) fatal("Decryption integrity check failed"); cp = buffer_ptr(&active_state->incoming_packet); - active_state->packlen = get_u32(cp); if (active_state->packlen < 1 + 4 || active_state->packlen > PACKET_MAX_SIZE) { @@ -1942,26 +1939,12 @@ packet_send_ignore(int nbytes) } } -#ifdef NONE_CIPHER_ENABLED -void -packet_request_rekeying(void) -{ - rekey_requested = 1; -} -#endif - #define MAX_PACKETS (1U<<31) int packet_need_rekeying(void) { if (datafellows & SSH_BUG_NOREKEY) return 0; -#ifdef NONE_CIPHER_ENABLED - if (rekey_requested == 1) { - rekey_requested = 0; - return 1; - } -#endif return (active_state->p_send.packets > MAX_PACKETS) || (active_state->p_read.packets > MAX_PACKETS) || @@ -2073,11 +2056,3 @@ packet_restore_state(void) add_recv_bytes(len); } } - -#ifdef NONE_CIPHER_ENABLED -int -packet_get_authentication_state(void) -{ - return (active_state->after_authentication); -} -#endif Modified: user/ngie/stable-10-libnv/crypto/openssh/packet.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/packet.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/packet.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: packet.h,v 1.59 2013/07/12 00:19:59 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -39,9 +38,6 @@ void packet_set_interactive(int, int int packet_is_interactive(void); void packet_set_server(void); void packet_set_authenticated(void); -#ifdef NONE_CIPHER_ENABLED -int packet_get_authentication_state(void); -#endif void packet_start(u_char); void packet_put_char(int ch); @@ -119,9 +115,6 @@ do { \ } while (0) int packet_need_rekeying(void); -#ifdef NONE_CIPHER_ENABLED -void packet_request_rekeying(void); -#endif void packet_set_rekey_limits(u_int32_t, time_t); time_t packet_get_rekey_timeout(void); Modified: user/ngie/stable-10-libnv/crypto/openssh/pathnames.h ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/pathnames.h Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/pathnames.h Thu Feb 4 09:39:08 2016 (r295248) @@ -1,4 +1,5 @@ /* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> Modified: user/ngie/stable-10-libnv/crypto/openssh/readconf.c ============================================================================== --- user/ngie/stable-10-libnv/crypto/openssh/readconf.c Thu Feb 4 09:08:36 2016 (r295247) +++ user/ngie/stable-10-libnv/crypto/openssh/readconf.c Thu Feb 4 09:39:08 2016 (r295248) @@ -1,5 +1,4 @@ /* $OpenBSD: readconf.c,v 1.218 2014/02/23 20:11:36 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -153,12 +152,8 @@ typedef enum { oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, - oIgnoredUnknownOption, - oHPNDisabled, oHPNBufferSize, oTcpRcvBufPoll, oTcpRcvBuf, -#ifdef NONE_CIPHER_ENABLED - oNoneEnabled, oNoneSwitch, -#endif - oVersionAddendum, oDeprecated, oUnsupported + oVersionAddendum, + oIgnoredUnknownOption, oDeprecated, oUnsupported } OpCodes; /* Textual representations of the tokens. */ @@ -271,14 +266,10 @@ static struct { { "canonicalizemaxdots", oCanonicalizeMaxDots }, { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs }, { "ignoreunknown", oIgnoreUnknown }, - { "hpndisabled", oHPNDisabled }, - { "hpnbuffersize", oHPNBufferSize }, - { "tcprcvbufpoll", oTcpRcvBufPoll }, - { "tcprcvbuf", oTcpRcvBuf }, -#ifdef NONE_CIPHER_ENABLED - { "noneenabled", oNoneEnabled }, - { "noneswitch", oNoneSwitch }, -#endif + { "hpndisabled", oDeprecated }, + { "hpnbuffersize", oDeprecated }, + { "tcprcvbufpoll", oDeprecated }, + { "tcprcvbuf", oDeprecated }, { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } @@ -1360,47 +1351,6 @@ parse_int: multistate_ptr = multistate_requesttty; goto parse_multistate; - case oHPNDisabled: - intptr = &options->hpn_disabled; - goto parse_flag; - - case oHPNBufferSize: - intptr = &options->hpn_buffer_size; - goto parse_int; - - case oTcpRcvBufPoll: - intptr = &options->tcp_rcv_buf_poll; - goto parse_flag; - - case oTcpRcvBuf: - intptr = &options->tcp_rcv_buf; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602040939.u149d9ft015604>