PERFORCE change 15200 for review

Robert Watson rwatson at freebsd.org
Tue Jul 30 16:41:50 GMT 2002


http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15200

Change 15200 by rwatson at rwatson_tislabs on 2002/07/30 09:41:18

	Further IFC from trustedbsd_base to bring into account kern_mac,
	system call changes in main tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-socket.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-Xlist#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/INSTALL#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/LICENSE#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/README#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/STATUS#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/TABLE#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dgst.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dsaparam.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/eay.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/enc.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pem_mail.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs12.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/req.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/01.pem#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/1.txt#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/SecureServer.pem#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/s.txt#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_time.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/smime.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/speed.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/tkca#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/certs/rsa-ssca.pem#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/config#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_sign.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_time.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/pkcs8.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_sock.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_lbuf.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_bio.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_log.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_comba.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_opts.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/comba.pl#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/new#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/b_sqr.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_com.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_high.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_ka.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_low.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_m.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_mul.c.works#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_wmul.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/build#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/info#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/test.works#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_api.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_def.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_lcl.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/keysets.pl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/DES.pod#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/MODES.DES#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.PL#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.lit#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/PC1#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/PC2#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.man#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.pl#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_crypt.man#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/doIP#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/doPC1#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/doPC2#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/fcrypt.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/podd.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/read_pwd.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/shifts.pl#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/sk.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/supp.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/testdes.pl#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_err.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_gen.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dhtest.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_3d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_bf.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_c.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_i.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_r2.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_r5.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_3d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_bf.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_c.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_i.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_r2.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_r5.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_3d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_bf.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_c.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_i.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_r2.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_r5.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_3d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_bf.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_c.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_d.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_i.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_r2.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_r5.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/encode.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/lh_test.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_mac.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/objects.pl#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/objects.txt#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_info.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_lib.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/README#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_egd.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_win.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_oaep.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_oaep_test.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile.uni#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/tmdiff.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/README#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/demos/b64.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/demos/maurice/example1.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/dep/crypto.txt#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/dep/files#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/dep/gen.pl#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/dep/ssl.txt#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto.pod#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BN_bn2bin.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/RSA_generate_key.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/blowfish.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/crypto.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/des_modes.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/openssl.pod#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl.pod#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_clear.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/ssl.pod#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/e_os.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/e_os2.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/mt/README#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/mt/mttest.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/mt/profile.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/mt/pthread.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/mt/purify.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/mt/solaris.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/Makefile.hpux10-cc#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/hpux10-cc.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/irix.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/solaris-sc4.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/solaris.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/sun.sh#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_both.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_enc.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_lib.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_pkt.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl3.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_cert.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_lib.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssltest.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_enc.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.save#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.ssl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/test/dsa-ca.pem#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/test/dsa-pca.pem#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssl/util/libeay.num#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/util/selftest.pl#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/util/sep_lib.sh#2 delete
.. //depot/projects/trustedbsd/mac/lib/libc/sys/fork.2#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/rfork.2#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_opie/pam_opie.c#8 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/dir.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsck.h#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsutil.c#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/inode.c#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/main.c#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass1.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass2.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass5.c#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/utilities.c#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsdb/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.h#6 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/des_crypt.3#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#4 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files#37 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/fm801.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#14 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#14 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#21 edit
.. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#221 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#21 edit
.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#18 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#10 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/include/profile.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/cache.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#1 branch
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/locore.S#1 branch
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_exception.S#1 branch
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_locore.S#1 branch
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_locore.s#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/support.S#1 branch
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/support.s#8 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/swtch.S#1 branch
.. //depot/projects/trustedbsd/mac/sys/sys/proc.h#18 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#22 edit
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#22 edit
.. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#23 edit
.. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#34 integrate
.. //depot/projects/trustedbsd/mac/sys/tools/vnode_if.awk#4 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_subr.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#8 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tr/tr.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/kgmon/kgmon.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ppp/chap.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pppd/main.c#2 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-socket.c#2 (text+ko) ====

@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/contrib/traceroute/findsaddr-socket.c,v 1.2 2002/07/30 04:49:13 fenner Exp $
  */
 
 /* XXX Yes this is WAY too complicated */
@@ -193,9 +195,9 @@
 			}
 
 			if (SALEN(sa) == 0)
-				cp += sizeof(u_int32_t);
+				cp += sizeof(long);
 			else
-				cp += roundup(SALEN(sa), sizeof(u_int32_t));
+				cp += roundup(SALEN(sa), sizeof(long));
 		}
 
 	return ("failed!");

==== //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#3 (text+ko) ====

@@ -2,6 +2,126 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 0.9.6c and 0.9.6d  [9 May 2002]
+
+  *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not
+     encoded as NULL) with id-dsa-with-sha1.
+     [Nils Larsch <nla at trustcenter.de>; problem pointed out by Bodo Moeller]
+
+  *) Check various X509_...() return values in apps/req.c.
+     [Nils Larsch <nla at trustcenter.de>]
+
+  *) Fix BASE64 decode (EVP_DecodeUpdate) for data with CR/LF ended lines:
+     an end-of-file condition would erronously be flagged, when the CRLF
+     was just at the end of a processed block. The bug was discovered when
+     processing data through a buffering memory BIO handing the data to a
+     BASE64-decoding BIO. Bug fund and patch submitted by Pavel Tsekov
+     <ptsekov at syntrex.com> and Nedelcho Stanev.
+     [Lutz Jaenicke]
+
+  *) Implement a countermeasure against a vulnerability recently found
+     in CBC ciphersuites in SSL 3.0/TLS 1.0: Send an empty fragment
+     before application data chunks to avoid the use of known IVs
+     with data potentially chosen by the attacker.
+     [Bodo Moeller]
+
+  *) Fix length checks in ssl3_get_client_hello().
+     [Bodo Moeller]
+
+  *) TLS/SSL library bugfix: use s->s3->in_read_app_data differently
+     to prevent ssl3_read_internal() from incorrectly assuming that
+     ssl3_read_bytes() found application data while handshake
+     processing was enabled when in fact s->s3->in_read_app_data was
+     merely automatically cleared during the initial handshake.
+     [Bodo Moeller; problem pointed out by Arne Ansper <arne at ats.cyber.ee>]
+
+  *) Fix object definitions for Private and Enterprise: they were not
+     recognized in their shortname (=lowercase) representation. Extend
+     obj_dat.pl to issue an error when using undefined keywords instead
+     of silently ignoring the problem (Svenning Sorensen
+     <sss at sss.dnsalias.net>).
+     [Lutz Jaenicke]
+
+  *) Fix DH_generate_parameters() so that it works for 'non-standard'
+     generators, i.e. generators other than 2 and 5.  (Previously, the
+     code did not properly initialise the 'add' and 'rem' values to
+     BN_generate_prime().)
+
+     In the new general case, we do not insist that 'generator' is
+     actually a primitive root: This requirement is rather pointless;
+     a generator of the order-q subgroup is just as good, if not
+     better.
+     [Bodo Moeller]
+ 
+  *) Map new X509 verification errors to alerts. Discovered and submitted by
+     Tom Wu <tom at arcot.com>.
+     [Lutz Jaenicke]
+
+  *) Fix ssl3_pending() (ssl/s3_lib.c) to prevent SSL_pending() from
+     returning non-zero before the data has been completely received
+     when using non-blocking I/O.
+     [Bodo Moeller; problem pointed out by John Hughes]
+
+  *) Some of the ciphers missed the strength entry (SSL_LOW etc).
+     [Ben Laurie, Lutz Jaenicke]
+
+  *) Fix bug in SSL_clear(): bad sessions were not removed (found by
+     Yoram Zahavi <YoramZ at gilian.com>).
+     [Lutz Jaenicke]
+
+  *) Add information about CygWin 1.3 and on, and preserve proper
+     configuration for the versions before that.
+     [Corinna Vinschen <vinschen at redhat.com> and Richard Levitte]
+
+  *) Make removal from session cache (SSL_CTX_remove_session()) more robust:
+     check whether we deal with a copy of a session and do not delete from
+     the cache in this case. Problem reported by "Izhar Shoshani Levi"
+     <izhar at checkpoint.com>.
+     [Lutz Jaenicke]
+
+  *) Do not store session data into the internal session cache, if it
+     is never intended to be looked up (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP
+     flag is set). Proposed by Aslam <aslam at funk.com>.
+     [Lutz Jaenicke]
+
+  *) Have ASN1_BIT_STRING_set_bit() really clear a bit when the requested
+     value is 0.
+     [Richard Levitte]
+
+  *) [In 0.9.6c-engine release:]
+     Fix a crashbug and a logic bug in hwcrhk_load_pubkey()
+     [Toomas Kiisk <vix at cyber.ee> via Richard Levitte]
+
+  *) Add the configuration target linux-s390x.
+     [Neale Ferguson <Neale.Ferguson at SoftwareAG-USA.com> via Richard Levitte]
+
+  *) The earlier bugfix for the SSL3_ST_SW_HELLO_REQ_C case of
+     ssl3_accept (ssl/s3_srvr.c) incorrectly used a local flag
+     variable as an indication that a ClientHello message has been
+     received.  As the flag value will be lost between multiple
+     invocations of ssl3_accept when using non-blocking I/O, the
+     function may not be aware that a handshake has actually taken
+     place, thus preventing a new session from being added to the
+     session cache.
+
+     To avoid this problem, we now set s->new_session to 2 instead of
+     using a local variable.
+     [Lutz Jaenicke, Bodo Moeller]
+
+  *) Bugfix: Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c)
+     if the SSL_R_LENGTH_MISMATCH error is detected.
+     [Geoff Thorpe, Bodo Moeller]
+
+  *) New 'shared_ldflag' column in Configure platform table.
+     [Richard Levitte]
+
+  *) Fix EVP_CIPHER_mode macro.
+     ["Dan S. Camper" <dan at bti.net>]
+
+  *) Fix ssl3_read_bytes (ssl/s3_pkt.c): To ignore messages of unknown
+     type, we must throw them away by setting rr->length to 0.
+     [D P Chang <dpc at qualys.com>]
+
  Changes between 0.9.6b and 0.9.6c  [21 dec 2001]
 
   *) Fix BN_rand_range bug pointed out by Dominikus Scherkl

==== //depot/projects/trustedbsd/mac/crypto/openssl/Configure#3 (text+ko) ====

@@ -10,7 +10,7 @@
 
 # see INSTALL for instructions.
 
-my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n";
+my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--test-sanity] os/compiler[:flags]\n";
 
 # Options:
 #
@@ -23,6 +23,9 @@
 #               default).  This needn't be set in advance, you can
 #               just as well use "make INSTALL_PREFIX=/whatever install".
 #
+# --test-sanity Make a number of sanity checks on the data in this file.
+#               This is a debugging tool for OpenSSL developers.
+#
 # rsaref        use RSAref
 # [no-]threads  [don't] try to create a library that is suitable for
 #               multithreaded applications (default is "threads" if we
@@ -97,7 +100,7 @@
 # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1.
 # So the md5_locl.h file has an undef B_ENDIAN if sun is defined
 
-#config-string	$cc : $cflags : $unistd : $thread_cflag : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag
+#config-string	$cc : $cflags : $unistd : $thread_cflag : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib
 
 my %table=(
 # File 'TABLE' (created by 'make TABLE') contains the data from this list,
@@ -132,35 +135,35 @@
 # surrounds it with #APP #NO_APP comment pair which (at least Solaris
 # 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
 # error message.
-"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### Solaris x86 with Sun C setups
-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### SPARC Solaris with GNU C setups
-"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8
 # but keep the assembler modules.
-"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 ####
-"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### SPARC Solaris with Sun C setups
 # DO NOT use /xO[34] on sparc with SC3.0.  It is broken, and will not pass the tests
-"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2.
 # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
 # SC5.0 note: Compiler common patch 107357-01 or later is required!
-"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
+"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
 ####
-"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### SPARC Linux setups
 "linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
@@ -169,7 +172,7 @@
 "linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::",
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o:",
+"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # !!!Folowing can't be even tested yet!!!
 #    We have to wait till 64-bit glibc for SPARC is operational!!!
 #"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
@@ -180,17 +183,17 @@
 
 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
-"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #### IRIX 6.x configs
 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
 # './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-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)",
 # 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)",
+"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)",
 
 #### Unified HP-UX ANSI C configs.
 # Special notes:
@@ -222,44 +225,44 @@
 #
 #!#"hpux-parisc-cc","cc:-Ae +O3 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
 # Since there is mention of this in shlib/hpux10-cc.sh
-"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # More attempts at unified 10.X and 11.X targets for HP C compiler.
 #
 # Chris Ruemmler <ruemmler at cup.hp.com>
 # Kevin Steves <ks at hp.se>
-"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn:hpux64-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # HPUX 9.X config.
 # Don't use the bundled cc.  It is broken.  Use HP ANSI C if possible, or
 # egcs.  gcc 2.8.1 is also broken.
 
-"hpux-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # If hpux-cc fails (e.g. during "make test"), try the next one; otherwise,
 # please report your OS and compiler version to the openssl-bugs at openssl.org
 # mailing list.
-"hpux-brokencc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-brokencc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
-"hpux-gcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-gcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # If hpux-gcc fails, try this one:
-"hpux-brokengcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-brokengcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # HPUX 9.X on Motorola 68k platforms with gcc
 "hpux-m68k-gcc",  "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::BN_LLONG DES_PTR DES_UNROLL:::",
 
 # HPUX 10.X config.  Supports threads.
-"hpux10-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux10-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # If hpux10-cc fails, try this one (if still fails, try deleting BN_LLONG):
-"hpux10-brokencc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux10-brokencc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
-"hpux10-gcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux10-gcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # If hpux10-gcc fails, try this one:
-"hpux10-brokengcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux10-brokengcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # HPUX 11.X from www.globus.org.
 # Only works on PA-RISC 2.0 cpus, and not optimized.  Why?
@@ -270,6 +273,9 @@
 #### HP MPE/iX http://jazz.external.hp.com/src/openssl/
 "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
 
+#### PARISC Linux setups
+"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
+
 # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion
 # from the older DEC C Compiler to the newer compiler.  It's now the
 # same as the preferred entry, alpha-cc.  If you are still using the
@@ -295,15 +301,15 @@
 #
 # For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
 #
-"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared::.so",
-"alphaold-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::.so",
-"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so",
-"alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so",
-"alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath::.so",
+"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
+"alphaold-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
+"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so",
+"alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so",
+"alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath:::.so",
 #
 # This probably belongs in a different section.
 #
-"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### Alpha Linux with GNU C and Compaq C setups
 # Special notes:
@@ -318,8 +324,8 @@
 #
 #					<appro at fy.chalmers.se>
 #
-"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 
@@ -328,23 +334,24 @@
 
 # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
 # bn86-elf.o file file since it is hand tweaked assembler.
-"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
+"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
 "linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
 "linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
-"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
 "linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
-"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)",
-"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)",
-"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::SIXTY_FOUR_BIT_LONG:::::::::::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)",
+"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)",
+"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
 "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
-"bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "nextstep",	"cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
 "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
 # NCR MP-RAS UNIX ver 02.03.01
@@ -357,7 +364,7 @@
 "qnx6",	"cc:-DL_ENDIAN -DTERMIOS::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",
 
 # Linux on ARM
-"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # UnixWare 2.0x fails destest with -O
 "unixware-2.0","cc:-DFILIO_H::-Kthread:-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
@@ -372,7 +379,7 @@
 "unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
 "unixware-7-pentium","cc:-O -DFILIO_H -Kalloca -Kpentium::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
 "unixware-7-pentium_pro","cc:-O -DFILIO_H -Kalloca -Kpentium_pro::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
-"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # OpenUNIX 8
 "OpenUNIX-8","cc:-O -DFILIO_H -Kalloca::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
@@ -389,7 +396,7 @@
 "aix43-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR::::::::::dlfcn:",
 
 #
-# Cray T90 (SDSC)
+# Cray T90 and similar (SDSC)
 # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT
 # defined.  The T90 ints and longs are 8 bytes long, and apparently the
 # B_ENDIAN code assumes 4 byte ints.  Fortunately, the non-B_ENDIAN and
@@ -399,7 +406,10 @@
 #'Taking the address of a bit field is not allowed. '
 #'An expression with bit field exists as the operand of "sizeof" '
 # (written by Wayne Schroeder <schroede at SDSC.EDU>)
-"cray-t90-cc", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::",
+#
+# j90 is considered the base machine type for unicos machines,
+# so this configuration is now called "cray-j90" ...
+"cray-j90", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::",
 
 #
 # Cray T3E (Research Center Juelich, beckman at acl.lanl.gov)
@@ -421,9 +431,11 @@
 
 # SCO 5 - Ben Laurie <ben at algroup.co.uk> says the -O breaks the
 # SCO cc.
-"sco5-cc",  "cc:::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?
+"sco5-cc",  "cc:-belf::(unknown):-lsocket -lresolv:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?
 "sco5-cc-pentium",  "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?
 "sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...
+"sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic",
+"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ...
 
 # Sinix/ReliantUNIX RM400
 # NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g  */
@@ -458,8 +470,9 @@
 # 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",
 
-# CygWin32
-"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
+# Cygwin
+"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
+"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll",
 
 # Ultrix from Bernhard Simon <simon at zid.tuwien.ac.at>
 "ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown)::::::",
@@ -468,23 +481,49 @@
 ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown)::::::",
 
 # Some OpenBSD from Bob Beck <beck at obtuse.com>
-"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"OpenBSD-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"OpenBSD",      "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenBSD-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenBSD",      "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
 "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
-"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
+"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 
 ##### Sony NEWS-OS 4.x
 "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
 
+##### VxWorks for various targets
+"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::",
+
 );
 
 my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
 	BC-16 Mingw32);
 
+my $idx = 0;
+my $idx_cc = $idx++;
+my $idx_cflags = $idx++;
+my $idx_unistd = $idx++;
+my $idx_thread_cflag = $idx++;
+my $idx_lflags = $idx++;
+my $idx_bn_ops = $idx++;
+my $idx_bn_obj = $idx++;
+my $idx_des_obj = $idx++;
+my $idx_bf_obj = $idx++;
+my $idx_md5_obj = $idx++;
+my $idx_sha1_obj = $idx++;
+my $idx_cast_obj = $idx++;
+my $idx_rc4_obj = $idx++;
+my $idx_rmd160_obj = $idx++;
+my $idx_rc5_obj = $idx++;
+my $idx_dso_scheme = $idx++;
+my $idx_shared_target = $idx++;
+my $idx_shared_cflag = $idx++;
+my $idx_shared_ldflag = $idx++;
+my $idx_shared_extension = $idx++;
+my $idx_ranlib = $idx++;
+
 my $prefix="";
 my $openssldir="";
 my $exe_ext="";
@@ -557,7 +596,11 @@
 	foreach (@argvcopy)
 		{
 		s /^-no-/no-/; # some people just can't read the instructions
-		if (/^no-asm$/)
+		if (/^--test-sanity$/)
+			{
+			exit(&test_sanity());
+			}
+		elsif (/^no-asm$/)
 		 	{
 			$no_asm=1;
 			$flags .= "-DNO_ASM ";
@@ -686,13 +729,17 @@
 	exit 0;
 }
 
+if ($target =~ m/^CygWin32(-.*)$/) {
+	$target = "Cygwin".$1;
+}
+
 print "Configuring for $target\n";
 
 &usage if (!defined($table{$target}));
 
 my $IsWindows=scalar grep /^$target$/, at WinTargets;
 
-$exe_ext=".exe" if ($target eq "CygWin32");
+$exe_ext=".exe" if ($target eq "Cygwin");
 $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
 $prefix=$openssldir if $prefix eq "";
 
@@ -705,9 +752,29 @@
 
 print "IsWindows=$IsWindows\n";
 
-(my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj,
- $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,my $shared_extension,my $ranlib)=
-	split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
+my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
+my $cc = $fields[$idx_cc];
+my $cflags = $fields[$idx_cflags];
+my $unistd = $fields[$idx_unistd];
+my $thread_cflag = $fields[$idx_thread_cflag];
+my $lflags = $fields[$idx_lflags];
+my $bn_ops = $fields[$idx_bn_ops];
+my $bn_obj = $fields[$idx_bn_obj];
+my $des_obj = $fields[$idx_des_obj];
+my $bf_obj = $fields[$idx_bf_obj];
+my $md5_obj = $fields[$idx_md5_obj];
+my $sha1_obj = $fields[$idx_sha1_obj];
+my $cast_obj = $fields[$idx_cast_obj];
+my $rc4_obj = $fields[$idx_rc4_obj];
+my $rmd160_obj = $fields[$idx_rmd160_obj];
+my $rc5_obj = $fields[$idx_rc5_obj];
+my $dso_scheme = $fields[$idx_dso_scheme];
+my $shared_target = $fields[$idx_shared_target];
+my $shared_cflag = $fields[$idx_shared_cflag];
+my $shared_ldflag = $fields[$idx_shared_ldflag];
+my $shared_extension = $fields[$idx_shared_extension];
+my $ranlib = $fields[$idx_ranlib];
+
 $cflags="$flags$cflags" if ($flags ne "");
 
 # The DSO code currently always implements all functions so that no
@@ -921,6 +988,7 @@
 		my $sotmp = $1;
 		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
 		}
+	s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
 	print OUT $_."\n";
 	}
 close(IN);
@@ -1208,7 +1276,7 @@
 	my $bn_obj,my $des_obj,my $bf_obj,
 	my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj,
 	my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,
-	my $shared_extension,my $ranlib)=
+	my $shared_ldflag,my $shared_extension,my $ranlib)=
 	split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
 			
 	print <<EOF
@@ -1232,7 +1300,44 @@
 \$dso_scheme   = $dso_scheme
 \$shared_target= $shared_target
 \$shared_cflag = $shared_cflag
+\$shared_ldflag = $shared_ldflag
 \$shared_extension = $shared_extension
 \$ranlib       = $ranlib
 EOF
 	}
+
+sub test_sanity
+	{
+	my $errorcnt = 0;
+
+	print STDERR "=" x 70, "\n";
+	print STDERR "=== SANITY TESTING!\n";
+	print STDERR "=== No configuration will be done, all other arguments will be ignored!\n";
+	print STDERR "=" x 70, "\n";
+
+	foreach $target (sort keys %table)
+		{
+		@fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
+
+		if ($fields[$idx_dso_scheme-1] =~ /^(dl|dlfcn|win32|vms)$/)
+			{
+			$errorcnt++;
+			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] values\n";
+			print STDERR "              in the previous field\n";
+			}
+		elsif ($fields[$idx_dso_scheme+1] =~ /^(dl|dlfcn|win32|vms)$/)
+			{
+			$errorcnt++;
+			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] values\n";
+			print STDERR "              in the following field\n";
+			}
+		elsif ($fields[$idx_dso_scheme] !~ /^(dl|dlfcn|win32|vms|)$/)
+			{
+			$errorcnt++;
+			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] field = ",$fields[$idx_dso_scheme],"\n";
+			print STDERR "              valid values are 'dl', 'dlfcn', 'win32' and 'vms'\n";
+			}
+		}
+	print STDERR "No sanity errors detected!\n" if $errorcnt == 0;
+	return $errorcnt;
+	}

==== //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#3 (text+ko) ====

@@ -59,7 +59,7 @@
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.6b was released on December 21st, 2001.
+OpenSSL 0.9.6d was released on 9 May, 2002.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:

==== //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-Xlist#2 (text+ko) ====

@@ -1,39 +1,30 @@
-$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.3 2000/11/13 07:46:20 kris Exp $
+$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.4 2002/07/30 12:38:41 nectar Exp $
 INSTALL.MacOS
 INSTALL.VMS
 INSTALL.W32
 MacOS/
 VMS/

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list