svn commit: r276912 - in projects/routing: cddl/contrib/opensolaris/tools/ctf/cvt contrib/compiler-rt contrib/compiler-rt/BlocksRuntime contrib/compiler-rt/include contrib/compiler-rt/lib contrib/c...
Alexander V. Chernikov
melifaro at FreeBSD.org
Sat Jan 10 16:55:36 UTC 2015
Author: melifaro
Date: Sat Jan 10 16:55:28 2015
New Revision: 276912
URL: https://svnweb.freebsd.org/changeset/base/276912
Log:
Merge HEAD at r276886.
Added:
projects/routing/contrib/compiler-rt/include/
- copied from r276888, head/contrib/compiler-rt/include/
projects/routing/contrib/compiler-rt/lib/BlocksRuntime/
- copied from r276888, head/contrib/compiler-rt/lib/BlocksRuntime/
projects/routing/contrib/compiler-rt/lib/asan/
- copied from r276888, head/contrib/compiler-rt/lib/asan/
projects/routing/contrib/compiler-rt/lib/builtins/
- copied from r276888, head/contrib/compiler-rt/lib/builtins/
projects/routing/contrib/compiler-rt/lib/dfsan/
- copied from r276888, head/contrib/compiler-rt/lib/dfsan/
projects/routing/contrib/compiler-rt/lib/interception/
- copied from r276888, head/contrib/compiler-rt/lib/interception/
projects/routing/contrib/compiler-rt/lib/lsan/
- copied from r276888, head/contrib/compiler-rt/lib/lsan/
projects/routing/contrib/compiler-rt/lib/msan/
- copied from r276888, head/contrib/compiler-rt/lib/msan/
projects/routing/contrib/compiler-rt/lib/profile/
- copied from r276888, head/contrib/compiler-rt/lib/profile/
projects/routing/contrib/compiler-rt/lib/sanitizer_common/
- copied from r276888, head/contrib/compiler-rt/lib/sanitizer_common/
projects/routing/contrib/compiler-rt/lib/tsan/
- copied from r276888, head/contrib/compiler-rt/lib/tsan/
projects/routing/contrib/compiler-rt/lib/ubsan/
- copied from r276888, head/contrib/compiler-rt/lib/ubsan/
projects/routing/crypto/openssl/util/mkbuildinf.pl
- copied unchanged from r276888, head/crypto/openssl/util/mkbuildinf.pl
projects/routing/lib/libclang_rt/
- copied from r276888, head/lib/libclang_rt/
projects/routing/lib/libedit/TEST/rl1.c
- copied unchanged from r276888, head/lib/libedit/TEST/rl1.c
projects/routing/lib/libedit/TEST/wtc1.c
- copied unchanged from r276888, head/lib/libedit/TEST/wtc1.c
projects/routing/lib/libedit/chartype.c
- copied unchanged from r276888, head/lib/libedit/chartype.c
projects/routing/lib/libedit/config.h
- copied unchanged from r276888, head/lib/libedit/config.h
projects/routing/lib/libedit/eln.c
- copied unchanged from r276888, head/lib/libedit/eln.c
projects/routing/lib/libedit/keymacro.c
- copied unchanged from r276888, head/lib/libedit/keymacro.c
projects/routing/lib/libedit/keymacro.h
- copied unchanged from r276888, head/lib/libedit/keymacro.h
projects/routing/lib/libedit/terminal.c
- copied unchanged from r276888, head/lib/libedit/terminal.c
projects/routing/lib/libedit/terminal.h
- copied unchanged from r276888, head/lib/libedit/terminal.h
projects/routing/share/mk/bsd.dtb.mk
- copied unchanged from r276888, head/share/mk/bsd.dtb.mk
projects/routing/sys/conf/dtb.mk
- copied unchanged from r276888, head/sys/conf/dtb.mk
projects/routing/sys/modules/dtb/
- copied from r276888, head/sys/modules/dtb/
Deleted:
projects/routing/contrib/compiler-rt/BlocksRuntime/
projects/routing/contrib/compiler-rt/lib/absvdi2.c
projects/routing/contrib/compiler-rt/lib/absvsi2.c
projects/routing/contrib/compiler-rt/lib/absvti2.c
projects/routing/contrib/compiler-rt/lib/adddf3.c
projects/routing/contrib/compiler-rt/lib/addsf3.c
projects/routing/contrib/compiler-rt/lib/addvdi3.c
projects/routing/contrib/compiler-rt/lib/addvsi3.c
projects/routing/contrib/compiler-rt/lib/addvti3.c
projects/routing/contrib/compiler-rt/lib/arm/
projects/routing/contrib/compiler-rt/lib/ashldi3.c
projects/routing/contrib/compiler-rt/lib/ashlti3.c
projects/routing/contrib/compiler-rt/lib/ashrdi3.c
projects/routing/contrib/compiler-rt/lib/ashrti3.c
projects/routing/contrib/compiler-rt/lib/assembly.h
projects/routing/contrib/compiler-rt/lib/atomic.c
projects/routing/contrib/compiler-rt/lib/clear_cache.c
projects/routing/contrib/compiler-rt/lib/clzdi2.c
projects/routing/contrib/compiler-rt/lib/clzsi2.c
projects/routing/contrib/compiler-rt/lib/clzti2.c
projects/routing/contrib/compiler-rt/lib/cmpdi2.c
projects/routing/contrib/compiler-rt/lib/cmpti2.c
projects/routing/contrib/compiler-rt/lib/comparedf2.c
projects/routing/contrib/compiler-rt/lib/comparesf2.c
projects/routing/contrib/compiler-rt/lib/ctzdi2.c
projects/routing/contrib/compiler-rt/lib/ctzsi2.c
projects/routing/contrib/compiler-rt/lib/ctzti2.c
projects/routing/contrib/compiler-rt/lib/divdc3.c
projects/routing/contrib/compiler-rt/lib/divdf3.c
projects/routing/contrib/compiler-rt/lib/divdi3.c
projects/routing/contrib/compiler-rt/lib/divmoddi4.c
projects/routing/contrib/compiler-rt/lib/divmodsi4.c
projects/routing/contrib/compiler-rt/lib/divsc3.c
projects/routing/contrib/compiler-rt/lib/divsf3.c
projects/routing/contrib/compiler-rt/lib/divsi3.c
projects/routing/contrib/compiler-rt/lib/divti3.c
projects/routing/contrib/compiler-rt/lib/divxc3.c
projects/routing/contrib/compiler-rt/lib/enable_execute_stack.c
projects/routing/contrib/compiler-rt/lib/eprintf.c
projects/routing/contrib/compiler-rt/lib/extendsfdf2.c
projects/routing/contrib/compiler-rt/lib/ffsdi2.c
projects/routing/contrib/compiler-rt/lib/ffsti2.c
projects/routing/contrib/compiler-rt/lib/fixdfdi.c
projects/routing/contrib/compiler-rt/lib/fixdfsi.c
projects/routing/contrib/compiler-rt/lib/fixdfti.c
projects/routing/contrib/compiler-rt/lib/fixsfdi.c
projects/routing/contrib/compiler-rt/lib/fixsfsi.c
projects/routing/contrib/compiler-rt/lib/fixsfti.c
projects/routing/contrib/compiler-rt/lib/fixunsdfdi.c
projects/routing/contrib/compiler-rt/lib/fixunsdfsi.c
projects/routing/contrib/compiler-rt/lib/fixunsdfti.c
projects/routing/contrib/compiler-rt/lib/fixunssfdi.c
projects/routing/contrib/compiler-rt/lib/fixunssfsi.c
projects/routing/contrib/compiler-rt/lib/fixunssfti.c
projects/routing/contrib/compiler-rt/lib/fixunsxfdi.c
projects/routing/contrib/compiler-rt/lib/fixunsxfsi.c
projects/routing/contrib/compiler-rt/lib/fixunsxfti.c
projects/routing/contrib/compiler-rt/lib/fixxfdi.c
projects/routing/contrib/compiler-rt/lib/fixxfti.c
projects/routing/contrib/compiler-rt/lib/floatdidf.c
projects/routing/contrib/compiler-rt/lib/floatdisf.c
projects/routing/contrib/compiler-rt/lib/floatdixf.c
projects/routing/contrib/compiler-rt/lib/floatsidf.c
projects/routing/contrib/compiler-rt/lib/floatsisf.c
projects/routing/contrib/compiler-rt/lib/floattidf.c
projects/routing/contrib/compiler-rt/lib/floattisf.c
projects/routing/contrib/compiler-rt/lib/floattixf.c
projects/routing/contrib/compiler-rt/lib/floatundidf.c
projects/routing/contrib/compiler-rt/lib/floatundisf.c
projects/routing/contrib/compiler-rt/lib/floatundixf.c
projects/routing/contrib/compiler-rt/lib/floatunsidf.c
projects/routing/contrib/compiler-rt/lib/floatunsisf.c
projects/routing/contrib/compiler-rt/lib/floatuntidf.c
projects/routing/contrib/compiler-rt/lib/floatuntisf.c
projects/routing/contrib/compiler-rt/lib/floatuntixf.c
projects/routing/contrib/compiler-rt/lib/fp_lib.h
projects/routing/contrib/compiler-rt/lib/gcc_personality_v0.c
projects/routing/contrib/compiler-rt/lib/i386/
projects/routing/contrib/compiler-rt/lib/int_endianness.h
projects/routing/contrib/compiler-rt/lib/int_lib.h
projects/routing/contrib/compiler-rt/lib/int_math.h
projects/routing/contrib/compiler-rt/lib/int_types.h
projects/routing/contrib/compiler-rt/lib/int_util.c
projects/routing/contrib/compiler-rt/lib/int_util.h
projects/routing/contrib/compiler-rt/lib/lshrdi3.c
projects/routing/contrib/compiler-rt/lib/lshrti3.c
projects/routing/contrib/compiler-rt/lib/moddi3.c
projects/routing/contrib/compiler-rt/lib/modsi3.c
projects/routing/contrib/compiler-rt/lib/modti3.c
projects/routing/contrib/compiler-rt/lib/muldc3.c
projects/routing/contrib/compiler-rt/lib/muldf3.c
projects/routing/contrib/compiler-rt/lib/muldi3.c
projects/routing/contrib/compiler-rt/lib/mulodi4.c
projects/routing/contrib/compiler-rt/lib/mulosi4.c
projects/routing/contrib/compiler-rt/lib/muloti4.c
projects/routing/contrib/compiler-rt/lib/mulsc3.c
projects/routing/contrib/compiler-rt/lib/mulsf3.c
projects/routing/contrib/compiler-rt/lib/multi3.c
projects/routing/contrib/compiler-rt/lib/mulvdi3.c
projects/routing/contrib/compiler-rt/lib/mulvsi3.c
projects/routing/contrib/compiler-rt/lib/mulvti3.c
projects/routing/contrib/compiler-rt/lib/mulxc3.c
projects/routing/contrib/compiler-rt/lib/negdf2.c
projects/routing/contrib/compiler-rt/lib/negdi2.c
projects/routing/contrib/compiler-rt/lib/negsf2.c
projects/routing/contrib/compiler-rt/lib/negti2.c
projects/routing/contrib/compiler-rt/lib/negvdi2.c
projects/routing/contrib/compiler-rt/lib/negvsi2.c
projects/routing/contrib/compiler-rt/lib/negvti2.c
projects/routing/contrib/compiler-rt/lib/paritydi2.c
projects/routing/contrib/compiler-rt/lib/paritysi2.c
projects/routing/contrib/compiler-rt/lib/parityti2.c
projects/routing/contrib/compiler-rt/lib/popcountdi2.c
projects/routing/contrib/compiler-rt/lib/popcountsi2.c
projects/routing/contrib/compiler-rt/lib/popcountti2.c
projects/routing/contrib/compiler-rt/lib/powidf2.c
projects/routing/contrib/compiler-rt/lib/powisf2.c
projects/routing/contrib/compiler-rt/lib/powitf2.c
projects/routing/contrib/compiler-rt/lib/powixf2.c
projects/routing/contrib/compiler-rt/lib/ppc/
projects/routing/contrib/compiler-rt/lib/sparc64/
projects/routing/contrib/compiler-rt/lib/subdf3.c
projects/routing/contrib/compiler-rt/lib/subsf3.c
projects/routing/contrib/compiler-rt/lib/subvdi3.c
projects/routing/contrib/compiler-rt/lib/subvsi3.c
projects/routing/contrib/compiler-rt/lib/subvti3.c
projects/routing/contrib/compiler-rt/lib/trampoline_setup.c
projects/routing/contrib/compiler-rt/lib/truncdfsf2.c
projects/routing/contrib/compiler-rt/lib/ucmpdi2.c
projects/routing/contrib/compiler-rt/lib/ucmpti2.c
projects/routing/contrib/compiler-rt/lib/udivdi3.c
projects/routing/contrib/compiler-rt/lib/udivmoddi4.c
projects/routing/contrib/compiler-rt/lib/udivmodsi4.c
projects/routing/contrib/compiler-rt/lib/udivmodti4.c
projects/routing/contrib/compiler-rt/lib/udivsi3.c
projects/routing/contrib/compiler-rt/lib/udivti3.c
projects/routing/contrib/compiler-rt/lib/umoddi3.c
projects/routing/contrib/compiler-rt/lib/umodsi3.c
projects/routing/contrib/compiler-rt/lib/umodti3.c
projects/routing/contrib/compiler-rt/lib/x86_64/
projects/routing/crypto/openssl/crypto/bn/asm/mips3.s
projects/routing/lib/libedit/key.c
projects/routing/lib/libedit/key.h
projects/routing/lib/libedit/term.c
projects/routing/lib/libedit/term.h
Modified:
projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
projects/routing/contrib/compiler-rt/CREDITS.TXT
projects/routing/contrib/compiler-rt/LICENSE.TXT
projects/routing/contrib/compiler-rt/README.txt
projects/routing/crypto/openssl/CHANGES
projects/routing/crypto/openssl/Configure
projects/routing/crypto/openssl/Makefile
projects/routing/crypto/openssl/NEWS
projects/routing/crypto/openssl/README
projects/routing/crypto/openssl/apps/ca.c
projects/routing/crypto/openssl/apps/dgst.c
projects/routing/crypto/openssl/apps/ocsp.c
projects/routing/crypto/openssl/apps/openssl.c
projects/routing/crypto/openssl/apps/s_client.c
projects/routing/crypto/openssl/apps/s_server.c
projects/routing/crypto/openssl/apps/s_time.c
projects/routing/crypto/openssl/apps/speed.c
projects/routing/crypto/openssl/crypto/Makefile
projects/routing/crypto/openssl/crypto/aes/asm/aes-mips.pl
projects/routing/crypto/openssl/crypto/asn1/a_bitstr.c
projects/routing/crypto/openssl/crypto/asn1/a_type.c
projects/routing/crypto/openssl/crypto/asn1/a_verify.c
projects/routing/crypto/openssl/crypto/asn1/asn1.h
projects/routing/crypto/openssl/crypto/asn1/asn1_err.c
projects/routing/crypto/openssl/crypto/asn1/tasn_dec.c
projects/routing/crypto/openssl/crypto/asn1/x_algor.c
projects/routing/crypto/openssl/crypto/asn1/x_name.c
projects/routing/crypto/openssl/crypto/bio/bio.h
projects/routing/crypto/openssl/crypto/bio/bss_dgram.c
projects/routing/crypto/openssl/crypto/bn/asm/mips.pl
projects/routing/crypto/openssl/crypto/bn/asm/x86_64-gcc.c
projects/routing/crypto/openssl/crypto/bn/bn.h
projects/routing/crypto/openssl/crypto/bn/bn_asm.c
projects/routing/crypto/openssl/crypto/bn/bn_ctx.c
projects/routing/crypto/openssl/crypto/bn/bn_div.c
projects/routing/crypto/openssl/crypto/bn/bntest.c
projects/routing/crypto/openssl/crypto/constant_time_locl.h
projects/routing/crypto/openssl/crypto/cversion.c
projects/routing/crypto/openssl/crypto/dsa/dsa_asn1.c
projects/routing/crypto/openssl/crypto/dso/dso_dlfcn.c
projects/routing/crypto/openssl/crypto/ec/ec_lib.c
projects/routing/crypto/openssl/crypto/ec/ec_mult.c
projects/routing/crypto/openssl/crypto/ec/ec_pmeth.c
projects/routing/crypto/openssl/crypto/ec/ecp_nistp256.c
projects/routing/crypto/openssl/crypto/ec/ectest.c
projects/routing/crypto/openssl/crypto/ecdsa/Makefile
projects/routing/crypto/openssl/crypto/ecdsa/ecs_vrf.c
projects/routing/crypto/openssl/crypto/engine/eng_dyn.c
projects/routing/crypto/openssl/crypto/evp/Makefile
projects/routing/crypto/openssl/crypto/evp/e_des3.c
projects/routing/crypto/openssl/crypto/evp/evp_enc.c
projects/routing/crypto/openssl/crypto/md32_common.h
projects/routing/crypto/openssl/crypto/mem.c
projects/routing/crypto/openssl/crypto/objects/obj_xref.h
projects/routing/crypto/openssl/crypto/objects/objxref.pl
projects/routing/crypto/openssl/crypto/opensslv.h
projects/routing/crypto/openssl/crypto/sha/asm/sha1-mips.pl
projects/routing/crypto/openssl/crypto/sha/asm/sha512-mips.pl
projects/routing/crypto/openssl/crypto/ts/ts_rsp_sign.c
projects/routing/crypto/openssl/crypto/x509/x509.h
projects/routing/crypto/openssl/crypto/x509/x509_vpm.c
projects/routing/crypto/openssl/crypto/x509/x_all.c
projects/routing/crypto/openssl/doc/HOWTO/certificates.txt
projects/routing/crypto/openssl/doc/HOWTO/proxy_certificates.txt
projects/routing/crypto/openssl/doc/apps/dgst.pod
projects/routing/crypto/openssl/doc/apps/ocsp.pod
projects/routing/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
projects/routing/crypto/openssl/doc/crypto/EVP_PKEY_encrypt.pod
projects/routing/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod
projects/routing/crypto/openssl/doc/crypto/X509_NAME_get_index_by_NID.pod
projects/routing/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod
projects/routing/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
projects/routing/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod
projects/routing/crypto/openssl/e_os.h
projects/routing/crypto/openssl/engines/e_padlock.c
projects/routing/crypto/openssl/ssl/d1_both.c
projects/routing/crypto/openssl/ssl/d1_clnt.c
projects/routing/crypto/openssl/ssl/d1_enc.c
projects/routing/crypto/openssl/ssl/d1_lib.c
projects/routing/crypto/openssl/ssl/d1_pkt.c
projects/routing/crypto/openssl/ssl/d1_srvr.c
projects/routing/crypto/openssl/ssl/dtls1.h
projects/routing/crypto/openssl/ssl/kssl.c
projects/routing/crypto/openssl/ssl/s23_srvr.c
projects/routing/crypto/openssl/ssl/s2_enc.c
projects/routing/crypto/openssl/ssl/s2_pkt.c
projects/routing/crypto/openssl/ssl/s2_srvr.c
projects/routing/crypto/openssl/ssl/s3_both.c
projects/routing/crypto/openssl/ssl/s3_clnt.c
projects/routing/crypto/openssl/ssl/s3_enc.c
projects/routing/crypto/openssl/ssl/s3_lib.c
projects/routing/crypto/openssl/ssl/s3_meth.c
projects/routing/crypto/openssl/ssl/s3_pkt.c
projects/routing/crypto/openssl/ssl/s3_srvr.c
projects/routing/crypto/openssl/ssl/srtp.h
projects/routing/crypto/openssl/ssl/ssl.h
projects/routing/crypto/openssl/ssl/ssl3.h
projects/routing/crypto/openssl/ssl/ssl_cert.c
projects/routing/crypto/openssl/ssl/ssl_ciph.c
projects/routing/crypto/openssl/ssl/ssl_lib.c
projects/routing/crypto/openssl/ssl/ssl_locl.h
projects/routing/crypto/openssl/ssl/ssl_sess.c
projects/routing/crypto/openssl/ssl/ssltest.c
projects/routing/crypto/openssl/ssl/t1_enc.c
projects/routing/crypto/openssl/ssl/t1_lib.c
projects/routing/crypto/openssl/util/libeay.num
projects/routing/crypto/openssl/util/mk1mf.pl
projects/routing/crypto/openssl/util/mkdef.pl
projects/routing/crypto/openssl/util/pl/netware.pl
projects/routing/crypto/openssl/util/ssleay.num
projects/routing/lib/clang/libllvmaarch64disassembler/Makefile
projects/routing/lib/libblocksruntime/Makefile
projects/routing/lib/libc/arm/aeabi/Makefile.inc
projects/routing/lib/libc/sys/cpuset.2
projects/routing/lib/libcompiler_rt/Makefile
projects/routing/lib/libedit/Makefile
projects/routing/lib/libedit/TEST/tc1.c
projects/routing/lib/libedit/chared.c
projects/routing/lib/libedit/chared.h
projects/routing/lib/libedit/chartype.h
projects/routing/lib/libedit/common.c
projects/routing/lib/libedit/edit/readline/readline.h
projects/routing/lib/libedit/editline.3
projects/routing/lib/libedit/editrc.5
projects/routing/lib/libedit/el.c
projects/routing/lib/libedit/el.h
projects/routing/lib/libedit/emacs.c
projects/routing/lib/libedit/filecomplete.c
projects/routing/lib/libedit/filecomplete.h
projects/routing/lib/libedit/hist.c
projects/routing/lib/libedit/hist.h
projects/routing/lib/libedit/histedit.h
projects/routing/lib/libedit/history.c
projects/routing/lib/libedit/makelist
projects/routing/lib/libedit/map.c
projects/routing/lib/libedit/map.h
projects/routing/lib/libedit/parse.c
projects/routing/lib/libedit/parse.h
projects/routing/lib/libedit/prompt.c
projects/routing/lib/libedit/prompt.h
projects/routing/lib/libedit/read.c
projects/routing/lib/libedit/read.h
projects/routing/lib/libedit/readline.c
projects/routing/lib/libedit/refresh.c
projects/routing/lib/libedit/refresh.h
projects/routing/lib/libedit/search.c
projects/routing/lib/libedit/search.h
projects/routing/lib/libedit/sig.c
projects/routing/lib/libedit/sig.h
projects/routing/lib/libedit/sys.h
projects/routing/lib/libedit/tokenizer.c
projects/routing/lib/libedit/tty.c
projects/routing/lib/libedit/tty.h
projects/routing/lib/libedit/vi.c
projects/routing/lib/libstand/Makefile
projects/routing/secure/lib/libcrypto/Makefile.inc
projects/routing/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
projects/routing/secure/lib/libcrypto/man/ASN1_STRING_length.3
projects/routing/secure/lib/libcrypto/man/ASN1_STRING_new.3
projects/routing/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
projects/routing/secure/lib/libcrypto/man/ASN1_generate_nconf.3
projects/routing/secure/lib/libcrypto/man/BIO_ctrl.3
projects/routing/secure/lib/libcrypto/man/BIO_f_base64.3
projects/routing/secure/lib/libcrypto/man/BIO_f_buffer.3
projects/routing/secure/lib/libcrypto/man/BIO_f_cipher.3
projects/routing/secure/lib/libcrypto/man/BIO_f_md.3
projects/routing/secure/lib/libcrypto/man/BIO_f_null.3
projects/routing/secure/lib/libcrypto/man/BIO_f_ssl.3
projects/routing/secure/lib/libcrypto/man/BIO_find_type.3
projects/routing/secure/lib/libcrypto/man/BIO_new.3
projects/routing/secure/lib/libcrypto/man/BIO_new_CMS.3
projects/routing/secure/lib/libcrypto/man/BIO_push.3
projects/routing/secure/lib/libcrypto/man/BIO_read.3
projects/routing/secure/lib/libcrypto/man/BIO_s_accept.3
projects/routing/secure/lib/libcrypto/man/BIO_s_bio.3
projects/routing/secure/lib/libcrypto/man/BIO_s_connect.3
projects/routing/secure/lib/libcrypto/man/BIO_s_fd.3
projects/routing/secure/lib/libcrypto/man/BIO_s_file.3
projects/routing/secure/lib/libcrypto/man/BIO_s_mem.3
projects/routing/secure/lib/libcrypto/man/BIO_s_null.3
projects/routing/secure/lib/libcrypto/man/BIO_s_socket.3
projects/routing/secure/lib/libcrypto/man/BIO_set_callback.3
projects/routing/secure/lib/libcrypto/man/BIO_should_retry.3
projects/routing/secure/lib/libcrypto/man/BN_BLINDING_new.3
projects/routing/secure/lib/libcrypto/man/BN_CTX_new.3
projects/routing/secure/lib/libcrypto/man/BN_CTX_start.3
projects/routing/secure/lib/libcrypto/man/BN_add.3
projects/routing/secure/lib/libcrypto/man/BN_add_word.3
projects/routing/secure/lib/libcrypto/man/BN_bn2bin.3
projects/routing/secure/lib/libcrypto/man/BN_cmp.3
projects/routing/secure/lib/libcrypto/man/BN_copy.3
projects/routing/secure/lib/libcrypto/man/BN_generate_prime.3
projects/routing/secure/lib/libcrypto/man/BN_mod_inverse.3
projects/routing/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
projects/routing/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
projects/routing/secure/lib/libcrypto/man/BN_new.3
projects/routing/secure/lib/libcrypto/man/BN_num_bytes.3
projects/routing/secure/lib/libcrypto/man/BN_rand.3
projects/routing/secure/lib/libcrypto/man/BN_set_bit.3
projects/routing/secure/lib/libcrypto/man/BN_swap.3
projects/routing/secure/lib/libcrypto/man/BN_zero.3
projects/routing/secure/lib/libcrypto/man/CMS_add0_cert.3
projects/routing/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
projects/routing/secure/lib/libcrypto/man/CMS_add1_signer.3
projects/routing/secure/lib/libcrypto/man/CMS_compress.3
projects/routing/secure/lib/libcrypto/man/CMS_decrypt.3
projects/routing/secure/lib/libcrypto/man/CMS_encrypt.3
projects/routing/secure/lib/libcrypto/man/CMS_final.3
projects/routing/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
projects/routing/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
projects/routing/secure/lib/libcrypto/man/CMS_get0_type.3
projects/routing/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
projects/routing/secure/lib/libcrypto/man/CMS_sign.3
projects/routing/secure/lib/libcrypto/man/CMS_sign_receipt.3
projects/routing/secure/lib/libcrypto/man/CMS_uncompress.3
projects/routing/secure/lib/libcrypto/man/CMS_verify.3
projects/routing/secure/lib/libcrypto/man/CMS_verify_receipt.3
projects/routing/secure/lib/libcrypto/man/CONF_modules_free.3
projects/routing/secure/lib/libcrypto/man/CONF_modules_load_file.3
projects/routing/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
projects/routing/secure/lib/libcrypto/man/DH_generate_key.3
projects/routing/secure/lib/libcrypto/man/DH_generate_parameters.3
projects/routing/secure/lib/libcrypto/man/DH_get_ex_new_index.3
projects/routing/secure/lib/libcrypto/man/DH_new.3
projects/routing/secure/lib/libcrypto/man/DH_set_method.3
projects/routing/secure/lib/libcrypto/man/DH_size.3
projects/routing/secure/lib/libcrypto/man/DSA_SIG_new.3
projects/routing/secure/lib/libcrypto/man/DSA_do_sign.3
projects/routing/secure/lib/libcrypto/man/DSA_dup_DH.3
projects/routing/secure/lib/libcrypto/man/DSA_generate_key.3
projects/routing/secure/lib/libcrypto/man/DSA_generate_parameters.3
projects/routing/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
projects/routing/secure/lib/libcrypto/man/DSA_new.3
projects/routing/secure/lib/libcrypto/man/DSA_set_method.3
projects/routing/secure/lib/libcrypto/man/DSA_sign.3
projects/routing/secure/lib/libcrypto/man/DSA_size.3
projects/routing/secure/lib/libcrypto/man/ERR_GET_LIB.3
projects/routing/secure/lib/libcrypto/man/ERR_clear_error.3
projects/routing/secure/lib/libcrypto/man/ERR_error_string.3
projects/routing/secure/lib/libcrypto/man/ERR_get_error.3
projects/routing/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
projects/routing/secure/lib/libcrypto/man/ERR_load_strings.3
projects/routing/secure/lib/libcrypto/man/ERR_print_errors.3
projects/routing/secure/lib/libcrypto/man/ERR_put_error.3
projects/routing/secure/lib/libcrypto/man/ERR_remove_state.3
projects/routing/secure/lib/libcrypto/man/ERR_set_mark.3
projects/routing/secure/lib/libcrypto/man/EVP_BytesToKey.3
projects/routing/secure/lib/libcrypto/man/EVP_DigestInit.3
projects/routing/secure/lib/libcrypto/man/EVP_DigestSignInit.3
projects/routing/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
projects/routing/secure/lib/libcrypto/man/EVP_EncryptInit.3
projects/routing/secure/lib/libcrypto/man/EVP_OpenInit.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_derive.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_new.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_sign.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_verify.3
projects/routing/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
projects/routing/secure/lib/libcrypto/man/EVP_SealInit.3
projects/routing/secure/lib/libcrypto/man/EVP_SignInit.3
projects/routing/secure/lib/libcrypto/man/EVP_VerifyInit.3
projects/routing/secure/lib/libcrypto/man/OBJ_nid2obj.3
projects/routing/secure/lib/libcrypto/man/OPENSSL_Applink.3
projects/routing/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
projects/routing/secure/lib/libcrypto/man/OPENSSL_config.3
projects/routing/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
projects/routing/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
projects/routing/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
projects/routing/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
projects/routing/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
projects/routing/secure/lib/libcrypto/man/PKCS12_create.3
projects/routing/secure/lib/libcrypto/man/PKCS12_parse.3
projects/routing/secure/lib/libcrypto/man/PKCS7_decrypt.3
projects/routing/secure/lib/libcrypto/man/PKCS7_encrypt.3
projects/routing/secure/lib/libcrypto/man/PKCS7_sign.3
projects/routing/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
projects/routing/secure/lib/libcrypto/man/PKCS7_verify.3
projects/routing/secure/lib/libcrypto/man/RAND_add.3
projects/routing/secure/lib/libcrypto/man/RAND_bytes.3
projects/routing/secure/lib/libcrypto/man/RAND_cleanup.3
projects/routing/secure/lib/libcrypto/man/RAND_egd.3
projects/routing/secure/lib/libcrypto/man/RAND_load_file.3
projects/routing/secure/lib/libcrypto/man/RAND_set_rand_method.3
projects/routing/secure/lib/libcrypto/man/RSA_blinding_on.3
projects/routing/secure/lib/libcrypto/man/RSA_check_key.3
projects/routing/secure/lib/libcrypto/man/RSA_generate_key.3
projects/routing/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
projects/routing/secure/lib/libcrypto/man/RSA_new.3
projects/routing/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
projects/routing/secure/lib/libcrypto/man/RSA_print.3
projects/routing/secure/lib/libcrypto/man/RSA_private_encrypt.3
projects/routing/secure/lib/libcrypto/man/RSA_public_encrypt.3
projects/routing/secure/lib/libcrypto/man/RSA_set_method.3
projects/routing/secure/lib/libcrypto/man/RSA_sign.3
projects/routing/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
projects/routing/secure/lib/libcrypto/man/RSA_size.3
projects/routing/secure/lib/libcrypto/man/SMIME_read_CMS.3
projects/routing/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
projects/routing/secure/lib/libcrypto/man/SMIME_write_CMS.3
projects/routing/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
projects/routing/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
projects/routing/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
projects/routing/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
projects/routing/secure/lib/libcrypto/man/X509_NAME_print_ex.3
projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
projects/routing/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
projects/routing/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
projects/routing/secure/lib/libcrypto/man/X509_new.3
projects/routing/secure/lib/libcrypto/man/X509_verify_cert.3
projects/routing/secure/lib/libcrypto/man/bio.3
projects/routing/secure/lib/libcrypto/man/blowfish.3
projects/routing/secure/lib/libcrypto/man/bn.3
projects/routing/secure/lib/libcrypto/man/bn_internal.3
projects/routing/secure/lib/libcrypto/man/buffer.3
projects/routing/secure/lib/libcrypto/man/crypto.3
projects/routing/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
projects/routing/secure/lib/libcrypto/man/d2i_DHparams.3
projects/routing/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
projects/routing/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
projects/routing/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
projects/routing/secure/lib/libcrypto/man/d2i_X509.3
projects/routing/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
projects/routing/secure/lib/libcrypto/man/d2i_X509_CRL.3
projects/routing/secure/lib/libcrypto/man/d2i_X509_NAME.3
projects/routing/secure/lib/libcrypto/man/d2i_X509_REQ.3
projects/routing/secure/lib/libcrypto/man/d2i_X509_SIG.3
projects/routing/secure/lib/libcrypto/man/des.3
projects/routing/secure/lib/libcrypto/man/dh.3
projects/routing/secure/lib/libcrypto/man/dsa.3
projects/routing/secure/lib/libcrypto/man/ecdsa.3
projects/routing/secure/lib/libcrypto/man/engine.3
projects/routing/secure/lib/libcrypto/man/err.3
projects/routing/secure/lib/libcrypto/man/evp.3
projects/routing/secure/lib/libcrypto/man/hmac.3
projects/routing/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
projects/routing/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
projects/routing/secure/lib/libcrypto/man/lh_stats.3
projects/routing/secure/lib/libcrypto/man/lhash.3
projects/routing/secure/lib/libcrypto/man/md5.3
projects/routing/secure/lib/libcrypto/man/mdc2.3
projects/routing/secure/lib/libcrypto/man/pem.3
projects/routing/secure/lib/libcrypto/man/rand.3
projects/routing/secure/lib/libcrypto/man/rc4.3
projects/routing/secure/lib/libcrypto/man/ripemd.3
projects/routing/secure/lib/libcrypto/man/rsa.3
projects/routing/secure/lib/libcrypto/man/sha.3
projects/routing/secure/lib/libcrypto/man/threads.3
projects/routing/secure/lib/libcrypto/man/ui.3
projects/routing/secure/lib/libcrypto/man/ui_compat.3
projects/routing/secure/lib/libcrypto/man/x509.3
projects/routing/secure/lib/libssl/man/SSL_CIPHER_get_name.3
projects/routing/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
projects/routing/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
projects/routing/secure/lib/libssl/man/SSL_CTX_add_session.3
projects/routing/secure/lib/libssl/man/SSL_CTX_ctrl.3
projects/routing/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
projects/routing/secure/lib/libssl/man/SSL_CTX_free.3
projects/routing/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
projects/routing/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
projects/routing/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
projects/routing/secure/lib/libssl/man/SSL_CTX_new.3
projects/routing/secure/lib/libssl/man/SSL_CTX_sess_number.3
projects/routing/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
projects/routing/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
projects/routing/secure/lib/libssl/man/SSL_CTX_sessions.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_mode.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_options.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_timeout.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
projects/routing/secure/lib/libssl/man/SSL_CTX_set_verify.3
projects/routing/secure/lib/libssl/man/SSL_CTX_use_certificate.3
projects/routing/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
projects/routing/secure/lib/libssl/man/SSL_SESSION_free.3
projects/routing/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
projects/routing/secure/lib/libssl/man/SSL_SESSION_get_time.3
projects/routing/secure/lib/libssl/man/SSL_accept.3
projects/routing/secure/lib/libssl/man/SSL_alert_type_string.3
projects/routing/secure/lib/libssl/man/SSL_clear.3
projects/routing/secure/lib/libssl/man/SSL_connect.3
projects/routing/secure/lib/libssl/man/SSL_do_handshake.3
projects/routing/secure/lib/libssl/man/SSL_free.3
projects/routing/secure/lib/libssl/man/SSL_get_SSL_CTX.3
projects/routing/secure/lib/libssl/man/SSL_get_ciphers.3
projects/routing/secure/lib/libssl/man/SSL_get_client_CA_list.3
projects/routing/secure/lib/libssl/man/SSL_get_current_cipher.3
projects/routing/secure/lib/libssl/man/SSL_get_default_timeout.3
projects/routing/secure/lib/libssl/man/SSL_get_error.3
projects/routing/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
projects/routing/secure/lib/libssl/man/SSL_get_ex_new_index.3
projects/routing/secure/lib/libssl/man/SSL_get_fd.3
projects/routing/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
projects/routing/secure/lib/libssl/man/SSL_get_peer_certificate.3
projects/routing/secure/lib/libssl/man/SSL_get_psk_identity.3
projects/routing/secure/lib/libssl/man/SSL_get_rbio.3
projects/routing/secure/lib/libssl/man/SSL_get_session.3
projects/routing/secure/lib/libssl/man/SSL_get_verify_result.3
projects/routing/secure/lib/libssl/man/SSL_get_version.3
projects/routing/secure/lib/libssl/man/SSL_library_init.3
projects/routing/secure/lib/libssl/man/SSL_load_client_CA_file.3
projects/routing/secure/lib/libssl/man/SSL_new.3
projects/routing/secure/lib/libssl/man/SSL_pending.3
projects/routing/secure/lib/libssl/man/SSL_read.3
projects/routing/secure/lib/libssl/man/SSL_rstate_string.3
projects/routing/secure/lib/libssl/man/SSL_session_reused.3
projects/routing/secure/lib/libssl/man/SSL_set_bio.3
projects/routing/secure/lib/libssl/man/SSL_set_connect_state.3
projects/routing/secure/lib/libssl/man/SSL_set_fd.3
projects/routing/secure/lib/libssl/man/SSL_set_session.3
projects/routing/secure/lib/libssl/man/SSL_set_shutdown.3
projects/routing/secure/lib/libssl/man/SSL_set_verify_result.3
projects/routing/secure/lib/libssl/man/SSL_shutdown.3
projects/routing/secure/lib/libssl/man/SSL_state_string.3
projects/routing/secure/lib/libssl/man/SSL_want.3
projects/routing/secure/lib/libssl/man/SSL_write.3
projects/routing/secure/lib/libssl/man/d2i_SSL_SESSION.3
projects/routing/secure/lib/libssl/man/ssl.3
projects/routing/secure/usr.bin/openssl/man/CA.pl.1
projects/routing/secure/usr.bin/openssl/man/asn1parse.1
projects/routing/secure/usr.bin/openssl/man/c_rehash.1
projects/routing/secure/usr.bin/openssl/man/ca.1
projects/routing/secure/usr.bin/openssl/man/ciphers.1
projects/routing/secure/usr.bin/openssl/man/cms.1
projects/routing/secure/usr.bin/openssl/man/crl.1
projects/routing/secure/usr.bin/openssl/man/crl2pkcs7.1
projects/routing/secure/usr.bin/openssl/man/dgst.1
projects/routing/secure/usr.bin/openssl/man/dhparam.1
projects/routing/secure/usr.bin/openssl/man/dsa.1
projects/routing/secure/usr.bin/openssl/man/dsaparam.1
projects/routing/secure/usr.bin/openssl/man/ec.1
projects/routing/secure/usr.bin/openssl/man/ecparam.1
projects/routing/secure/usr.bin/openssl/man/enc.1
projects/routing/secure/usr.bin/openssl/man/errstr.1
projects/routing/secure/usr.bin/openssl/man/gendsa.1
projects/routing/secure/usr.bin/openssl/man/genpkey.1
projects/routing/secure/usr.bin/openssl/man/genrsa.1
projects/routing/secure/usr.bin/openssl/man/nseq.1
projects/routing/secure/usr.bin/openssl/man/ocsp.1
projects/routing/secure/usr.bin/openssl/man/openssl.1
projects/routing/secure/usr.bin/openssl/man/passwd.1
projects/routing/secure/usr.bin/openssl/man/pkcs12.1
projects/routing/secure/usr.bin/openssl/man/pkcs7.1
projects/routing/secure/usr.bin/openssl/man/pkcs8.1
projects/routing/secure/usr.bin/openssl/man/pkey.1
projects/routing/secure/usr.bin/openssl/man/pkeyparam.1
projects/routing/secure/usr.bin/openssl/man/pkeyutl.1
projects/routing/secure/usr.bin/openssl/man/rand.1
projects/routing/secure/usr.bin/openssl/man/req.1
projects/routing/secure/usr.bin/openssl/man/rsa.1
projects/routing/secure/usr.bin/openssl/man/rsautl.1
projects/routing/secure/usr.bin/openssl/man/s_client.1
projects/routing/secure/usr.bin/openssl/man/s_server.1
projects/routing/secure/usr.bin/openssl/man/s_time.1
projects/routing/secure/usr.bin/openssl/man/sess_id.1
projects/routing/secure/usr.bin/openssl/man/smime.1
projects/routing/secure/usr.bin/openssl/man/speed.1
projects/routing/secure/usr.bin/openssl/man/spkac.1
projects/routing/secure/usr.bin/openssl/man/ts.1
projects/routing/secure/usr.bin/openssl/man/tsget.1
projects/routing/secure/usr.bin/openssl/man/verify.1
projects/routing/secure/usr.bin/openssl/man/version.1
projects/routing/secure/usr.bin/openssl/man/x509.1
projects/routing/secure/usr.bin/openssl/man/x509v3_config.1
projects/routing/share/mk/Makefile
projects/routing/sys/arm/conf/ATMEL
projects/routing/sys/boot/libstand32/Makefile
projects/routing/sys/dev/isp/isp_freebsd.c
projects/routing/sys/dev/isp/isp_freebsd.h
projects/routing/sys/dev/isp/ispvar.h
projects/routing/sys/dev/mii/truephy.c
projects/routing/sys/fs/msdosfs/msdosfs_conv.c
projects/routing/sys/fs/msdosfs/msdosfs_denode.c
projects/routing/sys/fs/msdosfs/msdosfs_fat.c
projects/routing/sys/fs/msdosfs/msdosfs_fileno.c
projects/routing/sys/fs/msdosfs/msdosfs_lookup.c
projects/routing/sys/fs/msdosfs/msdosfs_vnops.c
projects/routing/sys/i386/i386/elf_machdep.c
projects/routing/sys/kern/device_if.m
projects/routing/sys/kern/kern_cpuset.c
projects/routing/sys/kern/uipc_mbuf2.c
projects/routing/sys/net/if_arcsubr.c
projects/routing/sys/netinet/if_ether.c
projects/routing/sys/netinet6/nd6.c
projects/routing/sys/netinet6/nd6.h
projects/routing/sys/netinet6/nd6_nbr.c
projects/routing/sys/netpfil/pf/pf_if.c
projects/routing/sys/netpfil/pf/pf_norm.c
projects/routing/sys/ofed/include/net/ip.h
projects/routing/sys/sys/mbuf.h
projects/routing/sys/x86/iommu/intel_ctx.c
projects/routing/tools/tools/nanobsd/pcengines/common.conf
projects/routing/usr.bin/cpuset/cpuset.1
projects/routing/usr.sbin/autofs/auto_master.5
Directory Properties:
projects/routing/ (props changed)
projects/routing/cddl/ (props changed)
projects/routing/cddl/contrib/opensolaris/ (props changed)
projects/routing/contrib/compiler-rt/ (props changed)
projects/routing/crypto/openssl/ (props changed)
projects/routing/lib/libc/ (props changed)
projects/routing/share/ (props changed)
projects/routing/sys/ (props changed)
projects/routing/sys/boot/ (props changed)
projects/routing/sys/conf/ (props changed)
Modified: projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp,
int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *);
int mapping;
- if (ctdp->t_emark > ed->ed_clear_mark &&
+ if (ctdp->t_emark > ed->ed_clear_mark ||
mtdp->t_emark > ed->ed_clear_mark)
return (ctdp->t_emark == mtdp->t_emark);
Modified: projects/routing/contrib/compiler-rt/CREDITS.TXT
==============================================================================
--- projects/routing/contrib/compiler-rt/CREDITS.TXT Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/contrib/compiler-rt/CREDITS.TXT Sat Jan 10 16:55:28 2015 (r276912)
@@ -22,3 +22,15 @@ D: Maintain Solaris & AuroraUX ports of
N: Howard Hinnant
E: hhinnant at apple.com
D: Architect and primary author of compiler-rt
+
+N: Guan-Hong Liu
+E: koviankevin at hotmail.com
+D: IEEE Quad-precision functions
+
+N: Joerg Sonnenberger
+E: joerg at NetBSD.org
+D: Maintains NetBSD port.
+
+N: Matt Thomas
+E: matt at NetBSD.org
+D: ARM improvements.
Modified: projects/routing/contrib/compiler-rt/LICENSE.TXT
==============================================================================
--- projects/routing/contrib/compiler-rt/LICENSE.TXT Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/contrib/compiler-rt/LICENSE.TXT Sat Jan 10 16:55:28 2015 (r276912)
@@ -14,7 +14,7 @@ Full text of the relevant licenses is in
University of Illinois/NCSA
Open Source License
-Copyright (c) 2009-2013 by the contributors listed in CREDITS.TXT
+Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
All rights reserved.
@@ -55,7 +55,7 @@ SOFTWARE.
==============================================================================
-Copyright (c) 2009-2013 by the contributors listed in CREDITS.TXT
+Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -89,9 +89,3 @@ other licenses gives permission to use t
University of Illinois to endorse or promote products derived from this
Software.
-The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
-
-Program Directory
-------- ---------
-mach_override lib/interception/mach_override
Modified: projects/routing/contrib/compiler-rt/README.txt
==============================================================================
--- projects/routing/contrib/compiler-rt/README.txt Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/contrib/compiler-rt/README.txt Sat Jan 10 16:55:28 2015 (r276912)
@@ -9,335 +9,3 @@ terms of the license agreement found in
================================
-This is a replacement library for libgcc. Each function is contained
-in its own file. Each function has a corresponding unit test under
-test/Unit.
-
-A rudimentary script to test each file is in the file called
-test/Unit/test.
-
-Here is the specification for this library:
-
-http://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc
-
-Here is a synopsis of the contents of this library:
-
-typedef int si_int;
-typedef unsigned su_int;
-
-typedef long long di_int;
-typedef unsigned long long du_int;
-
-// Integral bit manipulation
-
-di_int __ashldi3(di_int a, si_int b); // a << b
-ti_int __ashlti3(ti_int a, si_int b); // a << b
-
-di_int __ashrdi3(di_int a, si_int b); // a >> b arithmetic (sign fill)
-ti_int __ashrti3(ti_int a, si_int b); // a >> b arithmetic (sign fill)
-di_int __lshrdi3(di_int a, si_int b); // a >> b logical (zero fill)
-ti_int __lshrti3(ti_int a, si_int b); // a >> b logical (zero fill)
-
-si_int __clzsi2(si_int a); // count leading zeros
-si_int __clzdi2(di_int a); // count leading zeros
-si_int __clzti2(ti_int a); // count leading zeros
-si_int __ctzsi2(si_int a); // count trailing zeros
-si_int __ctzdi2(di_int a); // count trailing zeros
-si_int __ctzti2(ti_int a); // count trailing zeros
-
-si_int __ffsdi2(di_int a); // find least significant 1 bit
-si_int __ffsti2(ti_int a); // find least significant 1 bit
-
-si_int __paritysi2(si_int a); // bit parity
-si_int __paritydi2(di_int a); // bit parity
-si_int __parityti2(ti_int a); // bit parity
-
-si_int __popcountsi2(si_int a); // bit population
-si_int __popcountdi2(di_int a); // bit population
-si_int __popcountti2(ti_int a); // bit population
-
-uint32_t __bswapsi2(uint32_t a); // a byteswapped, arm only
-uint64_t __bswapdi2(uint64_t a); // a byteswapped, arm only
-
-// Integral arithmetic
-
-di_int __negdi2 (di_int a); // -a
-ti_int __negti2 (ti_int a); // -a
-di_int __muldi3 (di_int a, di_int b); // a * b
-ti_int __multi3 (ti_int a, ti_int b); // a * b
-si_int __divsi3 (si_int a, si_int b); // a / b signed
-di_int __divdi3 (di_int a, di_int b); // a / b signed
-ti_int __divti3 (ti_int a, ti_int b); // a / b signed
-su_int __udivsi3 (su_int n, su_int d); // a / b unsigned
-du_int __udivdi3 (du_int a, du_int b); // a / b unsigned
-tu_int __udivti3 (tu_int a, tu_int b); // a / b unsigned
-si_int __modsi3 (si_int a, si_int b); // a % b signed
-di_int __moddi3 (di_int a, di_int b); // a % b signed
-ti_int __modti3 (ti_int a, ti_int b); // a % b signed
-su_int __umodsi3 (su_int a, su_int b); // a % b unsigned
-du_int __umoddi3 (du_int a, du_int b); // a % b unsigned
-tu_int __umodti3 (tu_int a, tu_int b); // a % b unsigned
-du_int __udivmoddi4(du_int a, du_int b, du_int* rem); // a / b, *rem = a % b unsigned
-tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem); // a / b, *rem = a % b unsigned
-su_int __udivmodsi4(su_int a, su_int b, su_int* rem); // a / b, *rem = a % b unsigned
-si_int __divmodsi4(si_int a, si_int b, si_int* rem); // a / b, *rem = a % b signed
-
-
-
-// Integral arithmetic with trapping overflow
-
-si_int __absvsi2(si_int a); // abs(a)
-di_int __absvdi2(di_int a); // abs(a)
-ti_int __absvti2(ti_int a); // abs(a)
-
-si_int __negvsi2(si_int a); // -a
-di_int __negvdi2(di_int a); // -a
-ti_int __negvti2(ti_int a); // -a
-
-si_int __addvsi3(si_int a, si_int b); // a + b
-di_int __addvdi3(di_int a, di_int b); // a + b
-ti_int __addvti3(ti_int a, ti_int b); // a + b
-
-si_int __subvsi3(si_int a, si_int b); // a - b
-di_int __subvdi3(di_int a, di_int b); // a - b
-ti_int __subvti3(ti_int a, ti_int b); // a - b
-
-si_int __mulvsi3(si_int a, si_int b); // a * b
-di_int __mulvdi3(di_int a, di_int b); // a * b
-ti_int __mulvti3(ti_int a, ti_int b); // a * b
-
-
-// Integral arithmetic which returns if overflow
-
-si_int __mulosi4(si_int a, si_int b, int* overflow); // a * b, overflow set to one if result not in signed range
-di_int __mulodi4(di_int a, di_int b, int* overflow); // a * b, overflow set to one if result not in signed range
-ti_int __muloti4(ti_int a, ti_int b, int* overflow); // a * b, overflow set to
- one if result not in signed range
-
-
-// Integral comparison: a < b -> 0
-// a == b -> 1
-// a > b -> 2
-
-si_int __cmpdi2 (di_int a, di_int b);
-si_int __cmpti2 (ti_int a, ti_int b);
-si_int __ucmpdi2(du_int a, du_int b);
-si_int __ucmpti2(tu_int a, tu_int b);
-
-// Integral / floating point conversion
-
-di_int __fixsfdi( float a);
-di_int __fixdfdi( double a);
-di_int __fixxfdi(long double a);
-
-ti_int __fixsfti( float a);
-ti_int __fixdfti( double a);
-ti_int __fixxfti(long double a);
-uint64_t __fixtfdi(long double input); // ppc only, doesn't match documentation
-
-su_int __fixunssfsi( float a);
-su_int __fixunsdfsi( double a);
-su_int __fixunsxfsi(long double a);
-
-du_int __fixunssfdi( float a);
-du_int __fixunsdfdi( double a);
-du_int __fixunsxfdi(long double a);
-
-tu_int __fixunssfti( float a);
-tu_int __fixunsdfti( double a);
-tu_int __fixunsxfti(long double a);
-uint64_t __fixunstfdi(long double input); // ppc only
-
-float __floatdisf(di_int a);
-double __floatdidf(di_int a);
-long double __floatdixf(di_int a);
-long double __floatditf(int64_t a); // ppc only
-
-float __floattisf(ti_int a);
-double __floattidf(ti_int a);
-long double __floattixf(ti_int a);
-
-float __floatundisf(du_int a);
-double __floatundidf(du_int a);
-long double __floatundixf(du_int a);
-long double __floatunditf(uint64_t a); // ppc only
-
-float __floatuntisf(tu_int a);
-double __floatuntidf(tu_int a);
-long double __floatuntixf(tu_int a);
-
-// Floating point raised to integer power
-
-float __powisf2( float a, si_int b); // a ^ b
-double __powidf2( double a, si_int b); // a ^ b
-long double __powixf2(long double a, si_int b); // a ^ b
-long double __powitf2(long double a, si_int b); // ppc only, a ^ b
-
-// Complex arithmetic
-
-// (a + ib) * (c + id)
-
- float _Complex __mulsc3( float a, float b, float c, float d);
- double _Complex __muldc3(double a, double b, double c, double d);
-long double _Complex __mulxc3(long double a, long double b,
- long double c, long double d);
-long double _Complex __multc3(long double a, long double b,
- long double c, long double d); // ppc only
-
-// (a + ib) / (c + id)
-
- float _Complex __divsc3( float a, float b, float c, float d);
- double _Complex __divdc3(double a, double b, double c, double d);
-long double _Complex __divxc3(long double a, long double b,
- long double c, long double d);
-long double _Complex __divtc3(long double a, long double b,
- long double c, long double d); // ppc only
-
-
-// Runtime support
-
-// __clear_cache() is used to tell process that new instructions have been
-// written to an address range. Necessary on processors that do not have
-// a unified instuction and data cache.
-void __clear_cache(void* start, void* end);
-
-// __enable_execute_stack() is used with nested functions when a trampoline
-// function is written onto the stack and that page range needs to be made
-// executable.
-void __enable_execute_stack(void* addr);
-
-// __gcc_personality_v0() is normally only called by the system unwinder.
-// C code (as opposed to C++) normally does not need a personality function
-// because there are no catch clauses or destructors to be run. But there
-// is a C language extension __attribute__((cleanup(func))) which marks local
-// variables as needing the cleanup function "func" to be run when the
-// variable goes out of scope. That includes when an exception is thrown,
-// so a personality handler is needed.
-_Unwind_Reason_Code __gcc_personality_v0(int version, _Unwind_Action actions,
- uint64_t exceptionClass, struct _Unwind_Exception* exceptionObject,
- _Unwind_Context_t context);
-
-// for use with some implementations of assert() in <assert.h>
-void __eprintf(const char* format, const char* assertion_expression,
- const char* line, const char* file);
-
-
-
-// Power PC specific functions
-
-// There is no C interface to the saveFP/restFP functions. They are helper
-// functions called by the prolog and epilog of functions that need to save
-// a number of non-volatile float point registers.
-saveFP
-restFP
-
-// PowerPC has a standard template for trampoline functions. This function
-// generates a custom trampoline function with the specific realFunc
-// and localsPtr values.
-void __trampoline_setup(uint32_t* trampOnStack, int trampSizeAllocated,
- const void* realFunc, void* localsPtr);
-
-// adds two 128-bit double-double precision values ( x + y )
-long double __gcc_qadd(long double x, long double y);
-
-// subtracts two 128-bit double-double precision values ( x - y )
-long double __gcc_qsub(long double x, long double y);
-
-// multiples two 128-bit double-double precision values ( x * y )
-long double __gcc_qmul(long double x, long double y);
-
-// divides two 128-bit double-double precision values ( x / y )
-long double __gcc_qdiv(long double a, long double b);
-
-
-// ARM specific functions
-
-// There is no C interface to the switch* functions. These helper functions
-// are only needed by Thumb1 code for efficient switch table generation.
-switch16
-switch32
-switch8
-switchu8
-
-// There is no C interface to the *_vfp_d8_d15_regs functions. There are
-// called in the prolog and epilog of Thumb1 functions. When the C++ ABI use
-// SJLJ for exceptions, each function with a catch clause or destuctors needs
-// to save and restore all registers in it prolog and epliog. But there is
-// no way to access vector and high float registers from thumb1 code, so the
-// compiler must add call outs to these helper functions in the prolog and
-// epilog.
-restore_vfp_d8_d15_regs
-save_vfp_d8_d15_regs
-
-
-// Note: long ago ARM processors did not have floating point hardware support.
-// Floating point was done in software and floating point parameters were
-// passed in integer registers. When hardware support was added for floating
-// point, new *vfp functions were added to do the same operations but with
-// floating point parameters in floating point registers.
-
-// Undocumented functions
-
-float __addsf3vfp(float a, float b); // Appears to return a + b
-double __adddf3vfp(double a, double b); // Appears to return a + b
-float __divsf3vfp(float a, float b); // Appears to return a / b
-double __divdf3vfp(double a, double b); // Appears to return a / b
-int __eqsf2vfp(float a, float b); // Appears to return one
- // iff a == b and neither is NaN.
-int __eqdf2vfp(double a, double b); // Appears to return one
- // iff a == b and neither is NaN.
-double __extendsfdf2vfp(float a); // Appears to convert from
- // float to double.
-int __fixdfsivfp(double a); // Appears to convert from
- // double to int.
-int __fixsfsivfp(float a); // Appears to convert from
- // float to int.
-unsigned int __fixunssfsivfp(float a); // Appears to convert from
- // float to unsigned int.
-unsigned int __fixunsdfsivfp(double a); // Appears to convert from
- // double to unsigned int.
-double __floatsidfvfp(int a); // Appears to convert from
- // int to double.
-float __floatsisfvfp(int a); // Appears to convert from
- // int to float.
-double __floatunssidfvfp(unsigned int a); // Appears to convert from
- // unisgned int to double.
-float __floatunssisfvfp(unsigned int a); // Appears to convert from
- // unisgned int to float.
-int __gedf2vfp(double a, double b); // Appears to return __gedf2
- // (a >= b)
-int __gesf2vfp(float a, float b); // Appears to return __gesf2
- // (a >= b)
-int __gtdf2vfp(double a, double b); // Appears to return __gtdf2
- // (a > b)
-int __gtsf2vfp(float a, float b); // Appears to return __gtsf2
- // (a > b)
-int __ledf2vfp(double a, double b); // Appears to return __ledf2
- // (a <= b)
-int __lesf2vfp(float a, float b); // Appears to return __lesf2
- // (a <= b)
-int __ltdf2vfp(double a, double b); // Appears to return __ltdf2
- // (a < b)
-int __ltsf2vfp(float a, float b); // Appears to return __ltsf2
- // (a < b)
-double __muldf3vfp(double a, double b); // Appears to return a * b
-float __mulsf3vfp(float a, float b); // Appears to return a * b
-int __nedf2vfp(double a, double b); // Appears to return __nedf2
- // (a != b)
-double __negdf2vfp(double a); // Appears to return -a
-float __negsf2vfp(float a); // Appears to return -a
-float __negsf2vfp(float a); // Appears to return -a
-double __subdf3vfp(double a, double b); // Appears to return a - b
-float __subsf3vfp(float a, float b); // Appears to return a - b
-float __truncdfsf2vfp(double a); // Appears to convert from
- // double to float.
-int __unorddf2vfp(double a, double b); // Appears to return __unorddf2
-int __unordsf2vfp(float a, float b); // Appears to return __unordsf2
-
-
-Preconditions are listed for each function at the definition when there are any.
-Any preconditions reflect the specification at
-http://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc.
-
-Assumptions are listed in "int_lib.h", and in individual files. Where possible
-assumptions are checked at compile time.
Modified: projects/routing/crypto/openssl/CHANGES
==============================================================================
--- projects/routing/crypto/openssl/CHANGES Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/CHANGES Sat Jan 10 16:55:28 2015 (r276912)
@@ -2,6 +2,136 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
+
+ *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
+ message can cause a segmentation fault in OpenSSL due to a NULL pointer
+ dereference. This could lead to a Denial Of Service attack. Thanks to
+ Markus Stenberg of Cisco Systems, Inc. for reporting this issue.
+ (CVE-2014-3571)
+ [Steve Henson]
+
+ *) Fix DTLS memory leak in dtls1_buffer_record. A memory leak can occur in the
+ dtls1_buffer_record function under certain conditions. In particular this
+ could occur if an attacker sent repeated DTLS records with the same
+ sequence number but for the next epoch. The memory leak could be exploited
+ by an attacker in a Denial of Service attack through memory exhaustion.
+ Thanks to Chris Mueller for reporting this issue.
+ (CVE-2015-0206)
+ [Matt Caswell]
+
+ *) Fix issue where no-ssl3 configuration sets method to NULL. When openssl is
+ built with the no-ssl3 option and a SSL v3 ClientHello is received the ssl
+ method would be set to NULL which could later result in a NULL pointer
+ dereference. Thanks to Frank Schmirler for reporting this issue.
+ (CVE-2014-3569)
+ [Kurt Roeckx]
+
+ *) Abort handshake if server key exchange message is omitted for ephemeral
+ ECDH ciphersuites.
+
+ Thanks to Karthikeyan Bhargavan of the PROSECCO team at INRIA for
+ reporting this issue.
+ (CVE-2014-3572)
+ [Steve Henson]
+
+ *) Remove non-export ephemeral RSA code on client and server. This code
+ violated the TLS standard by allowing the use of temporary RSA keys in
+ non-export ciphersuites and could be used by a server to effectively
+ downgrade the RSA key length used to a value smaller than the server
+ certificate. Thanks for Karthikeyan Bhargavan of the PROSECCO team at
+ INRIA or reporting this issue.
+ (CVE-2015-0204)
+ [Steve Henson]
+
+ *) Fixed issue where DH client certificates are accepted without verification.
+ An OpenSSL server will accept a DH certificate for client authentication
+ without the certificate verify message. This effectively allows a client to
+ authenticate without the use of a private key. This only affects servers
+ which trust a client certificate authority which issues certificates
+ containing DH keys: these are extremely rare and hardly ever encountered.
+ Thanks for Karthikeyan Bhargavan of the PROSECCO team at INRIA or reporting
+ this issue.
+ (CVE-2015-0205)
+ [Steve Henson]
+
+ *) Ensure that the session ID context of an SSL is updated when its
+ SSL_CTX is updated via SSL_set_SSL_CTX.
+
+ The session ID context is typically set from the parent SSL_CTX,
+ and can vary with the CTX.
+ [Adam Langley]
+
+ *) Fix various certificate fingerprint issues.
+
+ By using non-DER or invalid encodings outside the signed portion of a
+ certificate the fingerprint can be changed without breaking the signature.
+ Although no details of the signed portion of the certificate can be changed
+ this can cause problems with some applications: e.g. those using the
+ certificate fingerprint for blacklists.
+
+ 1. Reject signatures with non zero unused bits.
+
+ If the BIT STRING containing the signature has non zero unused bits reject
+ the signature. All current signature algorithms require zero unused bits.
+
+ 2. Check certificate algorithm consistency.
+
+ Check the AlgorithmIdentifier inside TBS matches the one in the
+ certificate signature. NB: this will result in signature failure
+ errors for some broken certificates.
+
+ Thanks to Konrad Kraszewski from Google for reporting this issue.
+
+ 3. Check DSA/ECDSA signatures use DER.
+
+ Reencode DSA/ECDSA signatures and compare with the original received
+ signature. Return an error if there is a mismatch.
+
+ This will reject various cases including garbage after signature
+ (thanks to Antti Karjalainen and Tuomo Untinen from the Codenomicon CROSS
+ program for discovering this case) and use of BER or invalid ASN.1 INTEGERs
+ (negative or with leading zeroes).
+
+ Further analysis was conducted and fixes were developed by Stephen Henson
+ of the OpenSSL core team.
+
+ (CVE-2014-8275)
+ [Steve Henson]
+
+ *) Correct Bignum squaring. Bignum squaring (BN_sqr) may produce incorrect
+ results on some platforms, including x86_64. This bug occurs at random
+ with a very low probability, and is not known to be exploitable in any
+ way, though its exact impact is difficult to determine. Thanks to Pieter
+ Wuille (Blockstream) who reported this issue and also suggested an initial
+ fix. Further analysis was conducted by the OpenSSL development team and
+ Adam Langley of Google. The final fix was developed by Andy Polyakov of
+ the OpenSSL core team.
+ (CVE-2014-3570)
+ [Andy Polyakov]
+
+ *) Do not resume sessions on the server if the negotiated protocol
+ version does not match the session's version. Resuming with a different
+ version, while not strictly forbidden by the RFC, is of questionable
+ sanity and breaks all known clients.
+ [David Benjamin, Emilia Käsper]
+
+ *) Tighten handling of the ChangeCipherSpec (CCS) message: reject
+ early CCS messages during renegotiation. (Note that because
+ renegotiation is encrypted, this early CCS was not exploitable.)
+ [Emilia Käsper]
+
+ *) Tighten client-side session ticket handling during renegotiation:
+ ensure that the client only accepts a session ticket if the server sends
+ the extension anew in the ServerHello. Previously, a TLS client would
+ reuse the old extension state and thus accept a session ticket if one was
+ announced in the initial ServerHello.
+
+ Similarly, ensure that the client requires a session ticket if one
+ was advertised in the ServerHello. Previously, a TLS client would
+ ignore a missing NewSessionTicket message.
+ [Emilia Käsper]
+
Changes between 1.0.1i and 1.0.1j [15 Oct 2014]
*) SRTP Memory Leak.
Modified: projects/routing/crypto/openssl/Configure
==============================================================================
--- projects/routing/crypto/openssl/Configure Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/Configure Sat Jan 10 16:55:28 2015 (r276912)
@@ -804,6 +804,11 @@ PROCESS_ARGS:
{
$disabled{"tls1"} = "option(tls)"
}
+ elsif ($1 eq "ssl3-method")
+ {
+ $disabled{"ssl3-method"} = "option(ssl)";
+ $disabled{"ssl3"} = "option(ssl)";
+ }
else
{
$disabled{$1} = "option";
Modified: projects/routing/crypto/openssl/Makefile
==============================================================================
--- projects/routing/crypto/openssl/Makefile Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/Makefile Sat Jan 10 16:55:28 2015 (r276912)
@@ -4,7 +4,7 @@
## Makefile for OpenSSL
##
-VERSION=1.0.1j
+VERSION=1.0.1k
MAJOR=1
MINOR=0.1
SHLIB_VERSION_NUMBER=1.0.0
Modified: projects/routing/crypto/openssl/NEWS
==============================================================================
--- projects/routing/crypto/openssl/NEWS Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/NEWS Sat Jan 10 16:55:28 2015 (r276912)
@@ -5,6 +5,17 @@
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.1j and OpenSSL 1.0.1k [8 Jan 2015]
+
+ o Fix for CVE-2014-3571
+ o Fix for CVE-2015-0206
+ o Fix for CVE-2014-3569
+ o Fix for CVE-2014-3572
+ o Fix for CVE-2015-0204
+ o Fix for CVE-2015-0205
+ o Fix for CVE-2014-8275
+ o Fix for CVE-2014-3570
+
Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014]
o Fix for CVE-2014-3513
Modified: projects/routing/crypto/openssl/README
==============================================================================
--- projects/routing/crypto/openssl/README Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/README Sat Jan 10 16:55:28 2015 (r276912)
@@ -1,5 +1,5 @@
- OpenSSL 1.0.1j 15 Oct 2014
+ OpenSSL 1.0.1k 8 Jan 2015
Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
Modified: projects/routing/crypto/openssl/apps/ca.c
==============================================================================
--- projects/routing/crypto/openssl/apps/ca.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/ca.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -703,7 +703,7 @@ bad:
ERR_clear_error();
#ifdef RL_DEBUG
if (!p)
- BIO_printf(bio_err, "DEBUG: unique_subject undefined\n", p);
+ BIO_printf(bio_err, "DEBUG: unique_subject undefined\n");
#endif
#ifdef RL_DEBUG
BIO_printf(bio_err, "DEBUG: configured unique_subject is %d\n",
Modified: projects/routing/crypto/openssl/apps/dgst.c
==============================================================================
--- projects/routing/crypto/openssl/apps/dgst.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/dgst.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -273,6 +273,8 @@ int MAIN(int argc, char **argv)
BIO_printf(bio_err,"-d to output debug info\n");
BIO_printf(bio_err,"-hex output as hex dump\n");
BIO_printf(bio_err,"-binary output in binary form\n");
+ BIO_printf(bio_err,"-hmac arg set the HMAC key to arg\n");
+ BIO_printf(bio_err,"-non-fips-allow allow use of non FIPS digest\n");
BIO_printf(bio_err,"-sign file sign digest using private key in file\n");
BIO_printf(bio_err,"-verify file verify a signature using public key in file\n");
BIO_printf(bio_err,"-prverify file verify a signature using private key in file\n");
Modified: projects/routing/crypto/openssl/apps/ocsp.c
==============================================================================
--- projects/routing/crypto/openssl/apps/ocsp.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/ocsp.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -583,51 +583,52 @@ int MAIN(int argc, char **argv)
BIO_printf (bio_err, "OCSP utility\n");
BIO_printf (bio_err, "Usage ocsp [options]\n");
BIO_printf (bio_err, "where options are\n");
- BIO_printf (bio_err, "-out file output filename\n");
- BIO_printf (bio_err, "-issuer file issuer certificate\n");
- BIO_printf (bio_err, "-cert file certificate to check\n");
- BIO_printf (bio_err, "-serial n serial number to check\n");
- BIO_printf (bio_err, "-signer file certificate to sign OCSP request with\n");
- BIO_printf (bio_err, "-signkey file private key to sign OCSP request with\n");
- BIO_printf (bio_err, "-sign_other file additional certificates to include in signed request\n");
- BIO_printf (bio_err, "-no_certs don't include any certificates in signed request\n");
- BIO_printf (bio_err, "-req_text print text form of request\n");
- BIO_printf (bio_err, "-resp_text print text form of response\n");
- BIO_printf (bio_err, "-text print text form of request and response\n");
- BIO_printf (bio_err, "-reqout file write DER encoded OCSP request to \"file\"\n");
- BIO_printf (bio_err, "-respout file write DER encoded OCSP reponse to \"file\"\n");
- BIO_printf (bio_err, "-reqin file read DER encoded OCSP request from \"file\"\n");
- BIO_printf (bio_err, "-respin file read DER encoded OCSP reponse from \"file\"\n");
- BIO_printf (bio_err, "-nonce add OCSP nonce to request\n");
- BIO_printf (bio_err, "-no_nonce don't add OCSP nonce to request\n");
- BIO_printf (bio_err, "-url URL OCSP responder URL\n");
- BIO_printf (bio_err, "-host host:n send OCSP request to host on port n\n");
- BIO_printf (bio_err, "-path path to use in OCSP request\n");
- BIO_printf (bio_err, "-CApath dir trusted certificates directory\n");
- BIO_printf (bio_err, "-CAfile file trusted certificates file\n");
- BIO_printf (bio_err, "-VAfile file validator certificates file\n");
- BIO_printf (bio_err, "-validity_period n maximum validity discrepancy in seconds\n");
- BIO_printf (bio_err, "-status_age n maximum status age in seconds\n");
- BIO_printf (bio_err, "-noverify don't verify response at all\n");
- BIO_printf (bio_err, "-verify_other file additional certificates to search for signer\n");
- BIO_printf (bio_err, "-trust_other don't verify additional certificates\n");
- BIO_printf (bio_err, "-no_intern don't search certificates contained in response for signer\n");
+ BIO_printf (bio_err, "-out file output filename\n");
+ BIO_printf (bio_err, "-issuer file issuer certificate\n");
+ BIO_printf (bio_err, "-cert file certificate to check\n");
+ BIO_printf (bio_err, "-serial n serial number to check\n");
+ BIO_printf (bio_err, "-signer file certificate to sign OCSP request with\n");
+ BIO_printf (bio_err, "-signkey file private key to sign OCSP request with\n");
+ BIO_printf (bio_err, "-sign_other file additional certificates to include in signed request\n");
+ BIO_printf (bio_err, "-no_certs don't include any certificates in signed request\n");
+ BIO_printf (bio_err, "-req_text print text form of request\n");
+ BIO_printf (bio_err, "-resp_text print text form of response\n");
+ BIO_printf (bio_err, "-text print text form of request and response\n");
+ BIO_printf (bio_err, "-reqout file write DER encoded OCSP request to \"file\"\n");
+ BIO_printf (bio_err, "-respout file write DER encoded OCSP reponse to \"file\"\n");
+ BIO_printf (bio_err, "-reqin file read DER encoded OCSP request from \"file\"\n");
+ BIO_printf (bio_err, "-respin file read DER encoded OCSP reponse from \"file\"\n");
+ BIO_printf (bio_err, "-nonce add OCSP nonce to request\n");
+ BIO_printf (bio_err, "-no_nonce don't add OCSP nonce to request\n");
+ BIO_printf (bio_err, "-url URL OCSP responder URL\n");
+ BIO_printf (bio_err, "-host host:n send OCSP request to host on port n\n");
+ BIO_printf (bio_err, "-path path to use in OCSP request\n");
+ BIO_printf (bio_err, "-CApath dir trusted certificates directory\n");
+ BIO_printf (bio_err, "-CAfile file trusted certificates file\n");
+ BIO_printf (bio_err, "-VAfile file validator certificates file\n");
+ BIO_printf (bio_err, "-validity_period n maximum validity discrepancy in seconds\n");
+ BIO_printf (bio_err, "-status_age n maximum status age in seconds\n");
+ BIO_printf (bio_err, "-noverify don't verify response at all\n");
+ BIO_printf (bio_err, "-verify_other file additional certificates to search for signer\n");
+ BIO_printf (bio_err, "-trust_other don't verify additional certificates\n");
+ BIO_printf (bio_err, "-no_intern don't search certificates contained in response for signer\n");
BIO_printf (bio_err, "-no_signature_verify don't check signature on response\n");
- BIO_printf (bio_err, "-no_cert_verify don't check signing certificate\n");
- BIO_printf (bio_err, "-no_chain don't chain verify response\n");
- BIO_printf (bio_err, "-no_cert_checks don't do additional checks on signing certificate\n");
- BIO_printf (bio_err, "-port num port to run responder on\n");
- BIO_printf (bio_err, "-index file certificate status index file\n");
- BIO_printf (bio_err, "-CA file CA certificate\n");
- BIO_printf (bio_err, "-rsigner file responder certificate to sign responses with\n");
- BIO_printf (bio_err, "-rkey file responder key to sign responses with\n");
- BIO_printf (bio_err, "-rother file other certificates to include in response\n");
- BIO_printf (bio_err, "-resp_no_certs don't include any certificates in response\n");
- BIO_printf (bio_err, "-nmin n number of minutes before next update\n");
- BIO_printf (bio_err, "-ndays n number of days before next update\n");
- BIO_printf (bio_err, "-resp_key_id identify reponse by signing certificate key ID\n");
- BIO_printf (bio_err, "-nrequest n number of requests to accept (default unlimited)\n");
- BIO_printf (bio_err, "-<dgst alg> use specified digest in the request\n");
+ BIO_printf (bio_err, "-no_cert_verify don't check signing certificate\n");
+ BIO_printf (bio_err, "-no_chain don't chain verify response\n");
+ BIO_printf (bio_err, "-no_cert_checks don't do additional checks on signing certificate\n");
+ BIO_printf (bio_err, "-port num port to run responder on\n");
+ BIO_printf (bio_err, "-index file certificate status index file\n");
+ BIO_printf (bio_err, "-CA file CA certificate\n");
+ BIO_printf (bio_err, "-rsigner file responder certificate to sign responses with\n");
+ BIO_printf (bio_err, "-rkey file responder key to sign responses with\n");
+ BIO_printf (bio_err, "-rother file other certificates to include in response\n");
+ BIO_printf (bio_err, "-resp_no_certs don't include any certificates in response\n");
+ BIO_printf (bio_err, "-nmin n number of minutes before next update\n");
+ BIO_printf (bio_err, "-ndays n number of days before next update\n");
+ BIO_printf (bio_err, "-resp_key_id identify reponse by signing certificate key ID\n");
+ BIO_printf (bio_err, "-nrequest n number of requests to accept (default unlimited)\n");
+ BIO_printf (bio_err, "-<dgst alg> use specified digest in the request\n");
+ BIO_printf (bio_err, "-timeout n timeout connection to OCSP responder after n seconds\n");
goto end;
}
@@ -1398,16 +1399,7 @@ OCSP_RESPONSE *process_responder(BIO *er
if (use_ssl == 1)
{
BIO *sbio;
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
ctx = SSL_CTX_new(SSLv23_client_method());
-#elif !defined(OPENSSL_NO_SSL3)
- ctx = SSL_CTX_new(SSLv3_client_method());
-#elif !defined(OPENSSL_NO_SSL2)
- ctx = SSL_CTX_new(SSLv2_client_method());
-#else
- BIO_printf(err, "SSL is disabled\n");
- goto end;
-#endif
if (ctx == NULL)
{
BIO_printf(err, "Error creating SSL context.\n");
Modified: projects/routing/crypto/openssl/apps/openssl.c
==============================================================================
--- projects/routing/crypto/openssl/apps/openssl.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/openssl.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -435,9 +435,7 @@ end:
if (prog != NULL) lh_FUNCTION_free(prog);
if (arg.data != NULL) OPENSSL_free(arg.data);
- apps_shutdown();
- CRYPTO_mem_leaks(bio_err);
if (bio_err != NULL)
{
BIO_free(bio_err);
@@ -450,6 +448,9 @@ end:
OPENSSL_free(Argv);
}
#endif
+ apps_shutdown();
+ CRYPTO_mem_leaks(bio_err);
+
OPENSSL_EXIT(ret);
}
Modified: projects/routing/crypto/openssl/apps/s_client.c
==============================================================================
--- projects/routing/crypto/openssl/apps/s_client.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/s_client.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -329,10 +329,12 @@ static void sc_usage(void)
BIO_printf(bio_err," -srppass arg - password for 'user'\n");
BIO_printf(bio_err," -srp_lateuser - SRP username into second ClientHello message\n");
BIO_printf(bio_err," -srp_moregroups - Tolerate other than the known g N values.\n");
- BIO_printf(bio_err," -srp_strength int - minimal mength in bits for N (default %d).\n",SRP_MINIMAL_N);
+ BIO_printf(bio_err," -srp_strength int - minimal length in bits for N (default %d).\n",SRP_MINIMAL_N);
#endif
BIO_printf(bio_err," -ssl2 - just use SSLv2\n");
+#ifndef OPENSSL_NO_SSL3_METHOD
BIO_printf(bio_err," -ssl3 - just use SSLv3\n");
+#endif
BIO_printf(bio_err," -tls1_2 - just use TLSv1.2\n");
BIO_printf(bio_err," -tls1_1 - just use TLSv1.1\n");
BIO_printf(bio_err," -tls1 - just use TLSv1\n");
@@ -807,7 +809,7 @@ int MAIN(int argc, char **argv)
else if (strcmp(*argv,"-ssl2") == 0)
meth=SSLv2_client_method();
#endif
-#ifndef OPENSSL_NO_SSL3
+#ifndef OPENSSL_NO_SSL3_METHOD
else if (strcmp(*argv,"-ssl3") == 0)
meth=SSLv3_client_method();
#endif
@@ -1319,10 +1321,22 @@ re_start:
BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_SEND_TIMEOUT, 0, &timeout);
}
- if (socket_mtu > 28)
+ if (socket_mtu)
{
+ if(socket_mtu < DTLS_get_link_min_mtu(con))
+ {
+ BIO_printf(bio_err,"MTU too small. Must be at least %ld\n",
+ DTLS_get_link_min_mtu(con));
+ BIO_free(sbio);
+ goto shut;
+ }
SSL_set_options(con, SSL_OP_NO_QUERY_MTU);
- SSL_set_mtu(con, socket_mtu - 28);
+ if(!DTLS_set_link_mtu(con, socket_mtu))
+ {
+ BIO_printf(bio_err, "Failed to set MTU\n");
+ BIO_free(sbio);
+ goto shut;
+ }
}
else
/* want to do MTU discovery */
Modified: projects/routing/crypto/openssl/apps/s_server.c
==============================================================================
--- projects/routing/crypto/openssl/apps/s_server.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/s_server.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -515,7 +515,9 @@ static void sv_usage(void)
BIO_printf(bio_err," -srpuserseed string - A seed string for a default user salt.\n");
#endif
BIO_printf(bio_err," -ssl2 - Just talk SSLv2\n");
+#ifndef OPENSSL_NO_SSL3_METHOD
BIO_printf(bio_err," -ssl3 - Just talk SSLv3\n");
+#endif
BIO_printf(bio_err," -tls1_2 - Just talk TLSv1.2\n");
BIO_printf(bio_err," -tls1_1 - Just talk TLSv1.1\n");
BIO_printf(bio_err," -tls1 - Just talk TLSv1\n");
@@ -1251,7 +1253,7 @@ int MAIN(int argc, char *argv[])
else if (strcmp(*argv,"-ssl2") == 0)
{ meth=SSLv2_server_method(); }
#endif
-#ifndef OPENSSL_NO_SSL3
+#ifndef OPENSSL_NO_SSL3_METHOD
else if (strcmp(*argv,"-ssl3") == 0)
{ meth=SSLv3_server_method(); }
#endif
@@ -2049,10 +2051,24 @@ static int sv_body(char *hostname, int s
BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_SEND_TIMEOUT, 0, &timeout);
}
- if (socket_mtu > 28)
+ if (socket_mtu)
{
+ if(socket_mtu < DTLS_get_link_min_mtu(con))
+ {
+ BIO_printf(bio_err,"MTU too small. Must be at least %ld\n",
+ DTLS_get_link_min_mtu(con));
+ ret = -1;
+ BIO_free(sbio);
+ goto err;
+ }
SSL_set_options(con, SSL_OP_NO_QUERY_MTU);
- SSL_set_mtu(con, socket_mtu - 28);
+ if(!DTLS_set_link_mtu(con, socket_mtu))
+ {
+ BIO_printf(bio_err, "Failed to set MTU\n");
+ ret = -1;
+ BIO_free(sbio);
+ goto err;
+ }
}
else
/* want to do MTU discovery */
Modified: projects/routing/crypto/openssl/apps/s_time.c
==============================================================================
--- projects/routing/crypto/openssl/apps/s_time.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/s_time.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -349,13 +349,7 @@ int MAIN(int argc, char **argv)
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
s_time_meth=SSLv23_client_method();
-#elif !defined(OPENSSL_NO_SSL3)
- s_time_meth=SSLv3_client_method();
-#elif !defined(OPENSSL_NO_SSL2)
- s_time_meth=SSLv2_client_method();
-#endif
/* parse the command line arguments */
if( parseArgs( argc, argv ) < 0 )
Modified: projects/routing/crypto/openssl/apps/speed.c
==============================================================================
--- projects/routing/crypto/openssl/apps/speed.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/apps/speed.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -225,7 +225,7 @@
#undef BUFSIZE
#define BUFSIZE ((long)1024*8+1)
-int run=0;
+static volatile int run=0;
static int mr=0;
static int usertime=1;
@@ -2739,27 +2739,6 @@ static int do_multi(int multi)
else
rsa_results[k][1]=d;
}
- else if(!strncmp(buf,"+F2:",4))
- {
- int k;
- double d;
-
- p=buf+4;
- k=atoi(sstrsep(&p,sep));
- sstrsep(&p,sep);
-
- d=atof(sstrsep(&p,sep));
- if(n)
- rsa_results[k][0]=1/(1/rsa_results[k][0]+1/d);
- else
- rsa_results[k][0]=d;
-
- d=atof(sstrsep(&p,sep));
- if(n)
- rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);
- else
- rsa_results[k][1]=d;
- }
#ifndef OPENSSL_NO_DSA
else if(!strncmp(buf,"+F3:",4))
{
Modified: projects/routing/crypto/openssl/crypto/Makefile
==============================================================================
--- projects/routing/crypto/openssl/crypto/Makefile Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/crypto/Makefile Sat Jan 10 16:55:28 2015 (r276912)
@@ -56,12 +56,7 @@ top:
all: shared
buildinf.h: ../Makefile
- ( echo "#ifndef MK1MF_BUILD"; \
- echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \
- echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \
- echo ' #define PLATFORM "$(PLATFORM)"'; \
- echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
- echo '#endif' ) >buildinf.h
+ $(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" >buildinf.h
x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl
$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
Modified: projects/routing/crypto/openssl/crypto/aes/asm/aes-mips.pl
==============================================================================
--- projects/routing/crypto/openssl/crypto/aes/asm/aes-mips.pl Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/crypto/aes/asm/aes-mips.pl Sat Jan 10 16:55:28 2015 (r276912)
@@ -70,7 +70,7 @@ $pf = ($flavour =~ /nubi/i) ? $t0 : $t2;
#
######################################################################
-$big_endian=(`echo MIPSEL | $ENV{CC} -E -P -`=~/MIPSEL/)?1:0;
+$big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC});
for (@ARGV) { $output=$_ if (/^\w[\w\-]*\.\w+$/); }
open STDOUT,">$output";
Modified: projects/routing/crypto/openssl/crypto/asn1/a_bitstr.c
==============================================================================
--- projects/routing/crypto/openssl/crypto/asn1/a_bitstr.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/crypto/asn1/a_bitstr.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -136,11 +136,16 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN
p= *pp;
i= *(p++);
+ if (i > 7)
+ {
+ i=ASN1_R_INVALID_BIT_STRING_BITS_LEFT;
+ goto err;
+ }
/* We do this to preserve the settings. If we modify
* the settings, via the _set_bit function, we will recalculate
* on output */
ret->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
- ret->flags|=(ASN1_STRING_FLAG_BITS_LEFT|(i&0x07)); /* set */
+ ret->flags|=(ASN1_STRING_FLAG_BITS_LEFT|i); /* set */
if (len-- > 1) /* using one because of the bits left byte */
{
Modified: projects/routing/crypto/openssl/crypto/asn1/a_type.c
==============================================================================
--- projects/routing/crypto/openssl/crypto/asn1/a_type.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/crypto/asn1/a_type.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -113,7 +113,7 @@ IMPLEMENT_STACK_OF(ASN1_TYPE)
IMPLEMENT_ASN1_SET_OF(ASN1_TYPE)
/* Returns 0 if they are equal, != 0 otherwise. */
-int ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b)
+int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
{
int result = -1;
Modified: projects/routing/crypto/openssl/crypto/asn1/a_verify.c
==============================================================================
--- projects/routing/crypto/openssl/crypto/asn1/a_verify.c Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/crypto/asn1/a_verify.c Sat Jan 10 16:55:28 2015 (r276912)
@@ -90,6 +90,12 @@ int ASN1_verify(i2d_of_void *i2d, X509_A
ASN1err(ASN1_F_ASN1_VERIFY,ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM);
goto err;
}
+
+ if (signature->type == V_ASN1_BIT_STRING && signature->flags & 0x7)
+ {
+ ASN1err(ASN1_F_ASN1_VERIFY, ASN1_R_INVALID_BIT_STRING_BITS_LEFT);
+ goto err;
+ }
inl=i2d(data,NULL);
buf_in=OPENSSL_malloc((unsigned int)inl);
@@ -146,6 +152,12 @@ int ASN1_item_verify(const ASN1_ITEM *it
return -1;
}
+ if (signature->type == V_ASN1_BIT_STRING && signature->flags & 0x7)
+ {
+ ASN1err(ASN1_F_ASN1_ITEM_VERIFY, ASN1_R_INVALID_BIT_STRING_BITS_LEFT);
+ return -1;
+ }
+
EVP_MD_CTX_init(&ctx);
/* Convert signature OID into digest and public key OIDs */
Modified: projects/routing/crypto/openssl/crypto/asn1/asn1.h
==============================================================================
--- projects/routing/crypto/openssl/crypto/asn1/asn1.h Sat Jan 10 13:56:26 2015 (r276911)
+++ projects/routing/crypto/openssl/crypto/asn1/asn1.h Sat Jan 10 16:55:28 2015 (r276912)
@@ -776,7 +776,7 @@ DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE,
int ASN1_TYPE_get(ASN1_TYPE *a);
void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
-int ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b);
+int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
ASN1_OBJECT * ASN1_OBJECT_new(void );
void ASN1_OBJECT_free(ASN1_OBJECT *a);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list