PERFORCE change 176430 for review
Alexander Motin
mav at FreeBSD.org
Thu Apr 1 22:22:10 UTC 2010
http://p4web.freebsd.org/chv.cgi?CH=176430
Change 176430 by mav at mav_mavbook on 2010/04/01 22:21:21
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/bin/pax/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/bin/pax/cpio.1#2 delete
.. //depot/projects/scottl-camlock/src/bin/pax/getoldopt.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/pax/tar.1#2 delete
.. //depot/projects/scottl-camlock/src/contrib/top/utils.h#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/CHANGES#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/FAQ#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/NEWS#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/README#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/apps/req.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/apps/speed.c#5 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/config#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/asn1/a_object.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bio/bss_file.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/ppc.pl#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/bn_div.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_all.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_cryptodev.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/digest.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/evp_locl.h#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/names.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/md32_common.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/opensslv.h#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/crypto/rand/rand_win.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_capi.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_chil.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/fips/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/openssl.spec#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/kssl.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_pkt.c#5 integrate
.. //depot/projects/scottl-camlock/src/etc/inetd.conf#4 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/Notes#2 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#11 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#9 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes.sp.ok#4 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/limerick#3 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/startrek#3 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/zippy#3 integrate
.. //depot/projects/scottl-camlock/src/include/inttypes.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/__getosreldate.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_spinlock_stub.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_thread_init.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/assert.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/ChangeLog#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/README#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/crc32.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzguts.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzlib.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzread.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/minigzip.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zconf.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.h#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/fingerd/fingerd.8#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/fingerd/fingerd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/multipath/geom_multipath.c#5 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/Makefile.inc#5 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_STRING_length.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_STRING_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ASN1_generate_nconf.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_ctrl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_base64.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_buffer.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_cipher.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_md.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_null.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_f_ssl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_find_type.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_push.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_read.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_accept.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_bio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_connect.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_fd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_mem.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_null.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_s_socket.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_set_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BIO_should_retry.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_BLINDING_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_CTX_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_CTX_start.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_add.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_add_word.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_bn2bin.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_cmp.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_copy.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_generate_prime.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_mod_inverse.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_num_bytes.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_rand.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_set_bit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_swap.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/BN_zero.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/CONF_modules_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/CONF_modules_load_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_generate_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_generate_parameters.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_set_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DH_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_SIG_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_do_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_dup_DH.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_generate_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_generate_parameters.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_set_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/DSA_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_GET_LIB.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_clear_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_error_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_get_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_load_strings.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_print_errors.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_put_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_remove_state.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ERR_set_mark.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_BytesToKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_DigestInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_EncryptInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_OpenInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_PKEY_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_SealInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_SignInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/EVP_VerifyInit.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OBJ_nid2obj.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_Applink.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_config.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS12_create.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS12_parse.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_decrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_encrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/PKCS7_verify.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_add.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_bytes.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_cleanup.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_egd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_load_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RAND_set_rand_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_blinding_on.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_check_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_generate_key.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_print.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_private_encrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_public_encrypt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_set_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_sign.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/RSA_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_NAME_print_ex.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/X509_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/bio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/blowfish.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/bn.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/bn_internal.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/buffer.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/crypto.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_DHparams.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_CRL.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_NAME.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_REQ.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/d2i_X509_SIG.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/des.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/dh.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/dsa.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ecdsa.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/engine.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/err.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/evp.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/hmac.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/lh_stats.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/lhash.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/md5.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/mdc2.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/pem.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/rand.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/rc4.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ripemd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/rsa.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/sha.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/threads.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ui.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/ui_compat.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/man/x509.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CIPHER_get_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_add_session.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_ctrl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sess_number.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_sessions.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_mode.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_options.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_timeout.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_set_verify.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_CTX_use_certificate.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_SESSION_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_SESSION_get_time.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_accept.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_alert_type_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_clear.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_connect.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_do_handshake.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_free.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_SSL_CTX.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_ciphers.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_client_CA_list.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_current_cipher.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_default_timeout.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_error.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_ex_new_index.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_fd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_peer_certificate.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_rbio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_session.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_verify_result.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_get_version.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_library_init.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_load_client_CA_file.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_new.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_pending.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_read.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_rstate_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_session_reused.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_bio.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_connect_state.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_fd.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_session.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_shutdown.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_set_verify_result.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_shutdown.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_state_string.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_want.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/SSL_write.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/d2i_SSL_SESSION.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssl/man/ssl.3#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/CA.pl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/asn1parse.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ca.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ciphers.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/crl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/crl2pkcs7.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dgst.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dhparam.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/dsaparam.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ec.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ecparam.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/enc.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/errstr.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/gendsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/genrsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/nseq.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/ocsp.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/openssl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/passwd.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/pkcs12.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/pkcs7.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/pkcs8.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/rand.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/req.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/rsa.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/rsautl.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/s_client.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/s_server.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/s_time.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/sess_id.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/smime.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/speed.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/spkac.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/verify.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/version.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/x509.1#4 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/openssl/man/x509v3_config.1#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/build.7#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_crypto.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_node.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_output.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_scan.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/reg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#15 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#154 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#54 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#69 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#31 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82571.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_defines.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_hw.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_manage.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_regs.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/spicds.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/spicds.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvidctl.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonsubs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsrvstate.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_vfs.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/apic_vector.s#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#5 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#48 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/alq/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/em/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_deflate.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ksocket.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_l2tp.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_mppc.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pptpgre.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_tcpmss.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/fhc/fhc.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/apb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ioccom.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vtoc.h#3 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/common#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.h#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.australia#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#10 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/dates.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/day.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/events.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/io.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/locale.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/parsedata.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pathnames.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pom.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/sunpos.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/args.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/indent.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/indent.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/indent_globs.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/lexi.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sed/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sed/sed.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sockstat/sockstat.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/config.y#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/lang.l#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkmakefile.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkoptions.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mailwrapper/mailwrapper.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mailwrapper/mailwrapper.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtree/mtree.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/futil.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/perform.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/perform.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/file.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#7 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/match.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/pen.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/url.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/perform.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/vidcontrol.c#3 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/bin/pax/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/pax/Makefile,v 1.14 2010/02/07 17:05:22 imp Exp $
+# $FreeBSD: src/bin/pax/Makefile,v 1.15 2010/03/30 23:10:56 delphij Exp $
# To install on versions prior to BSD 4.4 the following may have to be
# defined with CFLAGS +=
@@ -29,8 +29,5 @@
SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
tables.c tar.c tty_subs.c
-#XXX NOTYET
-#MAN= pax.1 tar.1 cpio.1
-#LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
.include <bsd.prog.mk>
==== //depot/projects/scottl-camlock/src/bin/pax/getoldopt.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $ */
+/* $OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $ */
/*-
@@ -7,11 +7,11 @@
* otherwise, it uses the old rules used by tar, dump, and ps.
*
* Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.5 2005/01/10 08:39:24 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.6 2010/03/30 23:14:35 delphij Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -33,7 +33,8 @@
optarg = NULL;
if (key == NULL) { /* First time */
- if (argc < 2) return EOF;
+ if (argc < 2)
+ return (-1);
key = argv[1];
if (*key == '-')
use_getopt++;
@@ -42,18 +43,18 @@
}
if (use_getopt)
- return getopt(argc, argv, optstring);
+ return (getopt(argc, argv, optstring));
c = *key++;
if (c == '\0') {
key--;
- return EOF;
+ return (-1);
}
place = strchr(optstring, c);
if (place == NULL || c == ':') {
fprintf(stderr, "%s: unknown option %c\n", argv[0], c);
- return('?');
+ return ('?');
}
place++;
@@ -64,9 +65,9 @@
} else {
fprintf(stderr, "%s: %c argument missing\n",
argv[0], c);
- return('?');
+ return ('?');
}
}
- return(c);
+ return (c);
}
==== //depot/projects/scottl-camlock/src/contrib/top/utils.h#2 (text+ko) ====
@@ -21,4 +21,4 @@
char *errmsg();
char *format_time();
char *format_k();
-char *format_k2();
+char *format_k2(unsigned long long);
==== //depot/projects/scottl-camlock/src/crypto/openssl/CHANGES#4 (text+ko) ====
@@ -2,6 +2,21 @@
OpenSSL CHANGES
_______________
+ Changes between 0.9.8m and 0.9.8n [24 Mar 2010]
+
+ *) When rejecting SSL/TLS records due to an incorrect version number, never
+ update s->server with a new major version number. As of
+ - OpenSSL 0.9.8m if 'short' is a 16-bit type,
+ - OpenSSL 0.9.8f if 'short' is longer than 16 bits,
+ the previous behavior could result in a read attempt at NULL when
+ receiving specific incorrect SSL/TLS records once record payload
+ protection is active. (CVE-2010-0740)
+ [Bodo Moeller, Adam Langley <agl at chromium.org>]
+
+ *) Fix for CVE-2010-0433 where some kerberos enabled versions of OpenSSL
+ could be crashed if the relevant tables were not present (e.g. chrooted).
+ [Tomas Hoger <thoger at redhat.com>]
+
Changes between 0.9.8l and 0.9.8m [25 Feb 2010]
*) Always check bn_wexpend() return values for failure. (CVE-2009-3245)
==== //depot/projects/scottl-camlock/src/crypto/openssl/FAQ#4 (text+ko) ====
@@ -78,7 +78,7 @@
* Which is the current version of OpenSSL?
The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.8m was released on Feb 25th, 2010.
+OpenSSL 0.9.8n was released on Mar 24th, 2010.
In addition to the current stable release, you can also access daily
snapshots of the OpenSSL development version at <URL:
==== //depot/projects/scottl-camlock/src/crypto/openssl/Makefile#4 (text+ko) ====
@@ -4,7 +4,7 @@
## Makefile for OpenSSL
##
-VERSION=0.9.8m
+VERSION=0.9.8n
MAJOR=0
MINOR=9.8
SHLIB_VERSION_NUMBER=0.9.8
==== //depot/projects/scottl-camlock/src/crypto/openssl/NEWS#4 (text+ko) ====
@@ -5,6 +5,11 @@
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 0.9.8m and OpenSSL 0.9.8n:
+
+ o CFB cipher definition fixes.
+ o Fix security issues CVE-2010-0740 and CVE-2010-0433.
+
Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m:
o Cipher definition fixes.
==== //depot/projects/scottl-camlock/src/crypto/openssl/README#4 (text+ko) ====
@@ -1,5 +1,5 @@
- OpenSSL 0.9.8m
+ OpenSSL 0.9.8n
Copyright (c) 1998-2009 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
==== //depot/projects/scottl-camlock/src/crypto/openssl/apps/req.c#4 (text+ko) ====
@@ -1433,11 +1433,17 @@
BIO_snprintf(buf,sizeof buf,"%s_min",type);
if (!NCONF_get_number(req_conf,attr_sect,buf, &n_min))
+ {
+ ERR_clear_error();
n_min = -1;
+ }
BIO_snprintf(buf,sizeof buf,"%s_max",type);
if (!NCONF_get_number(req_conf,attr_sect,buf, &n_max))
+ {
+ ERR_clear_error();
n_max = -1;
+ }
if (!add_attribute_object(req,
v->value,def,value,nid,n_min,n_max, chtype))
==== //depot/projects/scottl-camlock/src/crypto/openssl/apps/speed.c#5 (text+ko) ====
@@ -254,12 +254,18 @@
# endif
#endif
-#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
-# define NO_FORK 1
-#elif HAVE_FORK
+#ifndef HAVE_FORK
+# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
+# define HAVE_FORK 0
+# else
+# define HAVE_FORK 1
+# endif
+#endif
+
+#if HAVE_FORK
# undef NO_FORK
#else
-# define NO_FORK 1
+# define NO_FORK
#endif
#undef BUFSIZE
==== //depot/projects/scottl-camlock/src/crypto/openssl/config#4 (text+ko) ====
@@ -741,6 +741,10 @@
OBJECT_MODE=${OBJECT_MODE:-32}
if [ "$CC" = "gcc" ]; then
OUT="aix-gcc"
+ if [ $OBJECT_MODE -eq 64 ]; then
+ echo 'Your $OBJECT_MODE was found to be set to 64'
+ OUT="aix64-gcc"
+ fi
elif [ $OBJECT_MODE -eq 64 ]; then
echo 'Your $OBJECT_MODE was found to be set to 64'
OUT="aix64-cc"
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/asn1/a_object.c#4 (text+ko) ====
@@ -291,12 +291,12 @@
ASN1_OBJECT *ret=NULL;
const unsigned char *p;
int i;
- /* Sanity check OID encoding: can't have 0x80 in subidentifiers, see:
- * X.690 8.19.2
+ /* Sanity check OID encoding: can't have leading 0x80 in
+ * subidentifiers, see: X.690 8.19.2
*/
for (i = 0, p = *pp + 1; i < len - 1; i++, p++)
{
- if (*p == 0x80)
+ if (*p == 0x80 && (!i || !(p[-1] & 0x80)))
{
ASN1err(ASN1_F_C2I_ASN1_OBJECT,ASN1_R_INVALID_OBJECT_ENCODING);
return NULL;
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bio/bss_file.c#4 (text+ko) ====
@@ -272,9 +272,9 @@
BIO_clear_flags(b,BIO_FLAGS_UPLINK);
#endif
#endif
-#ifdef UP_fsetmode
+#ifdef UP_fsetmod
if (b->flags&BIO_FLAGS_UPLINK)
- UP_fsetmode(b->ptr,num&BIO_FP_TEXT?'t':'b');
+ UP_fsetmod(b->ptr,(char)((num&BIO_FP_TEXT)?'t':'b'));
else
#endif
{
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/ppc.pl#2 (text+ko) ====
@@ -2074,5 +2074,7 @@
$data =~ s/^(\s*)cmplw(\s+)([^,]+),(.*)/$1cmpl$2$3,0,$4/gm;
# assembler X doesn't accept li, load immediate value
#$data =~ s/^(\s*)li(\s+)([^,]+),(.*)/$1addi$2$3,0,$4/gm;
+ # assembler Y chokes on apostrophes in comments
+ $data =~ s/'//gm;
return($data);
}
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 (text+ko) ====
@@ -59,6 +59,7 @@
#undef mul
#undef mul_add
+#undef sqr
/*
* "m"(a), "+m"(r) is the way to favor DirectPath µ-code;
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/bn/bn_div.c#4 (text+ko) ====
@@ -337,7 +337,10 @@
t2 -= d1;
}
#else /* !BN_LLONG */
- BN_ULONG t2l,t2h,ql,qh;
+ BN_ULONG t2l,t2h;
+#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
+ BN_ULONG ql,qh;
+#endif
q=bn_div_words(n0,n1,d0);
#ifdef BN_DEBUG_LEVITTE
@@ -561,7 +564,10 @@
t2 -= d1;
}
#else /* !BN_LLONG */
- BN_ULONG t2l,t2h,ql,qh;
+ BN_ULONG t2l,t2h;
+#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
+ BN_ULONG ql,qh;
+#endif
q=bn_div_words(n0,n1,d0);
#ifdef BN_DEBUG_LEVITTE
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_all.c#3 (text+ko) ====
@@ -104,7 +104,7 @@
#endif
#endif
#ifndef OPENSSL_NO_HW
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
ENGINE_load_cryptodev();
#endif
#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/engine/eng_cryptodev.c#4 (text+ko) ====
@@ -755,10 +755,18 @@
goto err;
kop.crk_iparams = 3;
- if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL) == -1) {
+ if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL)) {
+ const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+ printf("OCF asym process failed, Running in software\n");
+ ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
+
+ } else if (ECANCELED == kop.crk_status) {
const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+ printf("OCF hardware operation cancelled. Running in Software\n");
ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
}
+ /* else cryptodev operation worked ok ==> ret = 1*/
+
err:
zapparams(&kop);
return (ret);
@@ -801,10 +809,18 @@
goto err;
kop.crk_iparams = 6;
- if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL) == -1) {
+ if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL)) {
+ const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+ printf("OCF asym process failed, running in Software\n");
+ ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
+
+ } else if (ECANCELED == kop.crk_status) {
const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+ printf("OCF hardware operation cancelled. Running in Software\n");
ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
}
+ /* else cryptodev operation worked ok ==> ret = 1*/
+
err:
zapparams(&kop);
return (ret);
@@ -940,7 +956,8 @@
kop.crk_iparams = 7;
if (cryptodev_asym(&kop, 0, NULL, 0, NULL) == 0) {
- dsaret = kop.crk_status;
+/*OCF success value is 0, if not zero, change dsaret to fail*/
+ if(0 != kop.crk_status) dsaret = 0;
} else {
const DSA_METHOD *meth = DSA_OpenSSL();
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/digest.c#4 (text+ko) ====
@@ -235,6 +235,7 @@
{
/* Same comment from evp_enc.c */
EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_INITIALIZATION_ERROR);
+ ENGINE_finish(impl);
return 0;
}
/* We'll use the ENGINE's private digest definition */
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/evp_locl.h#4 (text+ko) ====
@@ -127,9 +127,9 @@
#define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \
iv_len, cbits, flags, init_key, cleanup, \
set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \
- (cbits + 7)/8, key_len, iv_len, \
- flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
+BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
+ key_len, iv_len, flags, init_key, cleanup, set_asn1, \
+ get_asn1, ctrl)
#define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \
iv_len, cbits, flags, init_key, cleanup, \
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/evp/names.c#3 (text+ko) ====
@@ -90,7 +90,7 @@
r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md);
if (r == 0) return(0);
- if (md->type != md->pkey_type)
+ if (md->pkey_type && md->type != md->pkey_type)
{
r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/md32_common.h#3 (text+ko) ====
@@ -241,11 +241,11 @@
#ifndef PEDANTIC
# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
# if defined(__s390x__)
-# define HOST_c2l(c,l) ({ asm ("lrv %0,0(%1)" \
- :"=r"(l) : "r"(c)); \
+# define HOST_c2l(c,l) ({ asm ("lrv %0,%1" \
+ :"=d"(l) :"m"(*(const unsigned int *)(c));\
(c)+=4; (l); })
-# define HOST_l2c(l,c) ({ asm ("strv %0,0(%1)" \
- : : "r"(l),"r"(c) : "memory"); \
+# define HOST_l2c(l,c) ({ asm ("strv %1,%0" \
+ :"=m"(*(unsigned int *)(c)) :"d"(l));\
(c)+=4; (l); })
# endif
# endif
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#3 (text+ko) ====
@@ -275,6 +275,7 @@
}
if (!X509V3_extensions_print(bp, "Response Extensions",
rd->responseExtensions, flags, 4))
+ goto err;
if(X509_signature_print(bp, br->signatureAlgorithm, br->signature) <= 0)
goto err;
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/opensslv.h#4 (text+ko) ====
@@ -25,11 +25,11 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-#define OPENSSL_VERSION_NUMBER 0x009080dfL
+#define OPENSSL_VERSION_NUMBER 0x009080efL
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8m-fips 25 Feb 2010"
+#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8n-fips 24 Mar 2010"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8m 25 Feb 2010"
+#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8n 24 Mar 2010"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
==== //depot/projects/scottl-camlock/src/crypto/openssl/crypto/rand/rand_win.c#3 (text+ko) ====
@@ -750,7 +750,7 @@
int y; /* y-coordinate of screen lines to grab */
int n = 16; /* number of screen lines to grab at a time */
- if (GetVersion() >= 0x80000000 || !OPENSSL_isservice())
+ if (GetVersion() < 0x80000000 && OPENSSL_isservice()>0)
return;
/* Create a screen DC and a memory DC compatible to screen DC */
==== //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_capi.c#3 (text+ko) ====
@@ -83,6 +83,10 @@
#define CERT_STORE_CREATE_NEW_FLAG 0x00002000
#endif
+#ifndef CERT_SYSTEM_STORE_CURRENT_USER
+#define CERT_SYSTEM_STORE_CURRENT_USER 0x00010000
+#endif
+
#include <openssl/engine.h>
#include <openssl/pem.h>
#include <openssl/x509v3.h>
==== //depot/projects/scottl-camlock/src/crypto/openssl/engines/e_chil.c#3 (text+ko) ====
@@ -1204,6 +1204,11 @@
pem_password_cb *callback = NULL;
void *callback_data = NULL;
UI_METHOD *ui_method = NULL;
+ /* Despite what the documentation says prompt_info can be
+ * an empty string.
+ */
+ if (prompt_info && !*prompt_info)
+ prompt_info = NULL;
if (cactx)
{
@@ -1305,8 +1310,10 @@
{
char answer;
char buf[BUFSIZ];
-
- if (wrong_info)
+ /* Despite what the documentation says wrong_info can be
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list