Date: Fri, 3 Oct 2003 22:22:28 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 39125 for review Message-ID: <200310040522.h945MSqT052502@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=39125 Change 39125 by marcel@marcel_nfs on 2003/10/03 22:21:57 IFC @39124 Affected files ... .. //depot/projects/ia64/UPDATING#56 integrate .. //depot/projects/ia64/crypto/openssl/CHANGES#6 integrate .. //depot/projects/ia64/crypto/openssl/Configure#6 integrate .. //depot/projects/ia64/crypto/openssl/FAQ#6 integrate .. //depot/projects/ia64/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/crypto/openssl/LICENSE#3 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.org#6 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.ssl#6 integrate .. //depot/projects/ia64/crypto/openssl/NEWS#6 integrate .. //depot/projects/ia64/crypto/openssl/PROBLEMS#4 integrate .. //depot/projects/ia64/crypto/openssl/README#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/apps.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/ca.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/crl.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/engine.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/openssl.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/pkcs8.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_apps.h#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_client.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_server.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/smime.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/x509.c#5 integrate .. //depot/projects/ia64/crypto/openssl/bugs/SSLv3#2 integrate .. //depot/projects/ia64/crypto/openssl/config#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_strnid.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bf_buff.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_bio.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_mul.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/exptest.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/cfb_enc.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/destest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dh_key.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dhtest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_ossl.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_sign.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_vrf.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsatest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dso/dso_dlfcn.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ec/ec_mult.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/engine.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/hw_ubsec.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/err.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/err.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/bio_b64.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/bio_enc.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/c_all.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/digest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_acnf.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md2/md2test.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/asm/md5-586.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/o_time.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_ht.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslv.h#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/perlasm/x86ms.pl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/perlasm/x86nasm.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/perlasm/x86unix.pl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs12/p12_npas.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_doit.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pkcs7.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_win.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_eay.c#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_lib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_test.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/threads/mttest.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/threads/solaris.sh#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/x509/by_file.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_trs.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_conf.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_lib.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_prn.c#3 integrate .. //depot/projects/ia64/crypto/openssl/demos/engines/zencod/hw_zencod.h#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/HOWTO/certificates.txt#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/HOWTO/keys.txt#1 branch .. //depot/projects/ia64/crypto/openssl/doc/apps/ca.pod#5 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/ocsp.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/s_server.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/BIO_f_cipher.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/openssl-shared.txt#1 branch .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_free.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#5 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_accept.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_connect.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/e_os.h#5 integrate .. //depot/projects/ia64/crypto/openssl/openssl.spec#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_srvr.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_lib.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_rsa.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssltest.c#5 integrate .. //depot/projects/ia64/crypto/openssl/test/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/test/evptests.txt#1 branch .. //depot/projects/ia64/crypto/openssl/tools/c_rehash#4 integrate .. //depot/projects/ia64/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/util/libeay.num#6 integrate .. //depot/projects/ia64/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/util/mkerr.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/ia64/crypto/openssl/util/pl/Mingw32f.pl#2 delete .. //depot/projects/ia64/crypto/openssl/util/point.sh#3 integrate .. //depot/projects/ia64/etc/Makefile#36 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#43 integrate .. //depot/projects/ia64/etc/rc.d/diskless#9 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#12 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#19 integrate .. //depot/projects/ia64/lib/libc/stdlib/qsort.3#5 integrate .. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/context.S#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_attr_get_np.3#3 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_mutex_init.3#2 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.c#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#128 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#29 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#21 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#16 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#27 integrate .. //depot/projects/ia64/share/examples/drivers/make_device_driver.sh#4 integrate .. //depot/projects/ia64/share/examples/netgraph/ngctl#2 integrate .. //depot/projects/ia64/share/examples/netgraph/udp.tunnel#2 integrate .. //depot/projects/ia64/share/man/man9/Makefile#33 integrate .. //depot/projects/ia64/share/man/man9/pmap.9#2 integrate .. //depot/projects/ia64/share/man/man9/pmap_is_prefaultable.9#1 branch .. //depot/projects/ia64/share/man/man9/pmap_prefault.9#2 delete .. //depot/projects/ia64/share/man/man9/timeout.9#2 integrate .. //depot/projects/ia64/share/man/man9/vm_fault_prefault.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_check_protection.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_clean.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_create.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_delete.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_find.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_findspace.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_inherit.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_init.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_insert.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_lock.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_lookup.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_madvise.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_max.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_protect.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_remove.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_simplify_entry.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_stack.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_submap.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_wire.9#1 branch .. //depot/projects/ia64/share/mk/sys.mk#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#44 integrate .. //depot/projects/ia64/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/ia64/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/ia64/sys/amd64/include/clock.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/ucontext.h#4 integrate .. //depot/projects/ia64/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#21 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#12 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#6 integrate .. //depot/projects/ia64/sys/conf/files#104 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#27 integrate .. //depot/projects/ia64/sys/conf/ldscript.i386#4 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#11 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#37 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#13 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#22 integrate .. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#9 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#20 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#35 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#12 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#19 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#43 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.h#1 branch .. //depot/projects/ia64/sys/dev/usb/ugen.c#19 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#16 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_dbregs.c#8 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_fpregs.c#8 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_regs.c#8 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/locore.s#14 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#46 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#30 integrate .. //depot/projects/ia64/sys/i386/i386/mpboot.s#3 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#67 integrate .. //depot/projects/ia64/sys/i386/i386/support.s#11 integrate .. //depot/projects/ia64/sys/i386/i386/swtch.s#12 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#16 integrate .. //depot/projects/ia64/sys/i386/include/pcb.h#9 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#15 integrate .. //depot/projects/ia64/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#96 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#78 integrate .. //depot/projects/ia64/sys/ia64/ia64/syscall.S#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#37 integrate .. //depot/projects/ia64/sys/kern/init_main.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#64 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#45 integrate .. //depot/projects/ia64/sys/modules/firewire/sbp/Makefile#3 integrate .. //depot/projects/ia64/sys/net/bpf.c#24 integrate .. //depot/projects/ia64/sys/net/bridge.c#23 integrate .. //depot/projects/ia64/sys/net/if.c#26 integrate .. //depot/projects/ia64/sys/net/if.h#12 integrate .. //depot/projects/ia64/sys/net/if_disc.c#8 integrate .. //depot/projects/ia64/sys/net/if_faith.c#12 integrate .. //depot/projects/ia64/sys/net/if_loop.c#19 integrate .. //depot/projects/ia64/sys/net/if_stf.c#16 integrate .. //depot/projects/ia64/sys/net/netisr.c#4 integrate .. //depot/projects/ia64/sys/net/route.c#13 integrate .. //depot/projects/ia64/sys/net/route.h#9 integrate .. //depot/projects/ia64/sys/net/rtsock.c#20 integrate .. //depot/projects/ia64/sys/netinet/if_atm.c#6 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#20 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/ia64/sys/netinet/in_proto.c#9 integrate .. //depot/projects/ia64/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/ia64/sys/netinet/ip_flow.c#4 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#15 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#33 integrate .. //depot/projects/ia64/sys/netinet6/frag6.c#5 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#10 integrate .. //depot/projects/ia64/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#16 integrate .. //depot/projects/ia64/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/ia64/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/ia64/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/ia64/sys/netinet6/ip6_id.c#1 branch .. //depot/projects/ia64/sys/netinet6/ip6_input.c#18 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/ia64/sys/netinet6/ip6_var.h#7 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#12 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#13 integrate .. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#7 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#7 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_osdep.h#1 branch .. //depot/projects/ia64/sys/netipsec/ipsec_output.c#8 integrate .. //depot/projects/ia64/sys/netipsec/key.c#8 integrate .. //depot/projects/ia64/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/ia64/sys/netipsec/keydb.h#3 integrate .. //depot/projects/ia64/sys/netipsec/keysock.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/ia64/sys/netkey/key.c#14 integrate .. //depot/projects/ia64/sys/netkey/key_debug.h#5 integrate .. //depot/projects/ia64/sys/netkey/keysock.c#17 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#17 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#31 integrate .. //depot/projects/ia64/sys/sparc64/include/endian.h#9 integrate .. //depot/projects/ia64/sys/sparc64/include/param.h#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#48 integrate .. //depot/projects/ia64/sys/sys/cdefs.h#18 integrate .. //depot/projects/ia64/sys/sys/mac.h#20 integrate .. //depot/projects/ia64/sys/sys/proc.h#76 integrate .. //depot/projects/ia64/sys/sys/systm.h#30 integrate .. //depot/projects/ia64/sys/sys/uio.h#11 integrate .. //depot/projects/ia64/sys/vm/pmap.h#22 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#37 integrate .. //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#10 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.australia#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.holiday#9 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.music#4 integrate .. //depot/projects/ia64/usr.bin/make/compat.c#10 integrate .. //depot/projects/ia64/usr.bin/make/dir.c#11 integrate .. //depot/projects/ia64/usr.bin/make/main.c#20 integrate .. //depot/projects/ia64/usr.bin/make/make.1#13 integrate .. //depot/projects/ia64/usr.bin/netstat/route.c#8 integrate .. //depot/projects/ia64/usr.bin/tftp/main.c#8 integrate .. //depot/projects/ia64/usr.bin/tftp/tftp.1#7 integrate .. //depot/projects/ia64/usr.sbin/Makefile#51 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.4#4 integrate .. //depot/projects/ia64/usr.sbin/mptable/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/mptable/mptable.c#3 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/ptimes.c#4 integrate .. //depot/projects/ia64/usr.sbin/route6d/route6d.c#5 integrate .. //depot/projects/ia64/usr.sbin/timed/timed/timed.8#4 integrate Differences ... ==== //depot/projects/ia64/UPDATING#56 (text+ko) ==== @@ -1199,8 +1199,8 @@ If you are updating from a prior version of FreeBSD (even one just a few days old), you should follow this procedure. With a /usr/obj tree with a fresh buildworld, - make buildkernel KERNCONF=YOUR_KERNEL_HERE - make installkernel KERNCONF=YOUR_KERNEL_HERE + make -DALWAYS_CHECK_MAKE buildkernel KERNCONF=YOUR_KERNEL_HERE + make -DALWAYS_CHECK_MAKE installkernel KERNCONF=YOUR_KERNEL_HERE To just build a kernel when you know that it won't mess you up -------------------------------------------------------------- @@ -1384,4 +1384,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.270 2003/09/28 16:25:35 phk Exp $ +$FreeBSD: src/UPDATING,v 1.271 2003/10/03 18:29:06 ru Exp $ ==== //depot/projects/ia64/crypto/openssl/CHANGES#6 (text+ko) ==== @@ -2,6 +2,92 @@ OpenSSL CHANGES _______________ + Changes between 0.9.7b and 0.9.7c [30 Sep 2003] + + *) Fix various bugs revealed by running the NISCC test suite: + + Stop out of bounds reads in the ASN1 code when presented with + invalid tags (CAN-2003-0543 and CAN-2003-0544). + + Free up ASN1_TYPE correctly if ANY type is invalid (CAN-2003-0545). + + If verify callback ignores invalid public key errors don't try to check + certificate signature with the NULL public key. + + [Steve Henson] + + *) New -ignore_err option in ocsp application to stop the server + exiting on the first error in a request. + [Steve Henson] + + *) In ssl3_accept() (ssl/s3_srvr.c) only accept a client certificate + if the server requested one: as stated in TLS 1.0 and SSL 3.0 + specifications. + [Steve Henson] + + *) In ssl3_get_client_hello() (ssl/s3_srvr.c), tolerate additional + extra data after the compression methods not only for TLS 1.0 + but also for SSL 3.0 (as required by the specification). + [Bodo Moeller; problem pointed out by Matthias Loepfe] + + *) Change X509_certificate_type() to mark the key as exported/exportable + when it's 512 *bits* long, not 512 bytes. + [Richard Levitte] + + *) Change AES_cbc_encrypt() so it outputs exact multiple of + blocks during encryption. + [Richard Levitte] + + *) Various fixes to base64 BIO and non blocking I/O. On write + flushes were not handled properly if the BIO retried. On read + data was not being buffered properly and had various logic bugs. + This also affects blocking I/O when the data being decoded is a + certain size. + [Steve Henson] + + *) Various S/MIME bugfixes and compatibility changes: + output correct application/pkcs7 MIME type if + PKCS7_NOOLDMIMETYPE is set. Tolerate some broken signatures. + Output CR+LF for EOL if PKCS7_CRLFEOL is set (this makes opening + of files as .eml work). Correctly handle very long lines in MIME + parser. + [Steve Henson] + + Changes between 0.9.7a and 0.9.7b [10 Apr 2003] + + *) Countermeasure against the Klima-Pokorny-Rosa extension of + Bleichbacher's attack on PKCS #1 v1.5 padding: treat + a protocol version number mismatch like a decryption error + in ssl3_get_client_key_exchange (ssl/s3_srvr.c). + [Bodo Moeller] + + *) Turn on RSA blinding by default in the default implementation + to avoid a timing attack. Applications that don't want it can call + RSA_blinding_off() or use the new flag RSA_FLAG_NO_BLINDING. + They would be ill-advised to do so in most cases. + [Ben Laurie, Steve Henson, Geoff Thorpe, Bodo Moeller] + + *) Change RSA blinding code so that it works when the PRNG is not + seeded (in this case, the secret RSA exponent is abused as + an unpredictable seed -- if it is not unpredictable, there + is no point in blinding anyway). Make RSA blinding thread-safe + by remembering the creator's thread ID in rsa->blinding and + having all other threads use local one-time blinding factors + (this requires more computation than sharing rsa->blinding, but + avoids excessive locking; and if an RSA object is not shared + between threads, blinding will still be very fast). + [Bodo Moeller] + + *) Fixed a typo bug that would cause ENGINE_set_default() to set an + ENGINE as defaults for all supported algorithms irrespective of + the 'flags' parameter. 'flags' is now honoured, so applications + should make sure they are passing it correctly. + [Geoff Thorpe] + + *) Target "mingw" now allows native Windows code to be generated in + the Cygwin environment as well as with the MinGW compiler. + [Ulf Moeller] + Changes between 0.9.7 and 0.9.7a [19 Feb 2003] *) In ssl3_get_record (ssl/s3_pkt.c), minimize information leaked @@ -85,6 +171,9 @@ Changes between 0.9.6h and 0.9.7 [31 Dec 2002] + [NB: OpenSSL 0.9.6i and later 0.9.6 patch levels were released after + OpenSSL 0.9.7.] + *) Fix session ID handling in SSLv2 client code: the SERVER FINISHED code (06) was taken as the first octet of the session ID and the last octet was ignored consequently. As a result SSLv2 client side session @@ -1903,6 +1992,57 @@ *) Clean old EAY MD5 hack from e_os.h. [Richard Levitte] + Changes between 0.9.6j and 0.9.6k [30 Sep 2003] + + *) Fix various bugs revealed by running the NISCC test suite: + + Stop out of bounds reads in the ASN1 code when presented with + invalid tags (CAN-2003-0543 and CAN-2003-0544). + + If verify callback ignores invalid public key errors don't try to check + certificate signature with the NULL public key. + + [Steve Henson] + + *) In ssl3_accept() (ssl/s3_srvr.c) only accept a client certificate + if the server requested one: as stated in TLS 1.0 and SSL 3.0 + specifications. + [Steve Henson] + + *) In ssl3_get_client_hello() (ssl/s3_srvr.c), tolerate additional + extra data after the compression methods not only for TLS 1.0 + but also for SSL 3.0 (as required by the specification). + [Bodo Moeller; problem pointed out by Matthias Loepfe] + + *) Change X509_certificate_type() to mark the key as exported/exportable + when it's 512 *bits* long, not 512 bytes. + [Richard Levitte] + + Changes between 0.9.6i and 0.9.6j [10 Apr 2003] + + *) Countermeasure against the Klima-Pokorny-Rosa extension of + Bleichbacher's attack on PKCS #1 v1.5 padding: treat + a protocol version number mismatch like a decryption error + in ssl3_get_client_key_exchange (ssl/s3_srvr.c). + [Bodo Moeller] + + *) Turn on RSA blinding by default in the default implementation + to avoid a timing attack. Applications that don't want it can call + RSA_blinding_off() or use the new flag RSA_FLAG_NO_BLINDING. + They would be ill-advised to do so in most cases. + [Ben Laurie, Steve Henson, Geoff Thorpe, Bodo Moeller] + + *) Change RSA blinding code so that it works when the PRNG is not + seeded (in this case, the secret RSA exponent is abused as + an unpredictable seed -- if it is not unpredictable, there + is no point in blinding anyway). Make RSA blinding thread-safe + by remembering the creator's thread ID in rsa->blinding and + having all other threads use local one-time blinding factors + (this requires more computation than sharing rsa->blinding, but + avoids excessive locking; and if an RSA object is not shared + between threads, blinding will still be very fast). + [Bodo Moeller] + Changes between 0.9.6h and 0.9.6i [19 Feb 2003] *) In ssl3_get_record (ssl/s3_pkt.c), minimize information leaked ==== //depot/projects/ia64/crypto/openssl/Configure#6 (text+ko) ==== @@ -219,7 +219,7 @@ # './Configure irix-[g]cc' manually. # -mips4 flag is added by ./config when appropriate. "irix-mips3-gcc","gcc:-mabi=n32 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix-mips3-cc", "cc:-n32 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # N64 ABI builds. "irix64-mips4-gcc","gcc:-mabi=64 -mips4 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -390,6 +390,7 @@ "linux-s390", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -506,10 +507,8 @@ "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN::::::::::win32", "BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::", -# Mingw32 -# (Note: the real CFLAGS for Windows builds are defined by util/mk1mf.pl -# and its library files in util/pl/*) -"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# MinGW +"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall:::MINGW32:-mno-cygwin -lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32::::.dll", # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", @@ -561,6 +560,8 @@ "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::", "vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::", "vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::", +"vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::", +"vxworks-mipsle","ccmips:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -DL_ENDIAN -EL -Wl,-EL -mips2 -mno-branch-likely -G 0 -fno-builtin -msoft-float -DCPU=MIPS32 -DMIPSEL -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r::::::::::::::::ranlibmips:", ##### Compaq Non-Stop Kernel (Tandem) "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", ==== //depot/projects/ia64/crypto/openssl/FAQ#6 (text+ko) ==== @@ -68,7 +68,7 @@ * Which is the current version of OpenSSL? The current version is available from <URL: http://www.openssl.org>. -OpenSSL 0.9.7a was released on February 19, 2003. +OpenSSL 0.9.7c was released on September 30, 2003. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at <URL: @@ -732,6 +732,7 @@ the OpenSSH configure script. It should contain the detailed information on why the OpenSSL library was not detected or considered incompatible. + * Can I use OpenSSL's SSL library with non-blocking I/O? Yes; make sure to read the SSL_get_error(3) manual page! ==== //depot/projects/ia64/crypto/openssl/FREEBSD-Xlist#3 (text+ko) ==== @@ -1,10 +1,15 @@ -$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.4 2002/07/30 12:38:41 nectar Exp $ +$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.5 2003/10/01 12:21:16 nectar Exp $ +INSTALL.DJGPP INSTALL.MacOS +INSTALL.OS2 INSTALL.VMS INSTALL.W32 +INSTALL.WCE MacOS/ VMS/ *.com +*.def +*.mak */*.bat */*.com */*/*.bat @@ -13,6 +18,7 @@ crypto/bn/asm/pa-risc2.s.old crypto/bn/asm/vms.mar crypto/bn/vms-helper.c +crypto/buildinf.h crypto/dso/dso_vms.c crypto/dso/dso_win32.c crypto/threads/solaris.sh @@ -24,6 +30,9 @@ shlib/solaris-sc4.sh shlib/solaris.sh shlib/sun.sh +shlib/sco5-shared-installed +shlib/sco5-shared-gcc.sh +shlib/sco5-shared.sh shlib/svr5-shared-gcc.sh shlib/svr5-shared-installed shlib/svr5-shared.sh ==== //depot/projects/ia64/crypto/openssl/LICENSE#3 (text+ko) ==== @@ -12,7 +12,7 @@ --------------- /* ==================================================================== - * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. + * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ==== //depot/projects/ia64/crypto/openssl/Makefile.org#6 (text+ko) ==== @@ -78,7 +78,7 @@ # gcc, then the driver will automatically translate it to -xarch=v8plus # and pass it down to assembler. AS=$(CC) -c -ASFLAGS=$(CFLAG) +ASFLAG=$(CFLAG) # Set BN_ASM to bn_asm.o if you want to use the C version BN_ASM= bn_asm.o @@ -194,6 +194,7 @@ MANDIR=$(OPENSSLDIR)/man MAN1=1 MAN3=3 +MANSUFFIX= SHELL=/bin/sh TOP= . @@ -225,7 +226,7 @@ do \ if [ -d "$$i" ]; then \ (cd $$i && echo "making all in $$i..." && \ - $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAGS='${ASFLAGS}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \ + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \ else \ $(MAKE) $$i; \ fi; \ @@ -410,9 +411,10 @@ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; ${CC} ${SHARED_LDFLAGS} \ + -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -429,13 +431,16 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \ + SHARE_FLAG='-G'; \ + (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} ${SHARED_LDFLAGS} \ - -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ + ${CC} ${SHARED_LDFLAGS} \ + $${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -589,10 +594,10 @@ @false libclean: - rm -f *.a */lib */*/lib + rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib -clean: - rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c +clean: libclean + rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c @for i in $(DIRS) ;\ do \ if [ -d "$$i" ]; then \ @@ -602,7 +607,7 @@ fi; \ done; rm -f openssl.pc - rm -f *.a *.o speed.* *.map *.so .pure core + rm -f speed.* .pure rm -f $(TARFILE) @for i in $(ONEDIRS) ;\ do \ @@ -652,7 +657,10 @@ rehash.time: certs @(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \ export OPENSSL OPENSSL_DEBUG_MEMORY; \ - LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ + LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ $(PERL) tools/c_rehash certs) @@ -663,10 +671,13 @@ tests: rehash @(cd test && echo "testing..." && \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); - @LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ - if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ - apps/openssl version -a + @LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ + if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ + apps/openssl version -a report: @$(PERL) util/selftest.pl @@ -821,6 +832,7 @@ fi; \ fi cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig install_docs: @$(PERL) $(TOP)/util/mkdir-p.pl \ @@ -837,33 +849,33 @@ for i in doc/apps/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done; \ for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done ==== //depot/projects/ia64/crypto/openssl/Makefile.ssl#6 (text+ko) ==== @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.7a +VERSION=0.9.7c MAJOR=0 MINOR=9.7 SHLIB_VERSION_NUMBER=0.9.7 @@ -12,9 +12,9 @@ SHLIB_MAJOR=0 SHLIB_MINOR=9.7 SHLIB_EXT= -PLATFORM=dist +PLATFORM=VC-WIN16 OPTIONS= no-krb5 -CONFIGURE_ARGS=dist +CONFIGURE_ARGS=VC-WIN16 SHLIB_TARGET= # HERE indicates where this Makefile lives. This can be used to indicate @@ -59,9 +59,9 @@ # equal 4. # PKCS1_CHECK - pkcs1 tests. -CC= cc +CC= cl #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM -CFLAG= -DOPENSSL_NO_KRB5 -O +CFLAG= -DOPENSSL_SYSNAME_WIN16 -DOPENSSL_NO_KRB5 DEPFLAG= PEX_LIBS= EX_LIBS= @@ -69,7 +69,7 @@ ARFLAGS= AR=ar $(ARFLAGS) r RANLIB= /usr/bin/ranlib -PERL= /usr/local/bin/perl +PERL= /usr/local/bin/perl5 TAR= tar TARFLAGS= --no-recursion MAKEDEPPROG=makedepend @@ -80,7 +80,7 @@ # gcc, then the driver will automatically translate it to -xarch=v8plus # and pass it down to assembler. AS=$(CC) -c -ASFLAGS=$(CFLAG) +ASFLAG=$(CFLAG) # Set BN_ASM to bn_asm.o if you want to use the C version BN_ASM= bn_asm.o @@ -196,6 +196,7 @@ MANDIR=$(OPENSSLDIR)/man MAN1=1 MAN3=3 +MANSUFFIX= SHELL=/bin/sh TOP= . @@ -227,7 +228,7 @@ do \ if [ -d "$$i" ]; then \ (cd $$i && echo "making all in $$i..." && \ - $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAGS='${ASFLAGS}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \ + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \ else \ $(MAKE) $$i; \ fi; \ @@ -412,9 +413,10 @@ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; ${CC} ${SHARED_LDFLAGS} \ + -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -431,13 +433,16 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \ + SHARE_FLAG='-G'; \ + (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} ${SHARED_LDFLAGS} \ - -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ + ${CC} ${SHARED_LDFLAGS} \ + $${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -591,10 +596,10 @@ @false libclean: - rm -f *.a */lib */*/lib + rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib -clean: - rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c +clean: libclean + rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c @for i in $(DIRS) ;\ do \ if [ -d "$$i" ]; then \ @@ -604,7 +609,7 @@ fi; \ done; rm -f openssl.pc - rm -f *.a *.o speed.* *.map *.so .pure core + rm -f speed.* .pure rm -f $(TARFILE) @for i in $(ONEDIRS) ;\ do \ @@ -654,7 +659,10 @@ rehash.time: certs @(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \ export OPENSSL OPENSSL_DEBUG_MEMORY; \ - LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ + LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ $(PERL) tools/c_rehash certs) @@ -665,10 +673,13 @@ tests: rehash @(cd test && echo "testing..." && \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); - @LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ - if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ - apps/openssl version -a + @LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ + if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ + apps/openssl version -a report: @$(PERL) util/selftest.pl @@ -823,6 +834,7 @@ fi; \ fi cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig install_docs: @$(PERL) $(TOP)/util/mkdir-p.pl \ @@ -839,33 +851,33 @@ for i in doc/apps/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done; \ for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310040522.h945MSqT052502>