Merge lp:~nvalcarcel/ubuntu/lucid/openssl/openssl-merge into lp:ubuntu/lucid/openssl
- Lucid (10.04)
- openssl-merge
- Merge into lucid
Status: | Merged |
---|---|
Merge reported by: | James Westby |
Merged at revision: | not available |
Proposed branch: | lp:~nvalcarcel/ubuntu/lucid/openssl/openssl-merge |
Merge into: | lp:ubuntu/lucid/openssl |
Diff against target: |
106376 lines (+74833/-13178) 755 files modified
.pc/.version (+1/-0) CHANGES (+282/-0) ChangeLog.0_9_7-stable_not-in-head (+0/-163) ChangeLog.0_9_7-stable_not-in-head_FIPS (+0/-1494) Configure (+275/-141) FAQ (+65/-9) INSTALL (+2/-2) INSTALL.NW (+72/-62) LICENSE (+1/-1) MacOS/GetHTTPS.src/ErrorHandling.hpp (+1/-1) Makefile (+154/-16) Makefile.org (+155/-21) Makefile.shared (+11/-11) NEWS (+18/-0) Netware/build.bat (+26/-7) Netware/cpy_tests.bat (+1/-0) Netware/do_tests.pl (+101/-71) Netware/set_env.bat (+49/-27) README (+3/-3) apps/CA.pl.in (+0/-2) apps/CA.sh (+0/-1) apps/Makefile (+317/-232) apps/apps.c (+235/-1) apps/apps.h (+22/-0) apps/asn1pars.c (+1/-1) apps/ca.c (+10/-1) apps/cms.c (+1347/-0) apps/crl.c (+19/-2) apps/dgst.c (+49/-8) apps/dsa.c (+14/-26) apps/ec.c (+1/-1) apps/enc.c (+14/-2) apps/engine.c (+3/-3) apps/genpkey.c (+440/-0) apps/genrsa.c (+14/-1) apps/nseq.c (+1/-1) apps/ocsp.c (+163/-51) apps/openssl.c (+14/-0) apps/pkcs12.c (+18/-4) apps/pkcs8.c (+1/-1) apps/pkey.c (+284/-0) apps/pkeyparam.c (+201/-0) apps/pkeyutl.c (+570/-0) apps/progs.h (+4/-0) apps/progs.pl (+2/-0) apps/rand.c (+24/-3) apps/req.c (+1/-2) apps/rsautl.c (+25/-13) apps/s_client.c (+130/-5) apps/s_server.c (+205/-4) apps/s_time.c (+0/-1) apps/smime.c (+1/-1) apps/speed.c (+2/-0) apps/spkac.c (+1/-1) apps/ts.c (+1144/-0) apps/tsget (+195/-0) apps/version.c (+1/-1) apps/x509.c (+9/-2) certs/README.RootCerts (+4/-0) certs/RegTP-5R.pem (+0/-19) certs/RegTP-6R.pem (+0/-19) certs/aol1.pem (+0/-22) certs/aol2.pem (+0/-33) certs/aoltw1.pem (+0/-23) certs/aoltw2.pem (+0/-34) certs/argena.pem (+0/-39) certs/argeng.pem (+0/-23) certs/demo/nortelCA.pem (+0/-16) certs/demo/timCA.pem (+0/-16) certs/demo/tjhCA.pem (+0/-15) certs/demo/vsigntca.pem (+0/-18) certs/eng1.pem (+0/-23) certs/eng2.pem (+0/-23) certs/eng3.pem (+0/-34) certs/eng4.pem (+0/-23) certs/eng5.pem (+0/-23) certs/expired/ICE-CA.pem (+0/-59) certs/expired/ICE-root.pem (+0/-48) certs/expired/ICE-user.pem (+0/-63) certs/expired/RegTP-4R.pem (+0/-19) certs/expired/factory.pem (+0/-15) certs/expired/rsa-cca.pem (+0/-19) certs/expired/rsa-ssca.pem (+0/-19) certs/expired/vsign2.pem (+0/-18) certs/expired/vsign3.pem (+0/-18) certs/thawteCb.pem (+0/-19) certs/thawteCp.pem (+0/-19) certs/vsign1.pem (+0/-17) certs/vsign3.pem (+0/-17) certs/vsignss.pem (+0/-17) certs/wellsfgo.pem (+0/-23) config (+14/-8) crypto/Makefile (+27/-7) crypto/aes/Makefile (+16/-4) crypto/aes/aes.h (+10/-0) crypto/aes/aes_cbc.c (+2/-0) crypto/aes/aes_core.c (+8/-0) crypto/aes/aes_wrap.c (+259/-0) crypto/aes/aes_x86core.c (+1063/-0) crypto/aes/asm/aes-586.pl (+5/-11) crypto/aes/asm/aes-armv4.pl (+1030/-0) crypto/aes/asm/aes-ppc.pl (+1176/-0) crypto/aes/asm/aes-s390x.pl (+1333/-0) crypto/aes/asm/aes-sparcv9.pl (+1181/-0) crypto/aes/asm/aes-x86_64.pl (+1579/-0) crypto/asn1/Makefile (+265/-231) crypto/asn1/a_bytes.c (+1/-1) crypto/asn1/a_mbstr.c (+1/-1) crypto/asn1/a_object.c (+1/-0) crypto/asn1/a_sign.c (+6/-1) crypto/asn1/a_strex.c (+1/-1) crypto/asn1/a_strnid.c (+1/-1) crypto/asn1/a_type.c (+26/-0) crypto/asn1/a_verify.c (+6/-1) crypto/asn1/ameth_lib.c (+446/-0) crypto/asn1/asn1.h (+52/-3) crypto/asn1/asn1_err.c (+18/-1) crypto/asn1/asn1_gen.c (+1/-1) crypto/asn1/asn1_lib.c (+8/-0) crypto/asn1/asn1_locl.h (+134/-0) crypto/asn1/asn1_par.c (+2/-0) crypto/asn1/asn1t.h (+8/-1) crypto/asn1/asn_mime.c (+874/-0) crypto/asn1/asn_moid.c (+1/-1) crypto/asn1/asn_pack.c (+1/-1) crypto/asn1/bio_asn1.c (+495/-0) crypto/asn1/bio_ndef.c (+246/-0) crypto/asn1/nsseq.c (+1/-1) crypto/asn1/p5_pbe.c (+1/-1) crypto/asn1/p5_pbev2.c (+1/-1) crypto/asn1/p8_pkey.c (+1/-1) crypto/asn1/t_bitst.c (+1/-1) crypto/asn1/t_crl.c (+1/-1) crypto/asn1/t_spki.c (+1/-1) crypto/asn1/t_x509.c (+11/-11) crypto/asn1/t_x509a.c (+1/-1) crypto/asn1/tasn_dec.c (+24/-14) crypto/asn1/tasn_enc.c (+2/-2) crypto/asn1/tasn_fre.c (+2/-4) crypto/asn1/tasn_new.c (+1/-1) crypto/asn1/tasn_prn.c (+1/-1) crypto/asn1/tasn_typ.c (+1/-1) crypto/asn1/tasn_utl.c (+1/-1) crypto/asn1/x_algor.c (+58/-1) crypto/asn1/x_bignum.c (+1/-1) crypto/asn1/x_exten.c (+6/-1) crypto/asn1/x_long.c (+1/-1) crypto/asn1/x_nx509.c (+72/-0) crypto/asn1/x_x509a.c (+1/-1) crypto/bf/Makefile (+7/-3) crypto/bf/bf_skey.c (+6/-1) crypto/bf/blowfish.h (+3/-1) crypto/bio/Makefile (+1/-1) crypto/bio/b_sock.c (+15/-7) crypto/bio/bio.h (+1/-0) crypto/bio/bss_bio.c (+1/-1) crypto/bio/bss_dgram.c (+67/-3) crypto/bio/bss_file.c (+7/-3) crypto/bio/bss_mem.c (+13/-11) crypto/bio/bss_sock.c (+5/-0) crypto/bn/Makefile (+22/-3) crypto/bn/asm/alpha-mont.pl (+317/-0) crypto/bn/asm/armv4-mont.pl (+200/-0) crypto/bn/asm/mips3-mont.pl (+327/-0) crypto/bn/asm/mo-586.pl (+603/-0) crypto/bn/asm/ppc-mont.pl (+323/-0) crypto/bn/asm/ppc64-mont.pl (+918/-0) crypto/bn/asm/s390x-mont.pl (+225/-0) crypto/bn/asm/s390x.S (+678/-0) crypto/bn/asm/sparcv9-mont.pl (+606/-0) crypto/bn/asm/sparcv9a-mont.pl (+882/-0) crypto/bn/asm/via-mont.pl (+242/-0) crypto/bn/asm/x86-mont.pl (+591/-0) crypto/bn/asm/x86_64-mont.pl (+214/-0) crypto/bn/bn.h (+18/-2) crypto/bn/bn_div.c (+13/-2) crypto/bn/bn_gf2m.c (+5/-1) crypto/bn/bn_lcl.h (+1/-0) crypto/bn/bn_lib.c (+0/-19) crypto/bn/bn_mont.c (+241/-0) crypto/bn/bn_mul.c (+16/-11) crypto/bn/bn_nist.c (+480/-419) crypto/bn/bn_opt.c (+87/-0) crypto/bn/bn_rand.c (+3/-3) crypto/bn/bn_shift.c (+1/-1) crypto/bn/bn_x931p.c (+272/-0) crypto/bn/bntest.c (+2/-2) crypto/buffer/Makefile (+10/-3) crypto/buffer/buf_str.c (+116/-0) crypto/buffer/buffer.c (+0/-58) crypto/camellia/Makefile (+1/-1) crypto/camellia/asm/cmll-x86.pl (+1138/-0) crypto/camellia/asm/cmll-x86_64.pl (+1080/-0) crypto/camellia/camellia.h (+5/-0) crypto/camellia/cmll_misc.c (+13/-0) crypto/cast/Makefile (+6/-3) crypto/cast/c_skey.c (+6/-1) crypto/cast/cast.h (+3/-1) crypto/cms/Makefile (+183/-0) crypto/cms/cms.h (+473/-0) crypto/cms/cms_asn1.c (+346/-0) crypto/cms/cms_att.c (+195/-0) crypto/cms/cms_cd.c (+134/-0) crypto/cms/cms_dd.c (+148/-0) crypto/cms/cms_enc.c (+262/-0) crypto/cms/cms_env.c (+825/-0) crypto/cms/cms_err.c (+236/-0) crypto/cms/cms_ess.c (+420/-0) crypto/cms/cms_io.c (+140/-0) crypto/cms/cms_lcl.h (+460/-0) crypto/cms/cms_lib.c (+623/-0) crypto/cms/cms_sd.c (+1014/-0) crypto/cms/cms_smime.c (+811/-0) crypto/comp/Makefile (+1/-1) crypto/comp/c_zlib.c (+390/-1) crypto/comp/comp.h (+14/-0) crypto/comp/comp_err.c (+8/-1) crypto/conf/Makefile (+9/-8) crypto/conf/conf_mall.c (+3/-1) crypto/conf/conf_mod.c (+1/-1) crypto/conf/conf_sap.c (+1/-1) crypto/cryptlib.c (+69/-282) crypto/cryptlib.h (+0/-1) crypto/crypto-lib.com (+18/-14) crypto/crypto.h (+77/-8) crypto/des/Makefile (+19/-14) crypto/des/asm/des_enc.m4 (+231/-114) crypto/des/asm/desboth.pl (+3/-14) crypto/des/des.h (+2/-1) crypto/des/des_enc.c (+4/-0) crypto/des/des_lib.c (+106/-0) crypto/des/des_old.c (+2/-0) crypto/des/des_old.h (+2/-1) crypto/des/ecb_enc.c (+0/-47) crypto/des/enc_read.c (+4/-0) crypto/des/enc_writ.c (+4/-0) crypto/des/set_key.c (+9/-0) crypto/des/times/usparc.cc (+1/-1) crypto/des/xcbc_enc.c (+3/-1) crypto/dh/Makefile (+13/-7) crypto/dh/dh.h (+11/-0) crypto/dh/dh_asn1.c (+1/-1) crypto/dh/dh_check.c (+4/-0) crypto/dh/dh_err.c (+5/-1) crypto/dh/dh_gen.c (+4/-0) crypto/dh/dh_key.c (+4/-0) crypto/dsa/Makefile (+50/-27) crypto/dsa/dsa.h (+39/-0) crypto/dsa/dsa_asn1.c (+80/-2) crypto/dsa/dsa_err.c (+9/-1) crypto/dsa/dsa_gen.c (+3/-0) crypto/dsa/dsa_key.c (+4/-0) crypto/dsa/dsa_lib.c (+27/-22) crypto/dsa/dsa_ossl.c (+3/-0) crypto/dsa/dsa_sign.c (+18/-15) crypto/dsa/dsa_utl.c (+95/-0) crypto/dsa/dsa_vrf.c (+11/-21) crypto/dso/Makefile (+1/-1) crypto/dyn_lck.c (+428/-0) crypto/ec/Makefile (+1/-1) crypto/ec/ec_key.c (+4/-12) crypto/ecdh/Makefile (+23/-12) crypto/ecdsa/Makefile (+33/-16) crypto/ecdsa/ecs_ossl.c (+24/-1) crypto/engine/Makefile (+260/-135) crypto/engine/eng_all.c (+3/-0) crypto/engine/eng_cnf.c (+10/-1) crypto/engine/eng_err.c (+2/-1) crypto/engine/eng_int.h (+2/-0) crypto/engine/eng_padlock.c (+5/-2) crypto/engine/eng_pkey.c (+42/-0) crypto/engine/engine.h (+16/-0) crypto/engine/enginetest.c (+1/-1) crypto/err/Makefile (+35/-14) crypto/err/err.c (+34/-746) crypto/err/err.h (+12/-0) crypto/err/err_all.c (+19/-0) crypto/err/err_bio.c (+75/-0) crypto/err/err_def.c (+665/-0) crypto/err/err_prn.c (+62/-16) crypto/err/err_str.c (+295/-0) crypto/err/openssl.ec (+4/-0) crypto/evp/Makefile (+379/-298) crypto/evp/bio_md.c (+2/-7) crypto/evp/c_alld.c (+3/-0) crypto/evp/dig_eng.c (+180/-0) crypto/evp/digest.c (+132/-26) crypto/evp/e_aes.c (+19/-22) crypto/evp/e_camellia.c (+1/-1) crypto/evp/e_des.c (+6/-3) crypto/evp/e_des3.c (+14/-15) crypto/evp/e_null.c (+1/-1) crypto/evp/e_rc4.c (+1/-0) crypto/evp/enc_min.c (+390/-0) crypto/evp/evp.h (+80/-0) crypto/evp/evp_acnf.c (+1/-1) crypto/evp/evp_cnf.c (+125/-0) crypto/evp/evp_enc.c (+72/-195) crypto/evp/evp_err.c (+15/-1) crypto/evp/evp_lib.c (+19/-20) crypto/evp/evp_locl.h (+23/-7) crypto/evp/evp_pbe.c (+1/-1) crypto/evp/evp_pkey.c (+1/-1) crypto/evp/evp_test.c (+5/-5) crypto/evp/m_dss.c (+1/-1) crypto/evp/m_dss1.c (+3/-0) crypto/evp/m_md2.c (+1/-0) crypto/evp/m_md4.c (+1/-0) crypto/evp/m_md5.c (+1/-0) crypto/evp/m_mdc2.c (+1/-0) crypto/evp/m_sha.c (+1/-0) crypto/evp/m_sha1.c (+6/-1) crypto/evp/names.c (+7/-0) crypto/evp/p5_crpt.c (+1/-1) crypto/evp/p5_crpt2.c (+1/-1) crypto/evp/p_sign.c (+18/-6) crypto/evp/p_verify.c (+21/-9) crypto/fips_err.c (+7/-0) crypto/fips_err.h (+137/-0) crypto/hmac/Makefile (+8/-7) crypto/hmac/hmac.c (+10/-0) crypto/hmac/hmac.h (+1/-0) crypto/idea/Makefile (+6/-2) crypto/idea/i_skey.c (+18/-1) crypto/idea/idea.h (+3/-0) crypto/install.com (+5/-4) crypto/jpake/Makefile (+64/-0) crypto/jpake/jpake.c (+483/-0) crypto/jpake/jpake.h (+129/-0) crypto/jpake/jpake_err.c (+105/-0) crypto/jpake/jpaketest.c (+192/-0) crypto/krb5/Makefile (+1/-1) crypto/lhash/Makefile (+1/-1) crypto/md2/Makefile (+4/-2) crypto/md2/md2.h (+3/-0) crypto/md2/md2_dgst.c (+6/-1) crypto/md32_common.h (+80/-295) crypto/md4/Makefile (+8/-4) crypto/md4/md4.h (+3/-0) crypto/md4/md4_dgst.c (+6/-90) crypto/md4/md4_locl.h (+0/-44) crypto/md5/Makefile (+8/-22) crypto/md5/asm/md5-586.pl (+1/-1) crypto/md5/asm/md5-sparcv9.S (+0/-1031) crypto/md5/asm/md5-x86_64.pl (+4/-4) crypto/md5/md5.h (+3/-0) crypto/md5/md5_dgst.c (+6/-107) crypto/md5/md5_locl.h (+3/-51) crypto/mdc2/Makefile (+1/-1) crypto/mdc2/mdc2.h (+3/-1) crypto/mdc2/mdc2dgst.c (+6/-1) crypto/mem.c (+46/-1) crypto/mem_dbg.c (+25/-3) crypto/o_init.c (+86/-0) crypto/o_str.c (+4/-0) crypto/objects/Makefile (+9/-9) crypto/objects/obj_dat.c (+1/-0) crypto/objects/obj_dat.h (+1759/-1271) crypto/objects/obj_dat.pl (+3/-1) crypto/objects/obj_mac.h (+343/-1) crypto/objects/obj_mac.num (+79/-0) crypto/objects/objects.txt (+124/-2) crypto/ocsp/Makefile (+43/-38) crypto/ocsp/ocsp.h (+13/-4) crypto/ocsp/ocsp_asn.c (+1/-1) crypto/ocsp/ocsp_err.c (+2/-1) crypto/ocsp/ocsp_ht.c (+393/-94) crypto/ocsp/ocsp_srv.c (+1/-1) crypto/ocsp/ocsp_vfy.c (+1/-1) crypto/opensslconf.h (+35/-6) crypto/opensslconf.h.in (+15/-0) crypto/opensslv.h (+3/-3) crypto/ossl_typ.h (+9/-0) crypto/pem/Makefile (+69/-65) crypto/pem/pem.h (+6/-0) crypto/pem/pem_all.c (+174/-0) crypto/pem/pem_info.c (+1/-1) crypto/pem/pem_lib.c (+3/-0) crypto/pem/pem_x509.c (+1/-1) crypto/pem/pem_xaux.c (+1/-1) crypto/perlasm/cbc.pl (+4/-20) crypto/perlasm/x86_64-xlate.pl (+65/-17) crypto/perlasm/x86ms.pl (+12/-2) crypto/perlasm/x86nasm.pl (+4/-0) crypto/perlasm/x86unix.pl (+3/-72) crypto/pkcs12/Makefile (+92/-85) crypto/pkcs12/p12_add.c (+1/-1) crypto/pkcs12/p12_asn.c (+1/-1) crypto/pkcs12/p12_attr.c (+1/-1) crypto/pkcs12/p12_crpt.c (+1/-1) crypto/pkcs12/p12_crt.c (+32/-10) crypto/pkcs12/p12_decr.c (+1/-1) crypto/pkcs12/p12_init.c (+1/-1) crypto/pkcs12/p12_key.c (+1/-1) crypto/pkcs12/p12_kiss.c (+1/-1) crypto/pkcs12/p12_mutl.c (+1/-1) crypto/pkcs12/p12_npas.c (+1/-1) crypto/pkcs12/p12_p8d.c (+1/-1) crypto/pkcs12/p12_p8e.c (+1/-1) crypto/pkcs12/p12_utl.c (+1/-1) crypto/pkcs12/pkcs12.h (+1/-1) crypto/pkcs7/Makefile (+23/-20) crypto/pkcs7/pk7_asn1.c (+1/-1) crypto/pkcs7/pk7_attr.c (+1/-1) crypto/pkcs7/pk7_mime.c (+2/-53) crypto/pkcs7/pk7_smime.c (+3/-3) crypto/ppccpuid.pl (+94/-0) crypto/pqueue/Makefile (+1/-1) crypto/pqueue/pq_compat.h (+5/-0) crypto/pqueue/pqueue.c (+0/-14) crypto/pqueue/pqueue.h (+0/-1) crypto/rand/Makefile (+57/-29) crypto/rand/md_rand.c (+12/-2) crypto/rand/rand.h (+28/-1) crypto/rand/rand_eng.c (+152/-0) crypto/rand/rand_err.c (+19/-1) crypto/rand/rand_lcl.h (+11/-0) crypto/rand/rand_lib.c (+70/-1) crypto/rand/rand_nw.c (+9/-2) crypto/rand/rand_unix.c (+1/-1) crypto/rand/randfile.c (+50/-20) crypto/rc2/Makefile (+6/-2) crypto/rc2/rc2.h (+3/-1) crypto/rc2/rc2_skey.c (+18/-1) crypto/rc4/Makefile (+15/-5) crypto/rc4/asm/rc4-586.pl (+2/-2) crypto/rc4/asm/rc4-x86_64.pl (+129/-3) crypto/rc4/rc4.h (+3/-0) crypto/rc4/rc4_fblk.c (+75/-0) crypto/rc4/rc4_skey.c (+18/-3) crypto/rc5/Makefile (+1/-1) crypto/rc5/rc5.h (+4/-1) crypto/rc5/rc5_skey.c (+19/-2) crypto/ripemd/Makefile (+8/-3) crypto/ripemd/README (+1/-1) crypto/ripemd/asm/rmd-586.pl (+2/-2) crypto/ripemd/ripemd.h (+3/-1) crypto/ripemd/rmd_dgst.c (+6/-202) crypto/ripemd/rmd_locl.h (+1/-15) crypto/rsa/Makefile (+54/-23) crypto/rsa/rsa.h (+41/-0) crypto/rsa/rsa_asn1.c (+1/-1) crypto/rsa/rsa_eay.c (+50/-43) crypto/rsa/rsa_eng.c (+348/-0) crypto/rsa/rsa_err.c (+9/-1) crypto/rsa/rsa_gen.c (+3/-0) crypto/rsa/rsa_lib.c (+16/-256) crypto/rsa/rsa_null.c (+1/-1) crypto/rsa/rsa_oaep.c (+16/-9) crypto/rsa/rsa_pss.c (+3/-3) crypto/rsa/rsa_sign.c (+22/-2) crypto/rsa/rsa_ssl.c (+1/-1) crypto/rsa/rsa_x931.c (+1/-1) crypto/rsa/rsa_x931g.c (+255/-0) crypto/s390xcpuid.S (+90/-0) crypto/seed/Makefile (+1/-1) crypto/sha/Makefile (+26/-14) crypto/sha/asm/sha1-586.pl (+115/-326) crypto/sha/asm/sha1-ia64.pl (+56/-295) crypto/sha/asm/sha1-x86_64.pl (+242/-0) crypto/sha/asm/sha512-ia64.pl (+331/-90) crypto/sha/asm/sha512-x86_64.pl (+344/-0) crypto/sha/sha.h (+3/-1) crypto/sha/sha1_one.c (+1/-1) crypto/sha/sha1dgst.c (+4/-0) crypto/sha/sha256.c (+33/-60) crypto/sha/sha512.c (+83/-32) crypto/sha/sha_dgst.c (+6/-0) crypto/sha/sha_locl.h (+64/-223) crypto/sha/shatest.c (+3/-3) crypto/sparcv9cap.c (+154/-0) crypto/stack/Makefile (+1/-1) crypto/stack/safestack.h (+177/-1) crypto/store/Makefile (+9/-9) crypto/symhacks.h (+26/-0) crypto/txt_db/Makefile (+1/-1) crypto/ui/Makefile (+1/-1) crypto/ui/ui_lib.c (+1/-0) crypto/ui/ui_openssl.c (+2/-0) crypto/x509/Makefile (+105/-94) crypto/x509/by_dir.c (+4/-0) crypto/x509/x509.h (+12/-1) crypto/x509/x509_att.c (+35/-8) crypto/x509/x509_cmp.c (+9/-2) crypto/x509/x509_trs.c (+1/-1) crypto/x509/x509_vfy.c (+16/-9) crypto/x509/x509_vpm.c (+14/-4) crypto/x509/x509cset.c (+1/-1) crypto/x509/x509spki.c (+1/-1) crypto/x509v3/Makefile (+238/-219) crypto/x509v3/ext_dat.h (+1/-1) crypto/x509v3/pcy_cache.c (+1/-1) crypto/x509v3/pcy_data.c (+9/-1) crypto/x509v3/pcy_int.h (+1/-1) crypto/x509v3/pcy_lib.c (+1/-1) crypto/x509v3/pcy_map.c (+1/-1) crypto/x509v3/pcy_node.c (+1/-1) crypto/x509v3/pcy_tree.c (+11/-9) crypto/x509v3/tabtest.c (+1/-1) crypto/x509v3/v3_addr.c (+26/-20) crypto/x509v3/v3_akey.c (+1/-1) crypto/x509v3/v3_akeya.c (+1/-1) crypto/x509v3/v3_alt.c (+3/-2) crypto/x509v3/v3_asid.c (+1/-1) crypto/x509v3/v3_bcons.c (+1/-1) crypto/x509v3/v3_bitst.c (+1/-1) crypto/x509v3/v3_conf.c (+1/-1) crypto/x509v3/v3_cpols.c (+7/-2) crypto/x509v3/v3_crld.c (+1/-1) crypto/x509v3/v3_enum.c (+1/-1) crypto/x509v3/v3_extku.c (+1/-1) crypto/x509v3/v3_genn.c (+1/-1) crypto/x509v3/v3_ia5.c (+1/-1) crypto/x509v3/v3_info.c (+1/-1) crypto/x509v3/v3_int.c (+1/-1) crypto/x509v3/v3_lib.c (+1/-1) crypto/x509v3/v3_ncons.c (+1/-1) crypto/x509v3/v3_ocsp.c (+1/-1) crypto/x509v3/v3_pcons.c (+1/-1) crypto/x509v3/v3_pku.c (+1/-1) crypto/x509v3/v3_pmaps.c (+1/-1) crypto/x509v3/v3_prn.c (+1/-1) crypto/x509v3/v3_purp.c (+5/-3) crypto/x509v3/v3_skey.c (+1/-1) crypto/x509v3/v3_sxnet.c (+1/-1) crypto/x509v3/v3_utl.c (+26/-2) crypto/x509v3/v3conf.c (+1/-1) crypto/x509v3/v3prin.c (+1/-1) crypto/x509v3/x509v3.h (+5/-2) crypto/x86_64cpuid.S (+0/-74) crypto/x86_64cpuid.pl (+61/-44) crypto/x86cpuid.pl (+30/-2) debian/changelog (+96/-0) debian/control (+2/-2) debian/patches/Bsymbolic-functions.patch (+63/-0) debian/patches/CVE-2009-1377.patch (+48/-0) debian/patches/CVE-2009-1378.patch (+22/-0) debian/patches/CVE-2009-1379.patch (+20/-0) debian/patches/CVE-2009-1387.patch (+51/-0) debian/patches/CVE-2009-2409.patch (+33/-0) debian/patches/CVE-2009-3555.patch (+118/-0) debian/patches/ca.patch (+32/-0) debian/patches/config-hurd.patch (+15/-0) debian/patches/debian-targets.patch (+53/-0) debian/patches/disable-sslv2.patch (+48/-0) debian/patches/engines-path.patch (+47/-0) debian/patches/kfreebsd-pipe.patch (+13/-0) debian/patches/make-targets.patch (+13/-0) debian/patches/man-dir.patch (+13/-0) debian/patches/man-section.patch (+32/-0) debian/patches/no-rpath.patch (+13/-0) debian/patches/no-symbolic.patch (+13/-0) debian/patches/no_check_self_signed.patch (+39/-0) debian/patches/pic.patch (+330/-0) debian/patches/pk7_mime_free.patch (+20/-0) debian/patches/pkg-config.patch (+34/-0) debian/patches/rc4-amd64.patch (+14/-0) debian/patches/rehash-crt.patch (+33/-0) debian/patches/rehash_pod.patch (+60/-0) debian/patches/series (+30/-0) debian/patches/shared-lib-ext.patch (+14/-0) debian/patches/stddef.patch (+12/-0) debian/patches/tls_ext_v3.patch (+31/-0) debian/patches/valgrind.patch (+15/-0) debian/patches/version-script.patch (+33/-0) debian/rules (+15/-4) demos/asn1/ocsp.c (+1/-1) demos/engines/cluster_labs/hw_cluster_labs_err.h (+4/-0) demos/engines/ibmca/hw_ibmca_err.h (+4/-0) demos/engines/zencod/hw_zencod_err.h (+4/-0) demos/jpake/Makefile (+7/-0) demos/jpake/jpakedemo.c (+469/-0) doc/Makefile (+0/-40) doc/apps/c_rehash.pod (+0/-55) doc/apps/dgst.pod (+5/-0) doc/apps/ocsp.pod (+4/-4) doc/apps/rand.pod (+5/-0) doc/apps/s_server.pod (+8/-0) doc/apps/verify.pod (+1/-1) doc/apps/x509.pod (+1/-1) doc/c-indentation.el (+1/-0) doc/crypto/ASN1_generate_nconf.pod (+24/-15) doc/crypto/DH_set_method.pod (+1/-1) doc/crypto/DSA_set_method.pod (+1/-1) doc/crypto/OPENSSL_ia32cap.pod (+22/-14) doc/crypto/RAND_egd.pod (+5/-2) doc/crypto/RAND_set_rand_method.pod (+1/-1) doc/crypto/RSA_set_method.pod (+1/-1) doc/crypto/engine.pod (+3/-3) doc/ssl/SSL_CIPHER_get_name.pod (+1/-1) doc/ssl/SSL_CTX_set_verify.pod (+1/-1) doc/ssl/SSL_SESSION_free.pod (+1/-1) doc/ssl/SSL_free.pod (+1/-1) doc/ssl/SSL_read.pod (+6/-0) doc/ssleay.txt (+2/-2) e_os.h (+57/-11) engines/Makefile (+128/-76) engines/e_4758cca_err.h (+4/-0) engines/e_aep.c (+10/-3) engines/e_aep_err.h (+4/-0) engines/e_atalla_err.h (+4/-0) engines/e_capi.c (+1781/-0) engines/e_capi.ec (+1/-0) engines/e_capi_err.c (+183/-0) engines/e_capi_err.h (+123/-0) engines/e_chil.c (+3/-9) engines/e_chil_err.c (+0/-1) engines/e_chil_err.h (+4/-1) engines/e_cswift_err.h (+4/-0) engines/e_gmp.c (+64/-23) engines/e_gmp_err.h (+4/-0) engines/e_nuron_err.h (+4/-0) engines/e_sureware_err.h (+4/-0) engines/e_ubsec_err.h (+4/-0) engines/makeengines.com (+2/-1) engines/openssl.ld (+0/-5) fips/Makefile (+226/-0) fips/aes/Makefile (+111/-0) fips/aes/fips_aes_selftest.c (+101/-0) fips/aes/fips_aesavs.c (+939/-0) fips/des/Makefile (+111/-0) fips/des/fips_des_selftest.c (+137/-0) fips/des/fips_desmovs.c (+705/-0) fips/dh/Makefile (+115/-0) fips/dh/dh_gen.c (+179/-0) fips/dh/fips_dh_check.c (+147/-0) fips/dh/fips_dh_gen.c (+192/-0) fips/dh/fips_dh_key.c (+276/-0) fips/dh/fips_dh_lib.c (+95/-0) fips/dsa/Makefile (+191/-0) fips/dsa/fips_dsa_gen.c (+339/-0) fips/dsa/fips_dsa_key.c (+169/-0) fips/dsa/fips_dsa_lib.c (+95/-0) fips/dsa/fips_dsa_ossl.c (+435/-0) fips/dsa/fips_dsa_selftest.c (+180/-0) fips/dsa/fips_dsa_sign.c (+256/-0) fips/dsa/fips_dsatest.c (+271/-0) fips/dsa/fips_dssvs.c (+542/-0) fips/fips-lib.com (+1196/-0) fips/fips-nodiff.txt (+7/-0) fips/fips.c (+519/-0) fips/fips.h (+163/-0) fips/fips_canister.c (+186/-0) fips/fips_locl.h (+73/-0) fips/fips_premain.c (+176/-0) fips/fips_premain.c.sha1 (+1/-0) fips/fips_test_suite.c (+588/-0) fips/fips_utl.h (+343/-0) fips/fipsalgtest.pl (+848/-0) fips/fipsld (+170/-0) fips/fipstests.bat (+229/-0) fips/fipstests.sh (+400/-0) fips/hmac/Makefile (+123/-0) fips/hmac/fips_hmac.c (+191/-0) fips/hmac/fips_hmac_selftest.c (+135/-0) fips/hmac/fips_hmactest.c (+328/-0) fips/install.com (+57/-0) fips/mkfipsscr.pl (+632/-0) fips/openssl_fips_fingerprint (+31/-0) fips/rand/Makefile (+149/-0) fips/rand/fips_rand.c (+410/-0) fips/rand/fips_rand.h (+77/-0) fips/rand/fips_rand_selftest.c (+371/-0) fips/rand/fips_randtest.c (+248/-0) fips/rand/fips_rngvs.c (+230/-0) fips/rsa/Makefile (+215/-0) fips/rsa/fips_rsa_eay.c (+934/-0) fips/rsa/fips_rsa_gen.c (+310/-0) fips/rsa/fips_rsa_lib.c (+101/-0) fips/rsa/fips_rsa_selftest.c (+432/-0) fips/rsa/fips_rsa_sign.c (+554/-0) fips/rsa/fips_rsa_x931g.c (+280/-0) fips/rsa/fips_rsagtest.c (+390/-0) fips/rsa/fips_rsastest.c (+370/-0) fips/rsa/fips_rsavtest.c (+377/-0) fips/sha/Makefile (+158/-0) fips/sha/fips_sha1_selftest.c (+97/-0) fips/sha/fips_shatest.c (+388/-0) fips/sha/fips_standalone_sha1.c (+173/-0) makevms.com (+6/-4) ms/do_fips.bat (+204/-0) ms/do_masm.bat (+67/-70) ms/do_nasm.bat (+1/-0) ms/segrenam.pl (+65/-0) ms/test.bat (+190/-195) openssl.ld (+0/-5) openssl.spec (+1/-1) ssl/Makefile (+146/-100) ssl/d1_both.c (+21/-33) ssl/d1_clnt.c (+1/-2) ssl/d1_enc.c (+12/-7) ssl/d1_lib.c (+1/-0) ssl/d1_pkt.c (+18/-8) ssl/d1_srvr.c (+3/-3) ssl/dtls1.h (+7/-0) ssl/kssl.c (+2/-2) ssl/s23_clnt.c (+18/-0) ssl/s23_srvr.c (+9/-0) ssl/s2_srvr.c (+1/-1) ssl/s3_clnt.c (+135/-11) ssl/s3_enc.c (+4/-0) ssl/s3_lib.c (+76/-20) ssl/s3_pkt.c (+8/-1) ssl/s3_srvr.c (+123/-29) ssl/ssl.h (+52/-4) ssl/ssl3.h (+5/-0) ssl/ssl_algs.c (+3/-0) ssl/ssl_asn1.c (+10/-7) ssl/ssl_ciph.c (+14/-1) ssl/ssl_err.c (+6/-1) ssl/ssl_lib.c (+55/-0) ssl/ssl_locl.h (+9/-1) ssl/ssl_rsa.c (+2/-0) ssl/ssl_sess.c (+22/-0) ssl/ssl_stat.c (+4/-0) ssl/ssltest.c (+31/-10) ssl/t1_enc.c (+27/-15) ssl/t1_lib.c (+272/-34) ssl/tls1.h (+36/-3) test/CAss.cnf (+1/-1) test/Makefile (+397/-79) test/SHAmix.r (+99/-0) test/SHAmix.x (+129/-0) test/Uss.cnf (+1/-1) test/cms-examples.pl (+409/-0) test/cms-test.pl (+453/-0) test/igetest.c (+2/-2) test/smcont.txt (+1/-0) test/smime-certs/smdsa1.pem (+34/-0) test/smime-certs/smdsa2.pem (+34/-0) test/smime-certs/smdsa3.pem (+34/-0) test/smime-certs/smdsap.pem (+9/-0) test/smime-certs/smroot.pem (+30/-0) test/smime-certs/smrsa1.pem (+31/-0) test/smime-certs/smrsa2.pem (+31/-0) test/smime-certs/smrsa3.pem (+31/-0) test/testfipsssl (+113/-0) test/tests.com (+11/-1) test/times (+1/-1) tools/c_rehash.in (+3/-9) util/arx.pl (+15/-0) util/copy.pl (+11/-0) util/domd (+1/-1) util/fipslink.pl (+78/-0) util/libeay.num (+244/-40) util/mk1mf.pl (+393/-70) util/mkdef.pl (+28/-2) util/mkerr.pl (+4/-3) util/mkfiles.pl (+11/-0) util/mklink.pl (+10/-2) util/mksdef.pl (+87/-0) util/opensslwrap.sh (+4/-0) util/pl/VC-32.pl (+182/-26) util/pl/netware.pl (+283/-98) util/ssleay.num (+1/-0) |
To merge this branch: | bzr merge lp:~nvalcarcel/ubuntu/lucid/openssl/openssl-merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Registry Administrators | Pending | ||
Review via email: mp+15720@code.launchpad.net |
Commit message
Description of the change
Nicolas Valcarcel (nvalcarcel) wrote : | # |
- 36. By Nicolas Valcarcel
-
* Disable CVE-2009-3555.patch
* Bump the shlibs to require 0.9.8k-1. The following symbols
to added between g and k: AES_wrap_key, AES_unwrap_key,
ASN1_TYPE_set1, ASN1_STRING_set0, asn1_output_data_fn,
SMIME_read_ASN1, BN_X931_generate_ Xpq, BN_X931_ derive_ prime_ex,
BN_X931_generate_ prime_ex, COMP_zlib_cleanup, CRYPTO_ malloc_ debug_init,
int_CRYPTO_set_do_ dynlock_ callback, CRYPTO_ set_mem_ info_functions,
CRYPTO_strdup, CRYPTO_dbg_push_ info, CRYPTO_ dbg_pop_ info,
CRYPTO_dbg_remove_ all_info, OPENSSL_isservice, OPENSSL_init,
ENGINE_set_load_ ssl_client_ cert_function,
ENGINE_get_ssl_ client_ cert_function, ENGINE_ load_ssl_ client_ cert,
EVP_CIPHER_CTX_set_ flags, EVP_CIPHER_ CTX_clear_ flags,
EVP_CIPHER_CTX_test_ flags, HMAC_CTX_set_flags, OCSP_sendreq_new
OCSP_sendreq_ nbio, OCSP_REQ_CTX_free, RSA_X931_derive_ex,
RSA_X931_generate_ key_ex, X509_ALGOR_set0, X509_ALGOR_get0,
X509at_get0_data_ by_OBJ, X509_get1_ocsp - 37. By Nicolas Valcarcel
-
Fix version
- 38. By Nicolas Valcarcel
-
add disable-sslv2.patch and Bsymbolic-
functions. patch - 39. By Nicolas Valcarcel
-
Move runtime libraries to /lib, for the benefit of wpasupplicant
James Westby (james-w) wrote : | # |
Marking as merged as 0.9.8k is in lucid.
Thanks,
James
Preview Diff
1 | === added directory '.pc' |
2 | === added file '.pc/.version' |
3 | --- .pc/.version 1970-01-01 00:00:00 +0000 |
4 | +++ .pc/.version 2009-12-07 19:46:11 +0000 |
5 | @@ -0,0 +1,1 @@ |
6 | +2 |
7 | |
8 | === modified file 'CHANGES' |
9 | --- CHANGES 2007-12-05 00:13:39 +0000 |
10 | +++ CHANGES 2009-12-07 19:46:11 +0000 |
11 | @@ -2,6 +2,284 @@ |
12 | OpenSSL CHANGES |
13 | _______________ |
14 | |
15 | + Changes between 0.9.8j and 0.9.8k [25 Mar 2009] |
16 | + |
17 | + *) Don't set val to NULL when freeing up structures, it is freed up by |
18 | + underlying code. If sizeof(void *) > sizeof(long) this can result in |
19 | + zeroing past the valid field. (CVE-2009-0789) |
20 | + [Paolo Ganci <Paolo.Ganci@AdNovum.CH>] |
21 | + |
22 | + *) Fix bug where return value of CMS_SignerInfo_verify_content() was not |
23 | + checked correctly. This would allow some invalid signed attributes to |
24 | + appear to verify correctly. (CVE-2009-0591) |
25 | + [Ivan Nestlerode <inestlerode@us.ibm.com>] |
26 | + |
27 | + *) Reject UniversalString and BMPString types with invalid lengths. This |
28 | + prevents a crash in ASN1_STRING_print_ex() which assumes the strings have |
29 | + a legal length. (CVE-2009-0590) |
30 | + [Steve Henson] |
31 | + |
32 | + *) Set S/MIME signing as the default purpose rather than setting it |
33 | + unconditionally. This allows applications to override it at the store |
34 | + level. |
35 | + [Steve Henson] |
36 | + |
37 | + *) Permit restricted recursion of ASN1 strings. This is needed in practice |
38 | + to handle some structures. |
39 | + [Steve Henson] |
40 | + |
41 | + *) Improve efficiency of mem_gets: don't search whole buffer each time |
42 | + for a '\n' |
43 | + [Jeremy Shapiro <jnshapir@us.ibm.com>] |
44 | + |
45 | + *) New -hex option for openssl rand. |
46 | + [Matthieu Herrb] |
47 | + |
48 | + *) Print out UTF8String and NumericString when parsing ASN1. |
49 | + [Steve Henson] |
50 | + |
51 | + *) Support NumericString type for name components. |
52 | + [Steve Henson] |
53 | + |
54 | + *) Allow CC in the environment to override the automatically chosen |
55 | + compiler. Note that nothing is done to ensure flags work with the |
56 | + chosen compiler. |
57 | + [Ben Laurie] |
58 | + |
59 | + Changes between 0.9.8i and 0.9.8j [07 Jan 2009] |
60 | + |
61 | + *) Properly check EVP_VerifyFinal() and similar return values |
62 | + (CVE-2008-5077). |
63 | + [Ben Laurie, Bodo Moeller, Google Security Team] |
64 | + |
65 | + *) Enable TLS extensions by default. |
66 | + [Ben Laurie] |
67 | + |
68 | + *) Allow the CHIL engine to be loaded, whether the application is |
69 | + multithreaded or not. (This does not release the developer from the |
70 | + obligation to set up the dynamic locking callbacks.) |
71 | + [Sander Temme <sander@temme.net>] |
72 | + |
73 | + *) Use correct exit code if there is an error in dgst command. |
74 | + [Steve Henson; problem pointed out by Roland Dirlewanger] |
75 | + |
76 | + *) Tweak Configure so that you need to say "experimental-jpake" to enable |
77 | + JPAKE, and need to use -DOPENSSL_EXPERIMENTAL_JPAKE in applications. |
78 | + [Bodo Moeller] |
79 | + |
80 | + *) Add experimental JPAKE support, including demo authentication in |
81 | + s_client and s_server. |
82 | + [Ben Laurie] |
83 | + |
84 | + *) Set the comparison function in v3_addr_canonize(). |
85 | + [Rob Austein <sra@hactrn.net>] |
86 | + |
87 | + *) Add support for XMPP STARTTLS in s_client. |
88 | + [Philip Paeps <philip@freebsd.org>] |
89 | + |
90 | + *) Change the server-side SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG behavior |
91 | + to ensure that even with this option, only ciphersuites in the |
92 | + server's preference list will be accepted. (Note that the option |
93 | + applies only when resuming a session, so the earlier behavior was |
94 | + just about the algorithm choice for symmetric cryptography.) |
95 | + [Bodo Moeller] |
96 | + |
97 | + Changes between 0.9.8h and 0.9.8i [15 Sep 2008] |
98 | + |
99 | + *) Fix a state transitition in s3_srvr.c and d1_srvr.c |
100 | + (was using SSL3_ST_CW_CLNT_HELLO_B, should be ..._ST_SW_SRVR_...). |
101 | + [Nagendra Modadugu] |
102 | + |
103 | + *) The fix in 0.9.8c that supposedly got rid of unsafe |
104 | + double-checked locking was incomplete for RSA blinding, |
105 | + addressing just one layer of what turns out to have been |
106 | + doubly unsafe triple-checked locking. |
107 | + |
108 | + So now fix this for real by retiring the MONT_HELPER macro |
109 | + in crypto/rsa/rsa_eay.c. |
110 | + |
111 | + [Bodo Moeller; problem pointed out by Marius Schilder] |
112 | + |
113 | + *) Various precautionary measures: |
114 | + |
115 | + - Avoid size_t integer overflow in HASH_UPDATE (md32_common.h). |
116 | + |
117 | + - Avoid a buffer overflow in d2i_SSL_SESSION() (ssl_asn1.c). |
118 | + (NB: This would require knowledge of the secret session ticket key |
119 | + to exploit, in which case you'd be SOL either way.) |
120 | + |
121 | + - Change bn_nist.c so that it will properly handle input BIGNUMs |
122 | + outside the expected range. |
123 | + |
124 | + - Enforce the 'num' check in BN_div() (bn_div.c) for non-BN_DEBUG |
125 | + builds. |
126 | + |
127 | + [Neel Mehta, Bodo Moeller] |
128 | + |
129 | + *) Allow engines to be "soft loaded" - i.e. optionally don't die if |
130 | + the load fails. Useful for distros. |
131 | + [Ben Laurie and the FreeBSD team] |
132 | + |
133 | + *) Add support for Local Machine Keyset attribute in PKCS#12 files. |
134 | + [Steve Henson] |
135 | + |
136 | + *) Fix BN_GF2m_mod_arr() top-bit cleanup code. |
137 | + [Huang Ying] |
138 | + |
139 | + *) Expand ENGINE to support engine supplied SSL client certificate functions. |
140 | + |
141 | + This work was sponsored by Logica. |
142 | + [Steve Henson] |
143 | + |
144 | + *) Add CryptoAPI ENGINE to support use of RSA and DSA keys held in Windows |
145 | + keystores. Support for SSL/TLS client authentication too. |
146 | + Not compiled unless enable-capieng specified to Configure. |
147 | + |
148 | + This work was sponsored by Logica. |
149 | + [Steve Henson] |
150 | + |
151 | + *) Fix bug in X509_ATTRIBUTE creation: dont set attribute using |
152 | + ASN1_TYPE_set1 if MBSTRING flag set. This bug would crash certain |
153 | + attribute creation routines such as certifcate requests and PKCS#12 |
154 | + files. |
155 | + [Steve Henson] |
156 | + |
157 | + Changes between 0.9.8g and 0.9.8h [28 May 2008] |
158 | + |
159 | + *) Fix flaw if 'Server Key exchange message' is omitted from a TLS |
160 | + handshake which could lead to a cilent crash as found using the |
161 | + Codenomicon TLS test suite (CVE-2008-1672) |
162 | + [Steve Henson, Mark Cox] |
163 | + |
164 | + *) Fix double free in TLS server name extensions which could lead to |
165 | + a remote crash found by Codenomicon TLS test suite (CVE-2008-0891) |
166 | + [Joe Orton] |
167 | + |
168 | + *) Clear error queue in SSL_CTX_use_certificate_chain_file() |
169 | + |
170 | + Clear the error queue to ensure that error entries left from |
171 | + older function calls do not interfere with the correct operation. |
172 | + [Lutz Jaenicke, Erik de Castro Lopo] |
173 | + |
174 | + *) Remove root CA certificates of commercial CAs: |
175 | + |
176 | + The OpenSSL project does not recommend any specific CA and does not |
177 | + have any policy with respect to including or excluding any CA. |
178 | + Therefore it does not make any sense to ship an arbitrary selection |
179 | + of root CA certificates with the OpenSSL software. |
180 | + [Lutz Jaenicke] |
181 | + |
182 | + *) RSA OAEP patches to fix two separate invalid memory reads. |
183 | + The first one involves inputs when 'lzero' is greater than |
184 | + 'SHA_DIGEST_LENGTH' (it would read about SHA_DIGEST_LENGTH bytes |
185 | + before the beginning of from). The second one involves inputs where |
186 | + the 'db' section contains nothing but zeroes (there is a one-byte |
187 | + invalid read after the end of 'db'). |
188 | + [Ivan Nestlerode <inestlerode@us.ibm.com>] |
189 | + |
190 | + *) Partial backport from 0.9.9-dev: |
191 | + |
192 | + Introduce bn_mul_mont (dedicated Montgomery multiplication |
193 | + procedure) as a candidate for BIGNUM assembler implementation. |
194 | + While 0.9.9-dev uses assembler for various architectures, only |
195 | + x86_64 is available by default here in the 0.9.8 branch, and |
196 | + 32-bit x86 is available through a compile-time setting. |
197 | + |
198 | + To try the 32-bit x86 assembler implementation, use Configure |
199 | + option "enable-montasm" (which exists only for this backport). |
200 | + |
201 | + As "enable-montasm" for 32-bit x86 disclaims code stability |
202 | + anyway, in this constellation we activate additional code |
203 | + backported from 0.9.9-dev for further performance improvements, |
204 | + namely BN_from_montgomery_word. (To enable this otherwise, |
205 | + e.g. x86_64, try "-DMONT_FROM_WORD___NON_DEFAULT_0_9_8_BUILD".) |
206 | + |
207 | + [Andy Polyakov (backport partially by Bodo Moeller)] |
208 | + |
209 | + *) Add TLS session ticket callback. This allows an application to set |
210 | + TLS ticket cipher and HMAC keys rather than relying on hardcoded fixed |
211 | + values. This is useful for key rollover for example where several key |
212 | + sets may exist with different names. |
213 | + [Steve Henson] |
214 | + |
215 | + *) Reverse ENGINE-internal logic for caching default ENGINE handles. |
216 | + This was broken until now in 0.9.8 releases, such that the only way |
217 | + a registered ENGINE could be used (assuming it initialises |
218 | + successfully on the host) was to explicitly set it as the default |
219 | + for the relevant algorithms. This is in contradiction with 0.9.7 |
220 | + behaviour and the documentation. With this fix, when an ENGINE is |
221 | + registered into a given algorithm's table of implementations, the |
222 | + 'uptodate' flag is reset so that auto-discovery will be used next |
223 | + time a new context for that algorithm attempts to select an |
224 | + implementation. |
225 | + [Ian Lister (tweaked by Geoff Thorpe)] |
226 | + |
227 | + *) Backport of CMS code to OpenSSL 0.9.8. This differs from the 0.9.9 |
228 | + implemention in the following ways: |
229 | + |
230 | + Lack of EVP_PKEY_ASN1_METHOD means algorithm parameters have to be |
231 | + hard coded. |
232 | + |
233 | + Lack of BER streaming support means one pass streaming processing is |
234 | + only supported if data is detached: setting the streaming flag is |
235 | + ignored for embedded content. |
236 | + |
237 | + CMS support is disabled by default and must be explicitly enabled |
238 | + with the enable-cms configuration option. |
239 | + [Steve Henson] |
240 | + |
241 | + *) Update the GMP engine glue to do direct copies between BIGNUM and |
242 | + mpz_t when openssl and GMP use the same limb size. Otherwise the |
243 | + existing "conversion via a text string export" trick is still used. |
244 | + [Paul Sheer <paulsheer@gmail.com>] |
245 | + |
246 | + *) Zlib compression BIO. This is a filter BIO which compressed and |
247 | + uncompresses any data passed through it. |
248 | + [Steve Henson] |
249 | + |
250 | + *) Add AES_wrap_key() and AES_unwrap_key() functions to implement |
251 | + RFC3394 compatible AES key wrapping. |
252 | + [Steve Henson] |
253 | + |
254 | + *) Add utility functions to handle ASN1 structures. ASN1_STRING_set0(): |
255 | + sets string data without copying. X509_ALGOR_set0() and |
256 | + X509_ALGOR_get0(): set and retrieve X509_ALGOR (AlgorithmIdentifier) |
257 | + data. Attribute function X509at_get0_data_by_OBJ(): retrieves data |
258 | + from an X509_ATTRIBUTE structure optionally checking it occurs only |
259 | + once. ASN1_TYPE_set1(): set and ASN1_TYPE structure copying supplied |
260 | + data. |
261 | + [Steve Henson] |
262 | + |
263 | + *) Fix BN flag handling in RSA_eay_mod_exp() and BN_MONT_CTX_set() |
264 | + to get the expected BN_FLG_CONSTTIME behavior. |
265 | + [Bodo Moeller (Google)] |
266 | + |
267 | + *) Netware support: |
268 | + |
269 | + - fixed wrong usage of ioctlsocket() when build for LIBC BSD sockets |
270 | + - fixed do_tests.pl to run the test suite with CLIB builds too (CLIB_OPT) |
271 | + - added some more tests to do_tests.pl |
272 | + - fixed RunningProcess usage so that it works with newer LIBC NDKs too |
273 | + - removed usage of BN_LLONG for CLIB builds to avoid runtime dependency |
274 | + - added new Configure targets netware-clib-bsdsock, netware-clib-gcc, |
275 | + netware-clib-bsdsock-gcc, netware-libc-bsdsock-gcc |
276 | + - various changes to netware.pl to enable gcc-cross builds on Win32 |
277 | + platform |
278 | + - changed crypto/bio/b_sock.c to work with macro functions (CLIB BSD) |
279 | + - various changes to fix missing prototype warnings |
280 | + - fixed x86nasm.pl to create correct asm files for NASM COFF output |
281 | + - added AES, WHIRLPOOL and CPUID assembler code to build files |
282 | + - added missing AES assembler make rules to mk1mf.pl |
283 | + - fixed order of includes in apps/ocsp.c so that e_os.h settings apply |
284 | + [Guenter Knauf <eflash@gmx.net>] |
285 | + |
286 | + *) Implement certificate status request TLS extension defined in RFC3546. |
287 | + A client can set the appropriate parameters and receive the encoded |
288 | + OCSP response via a callback. A server can query the supplied parameters |
289 | + and set the encoded OCSP response in the callback. Add simplified examples |
290 | + to s_client and s_server. |
291 | + [Steve Henson] |
292 | + |
293 | Changes between 0.9.8f and 0.9.8g [19 Oct 2007] |
294 | |
295 | *) Fix various bugs: |
296 | @@ -167,6 +445,10 @@ |
297 | authentication-only ciphersuites. |
298 | [Bodo Moeller] |
299 | |
300 | + *) Update the SSL_get_shared_ciphers() fix CVE-2006-3738 which was |
301 | + not complete and could lead to a possible single byte overflow |
302 | + (CVE-2007-5135) [Ben Laurie] |
303 | + |
304 | Changes between 0.9.8d and 0.9.8e [23 Feb 2007] |
305 | |
306 | *) Since AES128 and AES256 (and similarly Camellia128 and |
307 | |
308 | === removed file 'ChangeLog.0_9_7-stable_not-in-head' |
309 | --- ChangeLog.0_9_7-stable_not-in-head 2005-12-13 21:37:42 +0000 |
310 | +++ ChangeLog.0_9_7-stable_not-in-head 1970-01-01 00:00:00 +0000 |
311 | @@ -1,163 +0,0 @@ |
312 | -This file, together with ChangeLog.0_9_7-stable_not-in-head_FIPS, |
313 | -provides a collection of those CVS change log entries for the |
314 | -0.9.7 branch (OpenSSL_0_9_7-stable) that do not appear similarly in |
315 | -0.9.8-dev (CVS head). |
316 | - |
317 | -ChangeLog.0_9_7-stable_not-in-head_FIPS - "FIPS" related changes |
318 | -ChangeLog.0_9_7-stable_not-in-head - everything else |
319 | - |
320 | -Some obvious false positives have been eliminated: e.g., we do not |
321 | -care about a simple "make update"; and we don't care about changes |
322 | -identified to the 0.9.7 branch that were explicitly identified as |
323 | -backports from head. |
324 | - |
325 | -Eliminating all other entries (and finally this file and its |
326 | -compantion), either as false positives or as things that should go |
327 | -into 0.9.8, remains to be done. Any additional changes to 0.9.7 that |
328 | -are not immediately put into 0.9.8, but belong there as well, should |
329 | -be added to the end of this file. |
330 | - |
331 | - |
332 | -2002-11-04 17:33 levitte |
333 | - |
334 | - Changed: |
335 | - Configure (1.314.2.38), "Exp", lines: +4 -2 |
336 | - |
337 | - Return my normal debug targets to something not so extreme, and |
338 | - make the extreme ones special (or 'extreme', if you will :-)). |
339 | - |
340 | -2002-12-16 19:17 appro |
341 | - |
342 | - Changed: |
343 | - crypto/bn/bn_lcl.h (1.23.2.3), "Exp", lines: +3 -0 |
344 | - crypto/bn/bn_mul.c (1.28.2.4), "Exp", lines: +84 -445 |
345 | - |
346 | - This is rollback to 0.9.6h bn_mul.c to address problem reported in |
347 | - RT#272. |
348 | - |
349 | -2003-07-27 15:46 ben |
350 | - |
351 | - Changed: |
352 | - crypto/aes/aes.h (1.1.2.5), "Exp", lines: +3 -0 |
353 | - crypto/aes/aes_cfb.c (1.1.2.4), "Exp", lines: +57 -0 |
354 | - |
355 | - Add untested CFB-r mode. Will be tested soon. |
356 | - |
357 | -2003-07-28 17:07 ben |
358 | - |
359 | - Changed: |
360 | - Makefile.org (1.154.2.69), "Exp", lines: +5 -1 |
361 | - crypto/aes/aes.h (1.1.2.6), "Exp", lines: +3 -0 |
362 | - crypto/aes/aes_cfb.c (1.1.2.5), "Exp", lines: +19 -0 |
363 | - crypto/dsa/Makefile.ssl (1.49.2.6), "Exp", lines: +3 -2 |
364 | - crypto/err/Makefile.ssl (1.48.2.4), "Exp", lines: +17 -16 |
365 | - crypto/evp/e_aes.c (1.6.2.5), "Exp", lines: +8 -0 |
366 | - crypto/evp/e_des.c (1.5.2.2), "Exp", lines: +1 -1 |
367 | - crypto/evp/e_des3.c (1.8.2.3), "Exp", lines: +2 -2 |
368 | - crypto/evp/evp.h (1.86.2.11), "Exp", lines: +28 -11 |
369 | - crypto/evp/evp_locl.h (1.7.2.3), "Exp", lines: +2 -2 |
370 | - crypto/objects/obj_dat.h (1.49.2.13), "Exp", lines: +10 -5 |
371 | - crypto/objects/obj_mac.h (1.19.2.13), "Exp", lines: +5 -0 |
372 | - crypto/objects/obj_mac.num (1.15.2.9), "Exp", lines: +1 -0 |
373 | - crypto/objects/objects.txt (1.20.2.14), "Exp", lines: +4 -0 |
374 | - fips/Makefile.ssl (1.1.2.3), "Exp", lines: +7 -0 |
375 | - fips/aes/Makefile.ssl (1.1.2.2), "Exp", lines: +23 -1 |
376 | - fips/aes/fips_aesavs.c (1.1.2.3), "Exp", lines: +9 -1 |
377 | - test/Makefile.ssl (1.84.2.30), "Exp", lines: +101 -43 |
378 | - |
379 | - Add support for partial CFB modes, make tests work, update |
380 | - dependencies. |
381 | - |
382 | -2003-07-29 12:56 ben |
383 | - |
384 | - Changed: |
385 | - crypto/aes/aes_cfb.c (1.1.2.6), "Exp", lines: +9 -6 |
386 | - crypto/evp/c_allc.c (1.8.2.3), "Exp", lines: +1 -0 |
387 | - crypto/evp/evp_test.c (1.14.2.11), "Exp", lines: +17 -8 |
388 | - crypto/evp/evptests.txt (1.9.2.2), "Exp", lines: +48 -1 |
389 | - |
390 | - Working CFB1 and test vectors. |
391 | - |
392 | -2003-07-29 15:24 ben |
393 | - |
394 | - Changed: |
395 | - crypto/evp/e_aes.c (1.6.2.6), "Exp", lines: +14 -0 |
396 | - crypto/objects/obj_dat.h (1.49.2.14), "Exp", lines: +15 -5 |
397 | - crypto/objects/obj_mac.h (1.19.2.14), "Exp", lines: +10 -0 |
398 | - crypto/objects/obj_mac.num (1.15.2.10), "Exp", lines: +2 -0 |
399 | - crypto/objects/objects.txt (1.20.2.15), "Exp", lines: +2 -0 |
400 | - fips/aes/Makefile.ssl (1.1.2.3), "Exp", lines: +1 -1 |
401 | - fips/aes/fips_aesavs.c (1.1.2.4), "Exp", lines: +34 -19 |
402 | - |
403 | - The rest of the keysizes for CFB1, working AES AVS test for CFB1. |
404 | - |
405 | -2003-07-29 19:05 ben |
406 | - |
407 | - Changed: |
408 | - crypto/aes/aes.h (1.1.2.7), "Exp", lines: +3 -0 |
409 | - crypto/aes/aes_cfb.c (1.1.2.7), "Exp", lines: +14 -0 |
410 | - crypto/evp/c_allc.c (1.8.2.4), "Exp", lines: +1 -0 |
411 | - crypto/evp/e_aes.c (1.6.2.7), "Exp", lines: +4 -9 |
412 | - crypto/evp/evptests.txt (1.9.2.3), "Exp", lines: +48 -0 |
413 | - crypto/objects/obj_dat.h (1.49.2.15), "Exp", lines: +20 -5 |
414 | - crypto/objects/obj_mac.h (1.19.2.15), "Exp", lines: +15 -0 |
415 | - crypto/objects/obj_mac.num (1.15.2.11), "Exp", lines: +3 -0 |
416 | - crypto/objects/objects.txt (1.20.2.16), "Exp", lines: +3 -0 |
417 | - fips/aes/fips_aesavs.c (1.1.2.7), "Exp", lines: +11 -0 |
418 | - |
419 | - AES CFB8. |
420 | - |
421 | -2003-07-30 20:30 ben |
422 | - |
423 | - Changed: |
424 | - Makefile.org (1.154.2.70), "Exp", lines: +16 -5 |
425 | - crypto/des/cfb_enc.c (1.7.2.1), "Exp", lines: +2 -1 |
426 | - crypto/des/des_enc.c (1.11.2.2), "Exp", lines: +4 -0 |
427 | - crypto/evp/e_aes.c (1.6.2.8), "Exp", lines: +7 -14 |
428 | - crypto/evp/e_des.c (1.5.2.3), "Exp", lines: +37 -1 |
429 | - crypto/evp/evp.h (1.86.2.12), "Exp", lines: +6 -0 |
430 | - crypto/evp/evp_locl.h (1.7.2.4), "Exp", lines: +9 -0 |
431 | - crypto/objects/obj_dat.h (1.49.2.16), "Exp", lines: +48 -23 |
432 | - crypto/objects/obj_mac.h (1.19.2.16), "Exp", lines: +31 -6 |
433 | - crypto/objects/obj_mac.num (1.15.2.12), "Exp", lines: +5 -0 |
434 | - crypto/objects/objects.txt (1.20.2.17), "Exp", lines: +12 -6 |
435 | - fips/Makefile.ssl (1.1.2.4), "Exp", lines: +8 -1 |
436 | - fips/fips_make_sha1 (1.1.2.3), "Exp", lines: +3 -0 |
437 | - fips/aes/Makefile.ssl (1.1.2.4), "Exp", lines: +1 -1 |
438 | - fips/des/.cvsignore (1.1.2.1), "Exp", lines: +3 -0 |
439 | - fips/des/Makefile.ssl (1.1.2.1), "Exp", lines: +96 -0 |
440 | - fips/des/fingerprint.sha1 (1.1.2.1), "Exp", lines: +2 -0 |
441 | - fips/des/fips_des_enc.c (1.1.2.1), "Exp", lines: +288 -0 |
442 | - fips/des/fips_des_locl.h (1.1.2.1), "Exp", lines: +428 -0 |
443 | - fips/des/fips_desmovs.c (1.1.2.1), "Exp", lines: +659 -0 |
444 | - |
445 | - Whoops, forgot FIPS DES, also add EVPs for DES CFB1 and 8. |
446 | - |
447 | -2003-08-01 12:25 ben |
448 | - |
449 | - Changed: |
450 | - crypto/des/cfb_enc.c (1.7.2.2), "Exp", lines: +45 -36 |
451 | - crypto/evp/c_allc.c (1.8.2.5), "Exp", lines: +2 -0 |
452 | - crypto/evp/e_des.c (1.5.2.4), "Exp", lines: +8 -3 |
453 | - crypto/evp/evptests.txt (1.9.2.4), "Exp", lines: +6 -0 |
454 | - |
455 | - Fix DES CFB-r. |
456 | - |
457 | -2003-08-01 12:31 ben |
458 | - |
459 | - Changed: |
460 | - crypto/evp/evptests.txt (1.9.2.5), "Exp", lines: +4 -0 |
461 | - |
462 | - DES CFB8 test. |
463 | - |
464 | -2005-04-19 16:21 appro |
465 | - |
466 | - Changed: |
467 | - Configure (1.314.2.117), "Exp", lines: +24 -21 |
468 | - Makefile.org (1.154.2.100), "Exp", lines: +1 -11 |
469 | - TABLE (1.99.2.52), "Exp", lines: +20 -20 |
470 | - apps/Makefile (1.1.4.15), "Exp", lines: +1 -1 |
471 | - test/Makefile (1.1.4.12), "Exp", lines: +1 -1 |
472 | - |
473 | - Enable shared link on HP-UX. |
474 | - |
475 | |
476 | === removed file 'ChangeLog.0_9_7-stable_not-in-head_FIPS' |
477 | --- ChangeLog.0_9_7-stable_not-in-head_FIPS 2005-12-13 21:37:42 +0000 |
478 | +++ ChangeLog.0_9_7-stable_not-in-head_FIPS 1970-01-01 00:00:00 +0000 |
479 | @@ -1,1494 +0,0 @@ |
480 | -See file ChangeLog.0_9_7-stable_not-in-head for explanations. |
481 | -This is the "FIPS"-related part. |
482 | - |
483 | - |
484 | - |
485 | -2003-07-27 19:00 ben |
486 | - |
487 | - Changed: |
488 | - Configure (1.314.2.85), "Exp", lines: +2 -0 |
489 | - Makefile.org (1.154.2.67), "Exp", lines: +12 -3 |
490 | - crypto/cryptlib.c (1.32.2.9), "Exp", lines: +5 -0 |
491 | - crypto/md32_common.h (1.22.2.4), "Exp", lines: +11 -0 |
492 | - crypto/aes/Makefile.ssl (1.4.2.6), "Exp", lines: +2 -1 |
493 | - crypto/aes/aes_core.c (1.1.2.4), "Exp", lines: +4 -0 |
494 | - crypto/des/des.h (1.40.2.4), "Exp", lines: +1 -1 |
495 | - crypto/des/des_old.c (1.11.2.4), "Exp", lines: +1 -1 |
496 | - crypto/des/destest.c (1.30.2.6), "Exp", lines: +2 -2 |
497 | - crypto/des/ecb3_enc.c (1.8.2.1), "Exp", lines: +1 -3 |
498 | - crypto/dsa/Makefile.ssl (1.49.2.5), "Exp", lines: +7 -4 |
499 | - crypto/dsa/dsa_ossl.c (1.12.2.4), "Exp", lines: +2 -0 |
500 | - crypto/dsa/dsa_sign.c (1.10.2.3), "Exp", lines: +12 -0 |
501 | - crypto/dsa/dsa_vrf.c (1.10.2.3), "Exp", lines: +8 -0 |
502 | - crypto/engine/engine.h (1.36.2.6), "Exp", lines: +4 -0 |
503 | - crypto/err/err.h (1.35.2.3), "Exp", lines: +2 -0 |
504 | - crypto/err/err_all.c (1.17.2.2), "Exp", lines: +4 -0 |
505 | - crypto/err/openssl.ec (1.11.2.1), "Exp", lines: +1 -0 |
506 | - crypto/evp/Makefile.ssl (1.64.2.8), "Exp", lines: +8 -7 |
507 | - crypto/evp/c_all.c (1.7.8.7), "Exp", lines: +1 -0 |
508 | - crypto/evp/e_aes.c (1.6.2.4), "Exp", lines: +12 -4 |
509 | - crypto/evp/e_des3.c (1.8.2.2), "Exp", lines: +1 -1 |
510 | - crypto/evp/evp.h (1.86.2.10), "Exp", lines: +2 -0 |
511 | - crypto/evp/evp_err.c (1.23.2.1), "Exp", lines: +3 -1 |
512 | - crypto/md4/Makefile.ssl (1.6.2.4), "Exp", lines: +7 -4 |
513 | - crypto/md5/Makefile.ssl (1.33.2.7), "Exp", lines: +7 -4 |
514 | - crypto/rand/Makefile.ssl (1.56.2.4), "Exp", lines: +17 -15 |
515 | - crypto/rand/md_rand.c (1.69.2.2), "Exp", lines: +9 -0 |
516 | - crypto/rand/rand.h (1.26.2.5), "Exp", lines: +2 -0 |
517 | - crypto/rand/rand_err.c (1.6.2.1), "Exp", lines: +3 -1 |
518 | - crypto/rand/rand_lib.c (1.15.2.2), "Exp", lines: +11 -0 |
519 | - crypto/ripemd/Makefile.ssl (1.25.2.5), "Exp", lines: +7 -2 |
520 | - crypto/sha/Makefile.ssl (1.26.2.5), "Exp", lines: +16 -6 |
521 | - fips/.cvsignore (1.1.2.1), "Exp", lines: +1 -0 |
522 | - fips/Makefile.ssl (1.1.2.1), "Exp", lines: +155 -0 |
523 | - fips/fingerprint.sha1 (1.1.2.1), "Exp", lines: +3 -0 |
524 | - fips/fips.c (1.1.2.1), "Exp", lines: +74 -0 |
525 | - fips/fips.h (1.1.2.1), "Exp", lines: +85 -0 |
526 | - fips/fips_check_sha1 (1.1.2.1), "Exp", lines: +7 -0 |
527 | - fips/fips_err.c (1.1.2.1), "Exp", lines: +96 -0 |
528 | - fips/fips_make_sha1 (1.1.2.1), "Exp", lines: +21 -0 |
529 | - fips/lib (1.1.2.1), "Exp", lines: +0 -0 |
530 | - fips/aes/.cvsignore (1.1.2.1), "Exp", lines: +4 -0 |
531 | - fips/aes/Makefile.ssl (1.1.2.1), "Exp", lines: +95 -0 |
532 | - fips/aes/fingerprint.sha1 (1.1.2.1), "Exp", lines: +2 -0 |
533 | - fips/aes/fips_aes_core.c (1.1.2.1), "Exp", lines: +1260 -0 |
534 | - fips/aes/fips_aes_locl.h (1.1.2.1), "Exp", lines: +85 -0 |
535 | - fips/aes/fips_aesavs.c (1.1.2.1), "Exp", lines: +896 -0 |
536 | - fips/dsa/.cvsignore (1.1.2.1), "Exp", lines: +2 -0 |
537 | - fips/dsa/Makefile.ssl (1.1.2.1), "Exp", lines: +95 -0 |
538 | - fips/dsa/fingerprint.sha1 (1.1.2.1), "Exp", lines: +1 -0 |
539 | - fips/dsa/fips_dsa_ossl.c (1.1.2.1), "Exp", lines: +366 -0 |
540 | - fips/dsa/fips_dsatest.c (1.1.2.1), "Exp", lines: +252 -0 |
541 | - fips/rand/.cvsignore (1.1.2.1), "Exp", lines: +2 -0 |
542 | - fips/rand/Makefile.ssl (1.1.2.1), "Exp", lines: +94 -0 |
543 | - fips/rand/fingerprint.sha1 (1.1.2.1), "Exp", lines: +2 -0 |
544 | - fips/rand/fips_rand.c (1.1.2.1), "Exp", lines: +236 -0 |
545 | - fips/rand/fips_rand.h (1.1.2.1), "Exp", lines: +55 -0 |
546 | - fips/rand/fips_randtest.c (1.1.2.1), "Exp", lines: +348 -0 |
547 | - fips/sha1/.cvsignore (1.1.2.1), "Exp", lines: +3 -0 |
548 | - fips/sha1/Makefile.ssl (1.1.2.1), "Exp", lines: +94 -0 |
549 | - fips/sha1/fingerprint.sha1 (1.1.2.1), "Exp", lines: +3 -0 |
550 | - fips/sha1/fips_md32_common.h (1.1.2.1), "Exp", lines: +637 -0 |
551 | - fips/sha1/fips_sha1dgst.c (1.1.2.1), "Exp", lines: +76 -0 |
552 | - fips/sha1/fips_sha1test.c (1.1.2.1), "Exp", lines: +128 -0 |
553 | - fips/sha1/fips_sha_locl.h (1.1.2.1), "Exp", lines: +472 -0 |
554 | - fips/sha1/fips_standalone_sha1.c (1.1.2.1), "Exp", lines: +101 -0 |
555 | - fips/sha1/standalone.sha1 (1.1.2.1), "Exp", lines: +4 -0 |
556 | - test/Makefile.ssl (1.84.2.29), "Exp", lines: +81 -13 |
557 | - util/mkerr.pl (1.18.2.4), "Exp", lines: +2 -1 |
558 | - |
559 | - Unfinished FIPS stuff for review/improvement. |
560 | - |
561 | -2003-07-27 19:19 ben |
562 | - |
563 | - Changed: |
564 | - fips/fips_check_sha1 (1.1.2.2), "Exp", lines: +1 -1 |
565 | - |
566 | - Use unified diff. |
567 | - |
568 | -2003-07-27 19:23 ben |
569 | - |
570 | - Changed: |
571 | - fips/Makefile.ssl (1.1.2.2), "Exp", lines: +3 -3 |
572 | - fips/fingerprint.sha1 (1.1.2.2), "Exp", lines: +2 -1 |
573 | - fips/fips_make_sha1 (1.1.2.2), "Exp", lines: +1 -1 |
574 | - |
575 | - Build in non-FIPS mode. |
576 | - |
577 | -2003-07-27 23:13 ben |
578 | - |
579 | - Changed: |
580 | - Makefile.org (1.154.2.68), "Exp", lines: +1 -1 |
581 | - fips/fips_check_sha1 (1.1.2.3), "Exp", lines: +2 -1 |
582 | - fips/aes/fips_aesavs.c (1.1.2.2), "Exp", lines: +2 -0 |
583 | - fips/dsa/fips_dsa_ossl.c (1.1.2.2), "Exp", lines: +8 -0 |
584 | - fips/dsa/fips_dsatest.c (1.1.2.2), "Exp", lines: +2 -1 |
585 | - fips/sha1/fingerprint.sha1 (1.1.2.2), "Exp", lines: +1 -1 |
586 | - fips/sha1/fips_sha1dgst.c (1.1.2.2), "Exp", lines: +5 -1 |
587 | - fips/sha1/fips_standalone_sha1.c (1.1.2.2), "Exp", lines: +2 -0 |
588 | - fips/sha1/standalone.sha1 (1.1.2.2), "Exp", lines: +1 -1 |
589 | - |
590 | - Build when not FIPS. |
591 | - |
592 | -2003-07-28 11:56 ben |
593 | - |
594 | - Changed: |
595 | - fips/dsa/fingerprint.sha1 (1.1.2.2), "Exp", lines: +1 -1 |
596 | - fips/sha1/standalone.sha1 (1.1.2.3), "Exp", lines: +1 -1 |
597 | - |
598 | - New fingerprints. |
599 | - |
600 | -2003-07-29 16:06 ben |
601 | - |
602 | - Changed: |
603 | - fips/aes/fips_aesavs.c (1.1.2.5), "Exp", lines: +295 -303 |
604 | - |
605 | - Reformat. |
606 | - |
607 | -2003-07-29 16:34 ben |
608 | - |
609 | - Changed: |
610 | - fips/aes/fips_aesavs.c (1.1.2.6), "Exp", lines: +43 -17 |
611 | - |
612 | - MMT for CFB1 |
613 | - |
614 | -2003-07-29 17:17 ben |
615 | - |
616 | - Changed: |
617 | - fips/fips_err_wrapper.c (1.1.2.1), "Exp", lines: +5 -0 |
618 | - fips/sha1/sha1hashes.txt (1.1.2.1), "Exp", lines: +342 -0 |
619 | - fips/sha1/sha1vectors.txt (1.1.2.1), "Exp", lines: +2293 -0 |
620 | - |
621 | - Missing files. |
622 | - |
623 | -2003-07-31 23:30 levitte |
624 | - |
625 | - Changed: |
626 | - Makefile.org (1.154.2.71), "Exp", lines: +2 -0 |
627 | - |
628 | - If FDIRS is to be treated like SDIRS, let's not forget to |
629 | - initialize it in Makefile.org. |
630 | - |
631 | -2003-07-31 23:41 levitte |
632 | - |
633 | - Changed: |
634 | - fips/sha1/fips_sha1test.c (1.1.2.2), "Exp", lines: +3 -3 |
635 | - |
636 | - No C++ comments in C programs! |
637 | - |
638 | -2003-08-01 15:07 steve |
639 | - |
640 | - Changed: |
641 | - fips/aes/fips_aesavs.c (1.1.2.8), "Exp", lines: +3 -3 |
642 | - |
643 | - Replace C++ style comments. |
644 | - |
645 | -2003-08-03 14:22 ben |
646 | - |
647 | - Changed: |
648 | - fips/des/fips_desmovs.c (1.1.2.2), "Exp", lines: +55 -37 |
649 | - |
650 | - Make tests work (CFB1 still doesn't produce the right answers, |
651 | - strangely). |
652 | - |
653 | -2003-08-08 12:08 levitte |
654 | - |
655 | - Changed: |
656 | - fips/des/fips_des_enc.c (1.1.2.2), "Exp", lines: +9 -0 |
657 | - |
658 | - Avoid clashing with the regular DES functions when not compiling |
659 | - with -DFIPS. This is basically only visible when building with |
660 | - shared library supoort... |
661 | - |
662 | -2003-08-11 11:36 levitte |
663 | - |
664 | - Deleted: |
665 | - fips/sha1/.cvsignore (1.1.2.2) |
666 | - fips/sha1/Makefile.ssl (1.1.2.3) |
667 | - fips/sha1/fingerprint.sha1 (1.1.2.3) |
668 | - fips/sha1/fips_md32_common.h (1.1.2.2) |
669 | - fips/sha1/fips_sha1dgst.c (1.1.2.3) |
670 | - fips/sha1/fips_sha1test.c (1.1.2.3) |
671 | - fips/sha1/fips_sha_locl.h (1.1.2.2) |
672 | - fips/sha1/fips_standalone_sha1.c (1.1.2.3) |
673 | - fips/sha1/sha1hashes.txt (1.1.2.2) |
674 | - fips/sha1/sha1vectors.txt (1.1.2.2) |
675 | - fips/sha1/standalone.sha1 (1.1.2.4) |
676 | - fips/dsa/.cvsignore (1.1.2.2) |
677 | - fips/dsa/Makefile.ssl (1.1.2.2) |
678 | - fips/dsa/fingerprint.sha1 (1.1.2.3) |
679 | - fips/dsa/fips_dsa_ossl.c (1.1.2.3) |
680 | - fips/dsa/fips_dsatest.c (1.1.2.3) |
681 | - fips/rand/.cvsignore (1.1.2.2) |
682 | - fips/rand/Makefile.ssl (1.1.2.2) |
683 | - fips/rand/fingerprint.sha1 (1.1.2.2) |
684 | - fips/rand/fips_rand.c (1.1.2.2) |
685 | - fips/rand/fips_rand.h (1.1.2.2) |
686 | - fips/rand/fips_randtest.c (1.1.2.2) |
687 | - fips/des/.cvsignore (1.1.2.2) |
688 | - fips/des/Makefile.ssl (1.1.2.3) |
689 | - fips/des/fingerprint.sha1 (1.1.2.2) |
690 | - fips/des/fips_des_enc.c (1.1.2.3) |
691 | - fips/des/fips_des_locl.h (1.1.2.2) |
692 | - fips/des/fips_desmovs.c (1.1.2.3) |
693 | - fips/aes/.cvsignore (1.1.2.2) |
694 | - fips/aes/Makefile.ssl (1.1.2.5) |
695 | - fips/aes/fingerprint.sha1 (1.1.2.2) |
696 | - fips/aes/fips_aes_core.c (1.1.2.2) |
697 | - fips/aes/fips_aes_locl.h (1.1.2.2) |
698 | - fips/aes/fips_aesavs.c (1.1.2.9) |
699 | - fips/.cvsignore (1.1.2.2) |
700 | - fips/Makefile.ssl (1.1.2.6) |
701 | - fips/fingerprint.sha1 (1.1.2.3) |
702 | - fips/fips.c (1.1.2.2) |
703 | - fips/fips.h (1.1.2.2) |
704 | - fips/fips_check_sha1 (1.1.2.4) |
705 | - fips/fips_err.c (1.1.2.2) |
706 | - fips/fips_err_wrapper.c (1.1.2.2) |
707 | - fips/fips_make_sha1 (1.1.2.4) |
708 | - fips/lib (1.1.2.2) |
709 | - Changed: |
710 | - util/libeay.num (1.173.2.16), "Exp", lines: +11 -38 |
711 | - util/mkerr.pl (1.18.2.5), "Exp", lines: +1 -2 |
712 | - test/Makefile.ssl (1.84.2.31), "Exp", lines: +54 -180 |
713 | - crypto/ripemd/Makefile.ssl (1.25.2.6), "Exp", lines: +2 -7 |
714 | - crypto/sha/Makefile.ssl (1.26.2.6), "Exp", lines: +6 -16 |
715 | - crypto/rand/Makefile.ssl (1.56.2.5), "Exp", lines: +15 -17 |
716 | - crypto/rand/md_rand.c (1.69.2.3), "Exp", lines: +0 -9 |
717 | - crypto/rand/rand.h (1.26.2.6), "Exp", lines: +0 -2 |
718 | - crypto/rand/rand_err.c (1.6.2.2), "Exp", lines: +1 -3 |
719 | - crypto/rand/rand_lib.c (1.15.2.3), "Exp", lines: +0 -11 |
720 | - crypto/objects/obj_dat.h (1.49.2.18), "Exp", lines: +3 -27 |
721 | - crypto/objects/obj_mac.h (1.19.2.18), "Exp", lines: +0 -32 |
722 | - crypto/objects/obj_mac.num (1.15.2.14), "Exp", lines: +0 -8 |
723 | - crypto/objects/objects.txt (1.20.2.19), "Exp", lines: +0 -11 |
724 | - crypto/md4/Makefile.ssl (1.6.2.5), "Exp", lines: +4 -7 |
725 | - crypto/md5/Makefile.ssl (1.33.2.8), "Exp", lines: +4 -7 |
726 | - crypto/evp/Makefile.ssl (1.64.2.9), "Exp", lines: +7 -8 |
727 | - crypto/evp/c_allc.c (1.8.2.6), "Exp", lines: +0 -4 |
728 | - crypto/evp/e_aes.c (1.6.2.9), "Exp", lines: +4 -22 |
729 | - crypto/evp/e_des.c (1.5.2.5), "Exp", lines: +2 -43 |
730 | - crypto/evp/e_des3.c (1.8.2.4), "Exp", lines: +3 -3 |
731 | - crypto/evp/evp.h (1.86.2.13), "Exp", lines: +11 -36 |
732 | - crypto/evp/evp_err.c (1.23.2.2), "Exp", lines: +1 -3 |
733 | - crypto/evp/evp_lib.c (1.6.8.3), "Exp", lines: +0 -24 |
734 | - crypto/evp/evp_locl.h (1.7.2.5), "Exp", lines: +2 -11 |
735 | - crypto/evp/evp_test.c (1.14.2.12), "Exp", lines: +8 -17 |
736 | - crypto/evp/evptests.txt (1.9.2.6), "Exp", lines: +1 -106 |
737 | - crypto/dsa/Makefile.ssl (1.49.2.7), "Exp", lines: +6 -10 |
738 | - crypto/dsa/dsa_ossl.c (1.12.2.5), "Exp", lines: +0 -2 |
739 | - crypto/dsa/dsa_sign.c (1.10.2.4), "Exp", lines: +0 -12 |
740 | - crypto/dsa/dsa_vrf.c (1.10.2.4), "Exp", lines: +0 -8 |
741 | - crypto/err/Makefile.ssl (1.48.2.5), "Exp", lines: +16 -17 |
742 | - crypto/err/err.h (1.35.2.4), "Exp", lines: +0 -2 |
743 | - crypto/err/err_all.c (1.17.2.3), "Exp", lines: +0 -4 |
744 | - crypto/err/openssl.ec (1.11.2.2), "Exp", lines: +0 -1 |
745 | - crypto/des/des.h (1.40.2.5), "Exp", lines: +1 -1 |
746 | - crypto/des/des_enc.c (1.11.2.3), "Exp", lines: +0 -4 |
747 | - crypto/des/des_old.c (1.11.2.5), "Exp", lines: +1 -1 |
748 | - crypto/des/destest.c (1.30.2.7), "Exp", lines: +2 -2 |
749 | - crypto/des/ecb3_enc.c (1.8.2.2), "Exp", lines: +3 -1 |
750 | - crypto/aes/Makefile.ssl (1.4.2.7), "Exp", lines: +1 -2 |
751 | - crypto/aes/aes.h (1.1.2.8), "Exp", lines: +0 -9 |
752 | - crypto/aes/aes_cfb.c (1.1.2.8), "Exp", lines: +0 -93 |
753 | - crypto/aes/aes_core.c (1.1.2.5), "Exp", lines: +0 -4 |
754 | - crypto/cryptlib.c (1.32.2.10), "Exp", lines: +0 -5 |
755 | - crypto/md32_common.h (1.22.2.5), "Exp", lines: +0 -11 |
756 | - Configure (1.314.2.86), "Exp", lines: +0 -2 |
757 | - Makefile.org (1.154.2.72), "Exp", lines: +8 -34 |
758 | - TABLE (1.99.2.30), "Exp", lines: +0 -50 |
759 | - |
760 | - A new branch for FIPS-related changes has been created with the |
761 | - name OpenSSL-fips-0_9_7-stable. |
762 | - |
763 | - Since the 0.9.7-stable branch is supposed to be in freeze |
764 | - and should only contain bug corrections, this change removes the |
765 | - FIPS changes from that branch. |
766 | - |
767 | -2004-05-11 14:44 ben |
768 | - |
769 | - Deleted: |
770 | - apps/Makefile.ssl (1.100.2.27) |
771 | - crypto/Makefile.ssl (1.84.2.12) |
772 | - crypto/aes/Makefile.ssl (1.4.2.9) |
773 | - crypto/asn1/Makefile.ssl (1.77.2.7) |
774 | - crypto/bf/Makefile.ssl (1.25.2.6) |
775 | - crypto/bio/Makefile.ssl (1.52.2.4) |
776 | - crypto/bn/Makefile.ssl (1.65.2.9) |
777 | - crypto/buffer/Makefile.ssl (1.32.2.4) |
778 | - crypto/cast/Makefile.ssl (1.31.2.6) |
779 | - crypto/comp/Makefile.ssl (1.32.2.4) |
780 | - crypto/conf/Makefile.ssl (1.38.2.8) |
781 | - crypto/des/Makefile.ssl (1.61.2.13) |
782 | - crypto/dh/Makefile.ssl (1.43.2.5) |
783 | - crypto/dsa/Makefile.ssl (1.49.2.9) |
784 | - crypto/dso/Makefile.ssl (1.11.2.4) |
785 | - crypto/ec/Makefile.ssl (1.7.2.4) |
786 | - crypto/engine/Makefile.ssl (1.30.2.13) |
787 | - crypto/err/Makefile.ssl (1.48.2.7) |
788 | - crypto/evp/Makefile.ssl (1.64.2.12) |
789 | - crypto/hmac/Makefile.ssl (1.33.2.6) |
790 | - crypto/idea/Makefile.ssl (1.20.2.4) |
791 | - crypto/krb5/Makefile.ssl (1.5.2.6) |
792 | - crypto/lhash/Makefile.ssl (1.28.2.4) |
793 | - crypto/md2/Makefile.ssl (1.29.2.5) |
794 | - crypto/md4/Makefile.ssl (1.6.2.7) |
795 | - crypto/md5/Makefile.ssl (1.33.2.10) |
796 | - crypto/mdc2/Makefile.ssl (1.30.2.4) |
797 | - crypto/objects/Makefile.ssl (1.46.2.6) |
798 | - crypto/ocsp/Makefile.ssl (1.19.2.7) |
799 | - crypto/pem/Makefile.ssl (1.51.2.5) |
800 | - crypto/pkcs12/Makefile.ssl (1.37.2.5) |
801 | - crypto/pkcs7/Makefile.ssl (1.47.2.5) |
802 | - crypto/rand/Makefile.ssl (1.56.2.8) |
803 | - crypto/rc2/Makefile.ssl (1.20.2.4) |
804 | - crypto/rc4/Makefile.ssl (1.25.2.6) |
805 | - crypto/rc5/Makefile.ssl (1.22.2.6) |
806 | - crypto/ripemd/Makefile.ssl (1.25.2.9) |
807 | - crypto/rsa/Makefile.ssl (1.53.2.6) |
808 | - crypto/sha/Makefile.ssl (1.26.2.9) |
809 | - crypto/stack/Makefile.ssl (1.28.2.4) |
810 | - crypto/txt_db/Makefile.ssl (1.26.2.4) |
811 | - crypto/ui/Makefile.ssl (1.10.2.6) |
812 | - crypto/x509/Makefile.ssl (1.56.2.5) |
813 | - crypto/x509v3/Makefile.ssl (1.62.2.5) |
814 | - ssl/Makefile.ssl (1.53.2.11) |
815 | - test/Makefile.ssl (1.84.2.36) |
816 | - tools/Makefile.ssl (1.9.2.4) |
817 | - Changed: |
818 | - .cvsignore (1.7.6.2), "Exp", lines: +2 -1 |
819 | - Configure (1.314.2.92), "Exp", lines: +38 -8 |
820 | - FAQ (1.61.2.31), "Exp", lines: +1 -1 |
821 | - INSTALL (1.45.2.9), "Exp", lines: +2 -2 |
822 | - INSTALL.W32 (1.30.2.14), "Exp", lines: +9 -4 |
823 | - Makefile.org (1.154.2.78), "Exp", lines: +51 -19 |
824 | - PROBLEMS (1.4.2.10), "Exp", lines: +2 -2 |
825 | - e_os.h (1.56.2.17), "Exp", lines: +20 -1 |
826 | - apps/.cvsignore (1.5.8.1), "Exp", lines: +1 -0 |
827 | - apps/Makefile (1.1.4.1), "Exp", lines: +1147 -0 |
828 | - apps/apps.c (1.49.2.27), "Exp", lines: +0 -10 |
829 | - apps/ca.c (1.102.2.31), "Exp", lines: +0 -10 |
830 | - apps/dgst.c (1.23.2.10), "Exp", lines: +39 -11 |
831 | - apps/openssl.c (1.48.2.9), "Exp", lines: +19 -0 |
832 | - crypto/Makefile (1.1.4.1), "Exp", lines: +217 -0 |
833 | - crypto/cryptlib.c (1.32.2.11), "Exp", lines: +5 -0 |
834 | - crypto/crypto-lib.com (1.53.2.12), "Exp", lines: +1 -1 |
835 | - crypto/md32_common.h (1.22.2.6), "Exp", lines: +12 -0 |
836 | - crypto/aes/Makefile (1.1.4.1), "Exp", lines: +102 -0 |
837 | - crypto/aes/aes.h (1.1.2.9), "Exp", lines: +9 -0 |
838 | - crypto/aes/aes_cfb.c (1.1.2.9), "Exp", lines: +93 -0 |
839 | - crypto/aes/aes_core.c (1.1.2.6), "Exp", lines: +4 -0 |
840 | - crypto/asn1/Makefile (1.1.4.1), "Exp", lines: +1150 -0 |
841 | - crypto/bf/Makefile (1.1.4.1), "Exp", lines: +113 -0 |
842 | - crypto/bio/Makefile (1.1.4.1), "Exp", lines: +214 -0 |
843 | - crypto/bio/bio.h (1.56.2.6), "Exp", lines: +1 -0 |
844 | - crypto/bn/Makefile (1.1.4.1), "Exp", lines: +324 -0 |
845 | - crypto/bn/bntest.c (1.55.2.4), "Exp", lines: +1 -1 |
846 | - crypto/buffer/Makefile (1.1.4.1), "Exp", lines: +92 -0 |
847 | - crypto/cast/Makefile (1.1.4.1), "Exp", lines: +118 -0 |
848 | - crypto/cast/asm/.cvsignore (1.2.8.1), "Exp", lines: +1 -0 |
849 | - crypto/comp/Makefile (1.1.4.1), "Exp", lines: +112 -0 |
850 | - crypto/conf/Makefile (1.1.4.1), "Exp", lines: +181 -0 |
851 | - crypto/des/Makefile (1.1.4.1), "Exp", lines: +314 -0 |
852 | - crypto/des/cfb64ede.c (1.6.2.4), "Exp", lines: +111 -0 |
853 | - crypto/des/des.h (1.40.2.6), "Exp", lines: +5 -1 |
854 | - crypto/des/des_enc.c (1.11.2.4), "Exp", lines: +8 -0 |
855 | - crypto/des/des_old.c (1.11.2.6), "Exp", lines: +1 -1 |
856 | - crypto/des/destest.c (1.30.2.8), "Exp", lines: +2 -2 |
857 | - crypto/des/ecb3_enc.c (1.8.2.3), "Exp", lines: +1 -3 |
858 | - crypto/des/set_key.c (1.18.2.2), "Exp", lines: +4 -0 |
859 | - crypto/dh/Makefile (1.1.4.1), "Exp", lines: +131 -0 |
860 | - crypto/dsa/Makefile (1.1.4.1), "Exp", lines: +173 -0 |
861 | - crypto/dsa/dsa_gen.c (1.19.2.1), "Exp", lines: +4 -1 |
862 | - crypto/dsa/dsa_key.c (1.9.2.1), "Exp", lines: +2 -0 |
863 | - crypto/dsa/dsa_ossl.c (1.12.2.6), "Exp", lines: +2 -0 |
864 | - crypto/dsa/dsa_sign.c (1.10.2.5), "Exp", lines: +12 -0 |
865 | - crypto/dsa/dsa_vrf.c (1.10.2.5), "Exp", lines: +8 -0 |
866 | - crypto/dso/Makefile (1.1.4.1), "Exp", lines: +140 -0 |
867 | - crypto/ec/Makefile (1.1.4.1), "Exp", lines: +126 -0 |
868 | - crypto/engine/Makefile (1.1.4.1), "Exp", lines: +536 -0 |
869 | - crypto/engine/hw_cryptodev.c (1.1.2.6), "Exp", lines: +6 -2 |
870 | - crypto/err/Makefile (1.1.4.1), "Exp", lines: +118 -0 |
871 | - crypto/err/err.h (1.35.2.6), "Exp", lines: +2 -0 |
872 | - crypto/err/err_all.c (1.17.2.4), "Exp", lines: +4 -0 |
873 | - crypto/err/openssl.ec (1.11.2.3), "Exp", lines: +1 -0 |
874 | - crypto/evp/Makefile (1.1.4.1), "Exp", lines: +1057 -0 |
875 | - crypto/evp/bio_md.c (1.11.2.1), "Exp", lines: +6 -0 |
876 | - crypto/evp/c_allc.c (1.8.2.7), "Exp", lines: +8 -0 |
877 | - crypto/evp/e_aes.c (1.6.2.10), "Exp", lines: +22 -4 |
878 | - crypto/evp/e_des.c (1.5.2.8), "Exp", lines: +36 -3 |
879 | - crypto/evp/e_des3.c (1.8.2.7), "Exp", lines: +43 -4 |
880 | - crypto/evp/evp.h (1.86.2.15), "Exp", lines: +39 -11 |
881 | - crypto/evp/evp_err.c (1.23.2.3), "Exp", lines: +3 -1 |
882 | - crypto/evp/evp_lib.c (1.6.8.4), "Exp", lines: +24 -0 |
883 | - crypto/evp/evp_locl.h (1.7.2.6), "Exp", lines: +11 -2 |
884 | - crypto/evp/evp_test.c (1.14.2.13), "Exp", lines: +17 -8 |
885 | - crypto/evp/evptests.txt (1.9.2.7), "Exp", lines: +106 -1 |
886 | - crypto/hmac/Makefile (1.1.4.1), "Exp", lines: +99 -0 |
887 | - crypto/idea/Makefile (1.1.4.1), "Exp", lines: +89 -0 |
888 | - crypto/krb5/Makefile (1.1.4.1), "Exp", lines: +88 -0 |
889 | - crypto/lhash/Makefile (1.1.4.1), "Exp", lines: +91 -0 |
890 | - crypto/md2/Makefile (1.1.4.1), "Exp", lines: +91 -0 |
891 | - crypto/md4/Makefile (1.1.4.1), "Exp", lines: +93 -0 |
892 | - crypto/md5/Makefile (1.1.4.1), "Exp", lines: +129 -0 |
893 | - crypto/mdc2/Makefile (1.1.4.1), "Exp", lines: +96 -0 |
894 | - crypto/objects/Makefile (1.1.4.1), "Exp", lines: +121 -0 |
895 | - crypto/objects/obj_dat.h (1.49.2.19), "Exp", lines: +33 -3 |
896 | - crypto/objects/obj_mac.h (1.19.2.19), "Exp", lines: +40 -0 |
897 | - crypto/objects/obj_mac.num (1.15.2.15), "Exp", lines: +10 -0 |
898 | - crypto/objects/objects.txt (1.20.2.20), "Exp", lines: +13 -0 |
899 | - crypto/ocsp/Makefile (1.1.4.1), "Exp", lines: +291 -0 |
900 | - crypto/pem/Makefile (1.1.4.1), "Exp", lines: +334 -0 |
901 | - crypto/pkcs12/Makefile (1.1.4.1), "Exp", lines: +415 -0 |
902 | - crypto/pkcs7/Makefile (1.1.4.1), "Exp", lines: +241 -0 |
903 | - crypto/rand/Makefile (1.1.4.1), "Exp", lines: +196 -0 |
904 | - crypto/rand/md_rand.c (1.69.2.4), "Exp", lines: +9 -0 |
905 | - crypto/rand/rand.h (1.26.2.7), "Exp", lines: +3 -0 |
906 | - crypto/rand/rand_err.c (1.6.2.3), "Exp", lines: +4 -1 |
907 | - crypto/rand/rand_lib.c (1.15.2.4), "Exp", lines: +11 -0 |
908 | - crypto/rc2/Makefile (1.1.4.1), "Exp", lines: +89 -0 |
909 | - crypto/rc4/Makefile (1.1.4.1), "Exp", lines: +108 -0 |
910 | - crypto/rc5/Makefile (1.1.4.1), "Exp", lines: +106 -0 |
911 | - crypto/ripemd/Makefile (1.1.4.1), "Exp", lines: +111 -0 |
912 | - crypto/rsa/Makefile (1.1.4.1), "Exp", lines: +239 -0 |
913 | - crypto/rsa/rsa_eay.c (1.28.2.9), "Exp", lines: +1 -1 |
914 | - crypto/rsa/rsa_gen.c (1.8.6.1), "Exp", lines: +3 -0 |
915 | - crypto/sha/Makefile (1.1.4.1), "Exp", lines: +118 -0 |
916 | - crypto/sha/sha1dgst.c (1.21.2.1), "Exp", lines: +8 -0 |
917 | - crypto/stack/Makefile (1.1.4.1), "Exp", lines: +86 -0 |
918 | - crypto/txt_db/Makefile (1.1.4.1), "Exp", lines: +86 -0 |
919 | - crypto/ui/Makefile (1.1.4.1), "Exp", lines: +115 -0 |
920 | - crypto/x509/Makefile (1.1.4.1), "Exp", lines: +592 -0 |
921 | - crypto/x509v3/Makefile (1.1.4.1), "Exp", lines: +601 -0 |
922 | - fips/Makefile (1.1.4.1), "Exp", lines: +202 -0 |
923 | - fips/fingerprint.sha1 (1.1.2.4), "Exp", lines: +4 -4 |
924 | - fips/fips.c (1.1.2.3), "Exp", lines: +120 -5 |
925 | - fips/fips.h (1.1.2.3), "Exp", lines: +42 -2 |
926 | - fips/fips_check_sha1 (1.1.2.5), "Exp", lines: +2 -2 |
927 | - fips/fips_err.h (1.1.4.1), "Exp", lines: +117 -0 |
928 | - fips/fips_err_wrapper.c (1.1.2.3), "Exp", lines: +4 -2 |
929 | - fips/fips_locl.h (1.1.4.1), "Exp", lines: +62 -0 |
930 | - fips/fips_make_sha1 (1.1.2.5), "Exp", lines: +9 -6 |
931 | - fips/fips_test_suite.c (1.1.4.1), "Exp", lines: +302 -0 |
932 | - fips/openssl_fips_fingerprint (1.1.4.1), "Exp", lines: +25 -0 |
933 | - fips/aes/Makefile (1.1.4.1), "Exp", lines: +131 -0 |
934 | - fips/aes/fingerprint.sha1 (1.1.2.3), "Exp", lines: +3 -2 |
935 | - fips/aes/fips_aes_core.c (1.1.2.3), "Exp", lines: +5 -2 |
936 | - fips/aes/fips_aes_locl.h (1.1.2.3), "Exp", lines: +0 -0 |
937 | - fips/aes/fips_aes_selftest.c (1.1.4.1), "Exp", lines: +112 -0 |
938 | - fips/aes/fips_aesavs.c (1.1.2.10), "Exp", lines: +12 -6 |
939 | - fips/des/Makefile (1.1.4.1), "Exp", lines: +155 -0 |
940 | - fips/des/fingerprint.sha1 (1.1.2.3), "Exp", lines: +5 -2 |
941 | - fips/des/fips_des_enc.c (1.1.2.4), "Exp", lines: +16 -3 |
942 | - fips/des/fips_des_locl.h (1.1.2.3), "Exp", lines: +1 -1 |
943 | - fips/des/fips_des_selftest.c (1.1.4.1), "Exp", lines: +200 -0 |
944 | - fips/des/fips_desmovs.c (1.1.2.4), "Exp", lines: +186 -79 |
945 | - fips/des/fips_set_key.c (1.1.4.1), "Exp", lines: +415 -0 |
946 | - fips/des/asm/fips-dx86-elf.s (1.1.4.1), "Exp", lines: +2697 -0 |
947 | - fips/dsa/Makefile (1.1.4.1), "Exp", lines: +159 -0 |
948 | - fips/dsa/fingerprint.sha1 (1.1.2.4), "Exp", lines: +3 -1 |
949 | - fips/dsa/fips_dsa_gen.c (1.1.4.1), "Exp", lines: +373 -0 |
950 | - fips/dsa/fips_dsa_ossl.c (1.1.2.4), "Exp", lines: +16 -3 |
951 | - fips/dsa/fips_dsa_selftest.c (1.1.4.1), "Exp", lines: +168 -0 |
952 | - fips/dsa/fips_dsatest.c (1.1.2.4), "Exp", lines: +10 -6 |
953 | - fips/dsa/fips_dssvs.c (1.1.4.1), "Exp", lines: +306 -0 |
954 | - fips/rand/Makefile (1.1.4.1), "Exp", lines: +104 -0 |
955 | - fips/rand/fingerprint.sha1 (1.1.2.3), "Exp", lines: +2 -2 |
956 | - fips/rand/fips_rand.c (1.1.2.3), "Exp", lines: +60 -10 |
957 | - fips/rand/fips_rand.h (1.1.2.3), "Exp", lines: +19 -1 |
958 | - fips/rand/fips_randtest.c (1.1.2.3), "Exp", lines: +31 -10 |
959 | - fips/rsa/Makefile (1.1.4.1), "Exp", lines: +112 -0 |
960 | - fips/rsa/fingerprint.sha1 (1.1.4.1), "Exp", lines: +3 -0 |
961 | - fips/rsa/fips_rsa_eay.c (1.1.4.1), "Exp", lines: +735 -0 |
962 | - fips/rsa/fips_rsa_gen.c (1.1.4.1), "Exp", lines: +249 -0 |
963 | - fips/rsa/fips_rsa_selftest.c (1.1.4.1), "Exp", lines: +207 -0 |
964 | - fips/sha1/.cvsignore (1.1.2.3), "Exp", lines: +1 -2 |
965 | - fips/sha1/Makefile (1.1.4.1), "Exp", lines: +158 -0 |
966 | - fips/sha1/fingerprint.sha1 (1.1.2.4), "Exp", lines: +5 -3 |
967 | - fips/sha1/fips_md32_common.h (1.1.2.3), "Exp", lines: +0 -0 |
968 | - fips/sha1/fips_sha1_selftest.c (1.1.4.1), "Exp", lines: +97 -0 |
969 | - fips/sha1/fips_sha1dgst.c (1.1.2.4), "Exp", lines: +4 -4 |
970 | - fips/sha1/fips_sha1test.c (1.1.2.4), "Exp", lines: +17 -0 |
971 | - fips/sha1/fips_sha_locl.h (1.1.2.3), "Exp", lines: +7 -0 |
972 | - fips/sha1/fips_standalone_sha1.c (1.1.2.4), "Exp", lines: +60 -7 |
973 | - fips/sha1/sha1hashes.txt (1.1.2.3), "Exp", lines: +0 -0 |
974 | - fips/sha1/sha1vectors.txt (1.1.2.3), "Exp", lines: +0 -0 |
975 | - fips/sha1/standalone.sha1 (1.1.2.5), "Exp", lines: +6 -4 |
976 | - fips/sha1/asm/sx86-elf.s (1.1.4.1), "Exp", lines: +1568 -0 |
977 | - ms/do_masm.bat (1.1.8.2), "Exp", lines: +12 -10 |
978 | - ms/do_ms.bat (1.4.8.2), "Exp", lines: +11 -11 |
979 | - ms/do_nasm.bat (1.1.8.2), "Exp", lines: +12 -11 |
980 | - ms/do_nt.bat (1.2.8.1), "Exp", lines: +4 -4 |
981 | - shlib/hpux10-cc.sh (1.3.2.2), "Exp", lines: +3 -3 |
982 | - ssl/Makefile (1.1.4.1), "Exp", lines: +1019 -0 |
983 | - ssl/s3_clnt.c (1.53.2.16), "Exp", lines: +10 -0 |
984 | - ssl/s3_srvr.c (1.85.2.21), "Exp", lines: +9 -0 |
985 | - ssl/ssl_cert.c (1.48.2.7), "Exp", lines: +9 -0 |
986 | - ssl/ssl_lib.c (1.110.2.12), "Exp", lines: +13 -1 |
987 | - ssl/ssltest.c (1.53.2.23), "Exp", lines: +33 -1 |
988 | - ssl/t1_enc.c (1.27.2.8), "Exp", lines: +19 -1 |
989 | - test/.cvsignore (1.4.8.1), "Exp", lines: +4 -0 |
990 | - test/Makefile (1.1.4.1), "Exp", lines: +941 -0 |
991 | - test/bctest (1.14.2.1), "Exp", lines: +1 -1 |
992 | - test/testenc (1.3.8.1), "Exp", lines: +1 -1 |
993 | - test/testfipsssl (1.1.4.1), "Exp", lines: +113 -0 |
994 | - tools/Makefile (1.1.4.1), "Exp", lines: +61 -0 |
995 | - util/cygwin.sh (1.1.2.5), "Exp", lines: +3 -3 |
996 | - util/domd (1.6.2.3), "Exp", lines: +5 -5 |
997 | - util/fixNT.sh (1.1.1.2.8.1), "Exp", lines: +3 -3 |
998 | - util/libeay.num (1.173.2.19), "Exp", lines: +55 -11 |
999 | - util/mk1mf.pl (1.41.2.10), "Exp", lines: +6 -4 |
1000 | - util/mkdef.pl (1.67.2.7), "Exp", lines: +11 -4 |
1001 | - util/mkerr.pl (1.18.2.6), "Exp", lines: +2 -1 |
1002 | - util/mkfiles.pl (1.12.2.1), "Exp", lines: +8 -1 |
1003 | - util/pod2mantest (1.1.2.7), "Exp", lines: +1 -1 |
1004 | - util/selftest.pl (1.18.2.1), "Exp", lines: +2 -2 |
1005 | - util/pl/BC-16.pl (1.2.2.1), "Exp", lines: +1 -1 |
1006 | - util/pl/BC-32.pl (1.11.2.4), "Exp", lines: +1 -1 |
1007 | - util/pl/Mingw32.pl (1.12.6.5), "Exp", lines: +1 -1 |
1008 | - util/pl/OS2-EMX.pl (1.1.2.3), "Exp", lines: +1 -1 |
1009 | - util/pl/VC-16.pl (1.3.2.1), "Exp", lines: +2 -2 |
1010 | - util/pl/VC-32.pl (1.11.2.3), "Exp", lines: +2 -2 |
1011 | - util/pl/VC-CE.pl (1.1.2.5), "Exp", lines: +1 -1 |
1012 | - util/pl/ultrix.pl (1.2.8.1), "Exp", lines: +1 -1 |
1013 | - |
1014 | - Pull FIPS back into stable. |
1015 | - |
1016 | -2004-05-12 10:27 levitte |
1017 | - |
1018 | - Changed: |
1019 | - apps/Makefile (1.1.4.2), "Exp", lines: +3 -1 |
1020 | - |
1021 | - Only check for FIPS signatures when FIPS is enabled. |
1022 | - |
1023 | -2004-05-12 10:28 levitte |
1024 | - |
1025 | - Changed: |
1026 | - crypto/des/FILES0 (1.1.4.2), "Exp", lines: +1 -1 |
1027 | - |
1028 | - Makefile.ssl changed name to Makefile. |
1029 | - |
1030 | -2004-05-12 10:28 levitte |
1031 | - |
1032 | - Changed: |
1033 | - fips/rand/fips_rand.c (1.1.2.4), "Exp", lines: +5 -1 |
1034 | - |
1035 | - Only really build this file when OPENSSL_FIPS is defined. And oh, |
1036 | - let's keep internal variables static. |
1037 | - |
1038 | -2004-05-12 10:42 levitte |
1039 | - |
1040 | - Changed: |
1041 | - fips/rand/fingerprint.sha1 (1.1.2.4), "Exp", lines: +1 -1 |
1042 | - |
1043 | - I forgot to modify the signature for fips_rand.c... |
1044 | - |
1045 | -2004-05-12 10:46 levitte |
1046 | - |
1047 | - Changed: |
1048 | - fips/rsa/.cvsignore (1.1.4.1), "Exp", lines: +1 -0 |
1049 | - fips/.cvsignore (1.1.2.3), "Exp", lines: +1 -1 |
1050 | - fips/aes/.cvsignore (1.1.2.3), "Exp", lines: +0 -3 |
1051 | - fips/des/.cvsignore (1.1.2.3), "Exp", lines: +0 -2 |
1052 | - fips/dsa/.cvsignore (1.1.2.3), "Exp", lines: +0 -1 |
1053 | - fips/rand/.cvsignore (1.1.2.3), "Exp", lines: +0 -1 |
1054 | - |
1055 | - Ignore the 'lib' timestamp file. |
1056 | - |
1057 | -2004-05-12 12:07 levitte |
1058 | - |
1059 | - Changed: |
1060 | - fips/.cvsignore (1.1.2.4), "Exp", lines: +1 -0 |
1061 | - fips/aes/.cvsignore (1.1.2.4), "Exp", lines: +1 -0 |
1062 | - fips/des/.cvsignore (1.1.2.4), "Exp", lines: +1 -0 |
1063 | - fips/dsa/.cvsignore (1.1.2.4), "Exp", lines: +1 -0 |
1064 | - fips/rand/.cvsignore (1.1.2.4), "Exp", lines: +1 -0 |
1065 | - fips/rsa/.cvsignore (1.1.4.2), "Exp", lines: +1 -0 |
1066 | - fips/sha1/.cvsignore (1.1.2.4), "Exp", lines: +1 -0 |
1067 | - |
1068 | - Ignore 'Makefile.save' |
1069 | - |
1070 | -2004-05-12 16:11 ben |
1071 | - |
1072 | - Changed: |
1073 | - crypto/rand/rand.h (1.26.2.8), "Exp", lines: +2 -0 |
1074 | - crypto/rand/rand_err.c (1.6.2.4), "Exp", lines: +2 -0 |
1075 | - fips/fingerprint.sha1 (1.1.2.5), "Exp", lines: +1 -1 |
1076 | - fips/fips.c (1.1.2.4), "Exp", lines: +5 -1 |
1077 | - fips/rand/fingerprint.sha1 (1.1.2.5), "Exp", lines: +1 -1 |
1078 | - fips/rand/fips_rand.c (1.1.2.5), "Exp", lines: +29 -0 |
1079 | - |
1080 | - Blow up in people's faces if they don't reseed. |
1081 | - |
1082 | -2004-05-15 19:51 ben |
1083 | - |
1084 | - Changed: |
1085 | - crypto/dh/dh.h (1.23.2.6), "Exp", lines: +1 -0 |
1086 | - crypto/dh/dh_err.c (1.6.2.3), "Exp", lines: +2 -1 |
1087 | - crypto/dh/dh_gen.c (1.8.8.2), "Exp", lines: +9 -0 |
1088 | - fips/fips_test_suite.c (1.1.4.2), "Exp", lines: +4 -3 |
1089 | - fips/aes/fips_aesavs.c (1.1.2.11), "Exp", lines: +49 -1 |
1090 | - fips/des/fingerprint.sha1 (1.1.2.4), "Exp", lines: +1 -1 |
1091 | - fips/des/fips_desmovs.c (1.1.2.5), "Exp", lines: +49 -1 |
1092 | - fips/des/fips_set_key.c (1.1.4.2), "Exp", lines: +2 -0 |
1093 | - fips/sha1/fingerprint.sha1 (1.1.2.5), "Exp", lines: +1 -1 |
1094 | - fips/sha1/fips_md32_common.h (1.1.2.4), "Exp", lines: +3 -0 |
1095 | - fips/sha1/standalone.sha1 (1.1.2.6), "Exp", lines: +1 -1 |
1096 | - |
1097 | - Fix self-tests, ban some things in FIPS mode, fix copyrights. |
1098 | - |
1099 | -2004-05-17 06:28 levitte |
1100 | - |
1101 | - Changed: |
1102 | - util/mk1mf.pl (1.41.2.11), "Exp", lines: +8 -2 |
1103 | - util/pl/BC-16.pl (1.2.2.2), "Exp", lines: +9 -4 |
1104 | - util/pl/BC-32.pl (1.11.2.5), "Exp", lines: +8 -3 |
1105 | - util/pl/Mingw32.pl (1.12.6.6), "Exp", lines: +7 -2 |
1106 | - util/pl/OS2-EMX.pl (1.1.2.4), "Exp", lines: +7 -2 |
1107 | - util/pl/VC-16.pl (1.3.2.2), "Exp", lines: +7 -2 |
1108 | - util/pl/VC-32.pl (1.11.2.4), "Exp", lines: +7 -2 |
1109 | - util/pl/VC-CE.pl (1.1.2.6), "Exp", lines: +7 -2 |
1110 | - util/pl/linux.pl (1.3.6.1), "Exp", lines: +7 -2 |
1111 | - util/pl/ultrix.pl (1.2.8.2), "Exp", lines: +7 -2 |
1112 | - util/pl/unix.pl (1.2.8.1), "Exp", lines: +7 -2 |
1113 | - |
1114 | - Generate SHA1 files on Windows and other platforms supported by |
1115 | - mk1mf.pl, when building in FIPS mode. |
1116 | - |
1117 | - Note: UNTESTED! |
1118 | - |
1119 | -2004-05-17 06:30 levitte |
1120 | - |
1121 | - Changed: |
1122 | - apps/apps.h (1.44.2.14), "Exp", lines: +3 -0 |
1123 | - apps/openssl.c (1.48.2.10), "Exp", lines: +9 -5 |
1124 | - |
1125 | - Make sure the applications know when we are running in FIPS mode. |
1126 | - We can't use the variable in libcrypto, since it's supposedly |
1127 | - unknown. |
1128 | - |
1129 | - Note: currently only supported in MONOLITH mode. |
1130 | - |
1131 | -2004-05-17 06:31 levitte |
1132 | - |
1133 | - Changed: |
1134 | - apps/enc.c (1.35.2.9), "Exp", lines: +10 -1 |
1135 | - |
1136 | - When in FIPS mode, use SHA1 to digest the key, rather than MD5, as |
1137 | - MD5 isn't a FIPS-approved algorithm. |
1138 | - |
1139 | - Note: this means the user needs to keep track of this, and |
1140 | - we need to add support for that... |
1141 | - |
1142 | -2004-05-19 16:16 levitte |
1143 | - |
1144 | - Changed: |
1145 | - fips/rsa/fingerprint.sha1 (1.1.4.2), "Exp", lines: +2 -2 |
1146 | - fips/rsa/fips_rsa_eay.c (1.1.4.2), "Exp", lines: +8 -8 |
1147 | - fips/rsa/fips_rsa_gen.c (1.1.4.2), "Exp", lines: +1 -1 |
1148 | - fips/dsa/fingerprint.sha1 (1.1.2.5), "Exp", lines: +2 -2 |
1149 | - fips/dsa/fips_dsa_gen.c (1.1.4.2), "Exp", lines: +2 -2 |
1150 | - fips/dsa/fips_dsa_ossl.c (1.1.2.5), "Exp", lines: +4 -4 |
1151 | - fips/aes/fingerprint.sha1 (1.1.2.4), "Exp", lines: +1 -1 |
1152 | - fips/aes/fips_aes_core.c (1.1.2.4), "Exp", lines: +5 -5 |
1153 | - crypto/rsa/rsa.h (1.36.2.11), "Exp", lines: +4 -0 |
1154 | - crypto/aes/aes.h (1.1.2.10), "Exp", lines: +6 -0 |
1155 | - crypto/dsa/dsa.h (1.26.2.5), "Exp", lines: +4 -0 |
1156 | - |
1157 | - Define FIPS_*_SIZE_T for AES, DSA and RSA as well, in preparation |
1158 | - for size_t-ification of those algorithms in future version of |
1159 | - OpenSSL... |
1160 | - |
1161 | -2004-05-27 11:33 levitte |
1162 | - |
1163 | - Changed: |
1164 | - makevms.com (1.35.2.3), "Exp", lines: +27 -0 |
1165 | - |
1166 | - Copy the FIPS files to the temporary openssl include directory. |
1167 | - |
1168 | -2004-05-27 12:04 levitte |
1169 | - |
1170 | - Changed: |
1171 | - fips/fips-lib.com (1.1.2.1), "Exp", lines: +1179 -0 |
1172 | - makevms.com (1.35.2.4), "Exp", lines: +8 -0 |
1173 | - |
1174 | - Compile the FIPS directory on VMS as well. fips-lib.com is |
1175 | - essentially a copy of crypto-lib.com, with just a few edits. |
1176 | - |
1177 | -2004-05-27 12:07 levitte |
1178 | - |
1179 | - Changed: |
1180 | - fips/install.com (1.1.2.1), "Exp", lines: +55 -0 |
1181 | - install.com (1.4.2.2), "Exp", lines: +6 -6 |
1182 | - |
1183 | - Run an installation of FIPS stuff as well. |
1184 | - |
1185 | -2004-05-27 12:19 levitte |
1186 | - |
1187 | - Changed: |
1188 | - test/maketests.com (1.13.2.5), "Exp", lines: +3 -3 |
1189 | - apps/makeapps.com (1.18.2.5), "Exp", lines: +3 -3 |
1190 | - |
1191 | - Make sure o_str.h is reachable. |
1192 | - |
1193 | -2004-06-19 15:15 ben |
1194 | - |
1195 | - Changed: |
1196 | - Makefile.org (1.154.2.80), "Exp", lines: +1 -1 |
1197 | - crypto/dh/dh.h (1.23.2.7), "Exp", lines: +0 -1 |
1198 | - crypto/dh/dh_check.c (1.6.2.1), "Exp", lines: +4 -0 |
1199 | - crypto/dh/dh_err.c (1.6.2.4), "Exp", lines: +0 -1 |
1200 | - crypto/dh/dh_gen.c (1.8.8.3), "Exp", lines: +5 -9 |
1201 | - crypto/dh/dh_key.c (1.16.2.3), "Exp", lines: +4 -0 |
1202 | - fips/Makefile (1.1.4.2), "Exp", lines: +13 -14 |
1203 | - fips/fingerprint.sha1 (1.1.2.6), "Exp", lines: +2 -2 |
1204 | - fips/fips.h (1.1.2.4), "Exp", lines: +1 -0 |
1205 | - fips/fips_err.h (1.1.4.2), "Exp", lines: +1 -0 |
1206 | - fips/fips_make_sha1 (1.1.2.6), "Exp", lines: +3 -0 |
1207 | - fips/fips_test_suite.c (1.1.4.3), "Exp", lines: +13 -9 |
1208 | - fips/openssl_fips_fingerprint (1.1.4.2), "Exp", lines: +1 -2 |
1209 | - |
1210 | - The version that was actually submitted for FIPS testing. |
1211 | - |
1212 | -2004-06-19 15:16 ben |
1213 | - |
1214 | - Changed: |
1215 | - fips/dh/Makefile (1.1.2.1), "Exp", lines: +92 -0 |
1216 | - fips/dh/fingerprint.sha1 (1.1.2.1), "Exp", lines: +3 -0 |
1217 | - fips/dh/fips_dh_check.c (1.1.2.1), "Exp", lines: +119 -0 |
1218 | - fips/dh/fips_dh_gen.c (1.1.2.1), "Exp", lines: +182 -0 |
1219 | - fips/dh/fips_dh_key.c (1.1.2.1), "Exp", lines: +222 -0 |
1220 | - |
1221 | - Add Diffie-Hellman to FIPS. |
1222 | - |
1223 | -2004-06-19 15:18 ben |
1224 | - |
1225 | - Changed: |
1226 | - fips/.cvsignore (1.1.2.5), "Exp", lines: +2 -0 |
1227 | - fips/dh/.cvsignore (1.1.2.1), "Exp", lines: +1 -0 |
1228 | - |
1229 | - Update ignores. |
1230 | - |
1231 | -2004-06-21 11:07 levitte |
1232 | - |
1233 | - Changed: |
1234 | - fips/aes/Makefile (1.1.4.2), "Exp", lines: +7 -5 |
1235 | - fips/des/Makefile (1.1.4.2), "Exp", lines: +7 -5 |
1236 | - fips/dh/Makefile (1.1.2.2), "Exp", lines: +7 -6 |
1237 | - fips/dsa/Makefile (1.1.4.2), "Exp", lines: +7 -6 |
1238 | - fips/rsa/Makefile (1.1.4.2), "Exp", lines: +7 -6 |
1239 | - fips/sha1/Makefile (1.1.4.2), "Exp", lines: +7 -5 |
1240 | - |
1241 | - Make sure we don't try to loop over an empty EXHEADER. In the |
1242 | - Makefiles where this was fixed by commenting away code, change it |
1243 | - to check for an empty EXHEADER instead, so we have less hassle in a |
1244 | - future where EXHEADER changes. |
1245 | - |
1246 | - PR: 900 |
1247 | - |
1248 | -2004-06-21 20:05 levitte |
1249 | - |
1250 | - Changed: |
1251 | - Makefile.org (1.154.2.82), "Exp", lines: +3 -1 |
1252 | - |
1253 | - Standard sh doesn't tolerate ! as part of the conditional command. |
1254 | - |
1255 | - PR: 900 |
1256 | - |
1257 | -2004-06-28 22:33 levitte |
1258 | - |
1259 | - Changed: |
1260 | - fips/dh/fips_dh_check.c (1.1.2.2), "Exp", lines: +6 -0 |
1261 | - fips/dh/fips_dh_gen.c (1.1.2.2), "Exp", lines: +6 -2 |
1262 | - fips/dh/fips_dh_key.c (1.1.2.2), "Exp", lines: +8 -0 |
1263 | - |
1264 | - Make sure the FIPS stuff is only really compiled when in FIPS mode. |
1265 | - |
1266 | -2004-07-12 19:59 ben |
1267 | - |
1268 | - Changed: |
1269 | - fips/fips_test_suite.c (1.1.4.4), "Exp", lines: +39 -6 |
1270 | - fips/dh/fingerprint.sha1 (1.1.2.2), "Exp", lines: +3 -3 |
1271 | - |
1272 | - Corrected test program. |
1273 | - |
1274 | -2004-07-17 14:48 appro |
1275 | - |
1276 | - Changed: |
1277 | - fips/des/Makefile (1.1.4.3), "Exp", lines: +1 -1 |
1278 | - |
1279 | - Eliminate enforced -g from CFLAGS. It switches off optimization |
1280 | - with some compilers, e.g. DEC C. |
1281 | - |
1282 | -2004-07-21 19:41 steve |
1283 | - |
1284 | - Changed: |
1285 | - crypto/pem/pem_all.c (1.20.2.1), "Exp", lines: +119 -0 |
1286 | - |
1287 | - When in FIPS mode write private keys in PKCS#8 and PBES2 format to |
1288 | - avoid use of prohibited MD5 algorithm. |
1289 | - |
1290 | -2004-07-23 15:20 ben |
1291 | - |
1292 | - Changed: |
1293 | - fips/rand/fingerprint.sha1 (1.1.2.7), "Exp", lines: +1 -1 |
1294 | - fips/rand/fips_rand.c (1.1.2.7), "Exp", lines: +22 -7 |
1295 | - fips/rand/fips_randtest.c (1.1.2.5), "Exp", lines: +2 -2 |
1296 | - |
1297 | - Convert to X9.31. |
1298 | - |
1299 | -2004-07-21 19:35 steve |
1300 | - |
1301 | - Changed: |
1302 | - fips/fingerprint.sha1 (1.1.2.7), "Exp", lines: +1 -1 |
1303 | - fips/fips.c (1.1.2.5), "Exp", lines: +3 -3 |
1304 | - fips/rsa/fingerprint.sha1 (1.1.4.3), "Exp", lines: +1 -1 |
1305 | - fips/rsa/fips_rsa_selftest.c (1.1.4.2), "Exp", lines: +8 -8 |
1306 | - |
1307 | - Avoid compiler warnings. |
1308 | - |
1309 | -2004-07-27 02:17 steve |
1310 | - |
1311 | - Changed: |
1312 | - fips/fips_test_suite.c (1.1.4.5), "Exp", lines: +9 -8 |
1313 | - |
1314 | - Stop compiler warnings. |
1315 | - |
1316 | -2004-07-27 02:20 steve |
1317 | - |
1318 | - Changed: |
1319 | - crypto/err/err.c (1.51.2.6), "Exp", lines: +1 -0 |
1320 | - |
1321 | - Add FIPS name to error library. |
1322 | - |
1323 | -2004-07-27 14:22 steve |
1324 | - |
1325 | - Changed: |
1326 | - Makefile.org (1.154.2.84), "Exp", lines: +3 -3 |
1327 | - fips/fips_check_sha1 (1.1.2.6), "Exp", lines: +1 -1 |
1328 | - fips/openssl_fips_fingerprint (1.1.4.3), "Exp", lines: +1 -1 |
1329 | - |
1330 | - Rename libcrypto.sha1 to libcrypto.a.sha1 |
1331 | - |
1332 | -2004-07-27 20:28 steve |
1333 | - |
1334 | - Changed: |
1335 | - ssl/s3_lib.c (1.57.2.11), "Exp", lines: +33 -33 |
1336 | - ssl/ssl.h (1.126.2.20), "Exp", lines: +1 -0 |
1337 | - ssl/ssl_ciph.c (1.33.2.9), "Exp", lines: +11 -0 |
1338 | - ssl/ssl_locl.h (1.47.2.3), "Exp", lines: +2 -1 |
1339 | - |
1340 | - New cipher "strength" FIPS which specifies that a cipher suite is |
1341 | - FIPS compatible. |
1342 | - |
1343 | - New cipherstring "FIPS" is all FIPS compatible ciphersuites |
1344 | - except eNULL. |
1345 | - |
1346 | - Only allow FIPS ciphersuites in FIPS mode. |
1347 | - |
1348 | -2004-07-28 04:24 levitte |
1349 | - |
1350 | - Changed: |
1351 | - makevms.com (1.35.2.6), "Exp", lines: +2 -2 |
1352 | - |
1353 | - From the FIPS directory, darnit! |
1354 | - |
1355 | -2004-07-28 15:47 levitte |
1356 | - |
1357 | - Changed: |
1358 | - makevms.com (1.35.2.7), "Exp", lines: +5 -1 |
1359 | - |
1360 | - Define OPENSSL_FIPS in opensslconf.h if a logical name with the |
1361 | - same name is defined. |
1362 | - |
1363 | - Go up one directory level before dealing with FIPS stuff. |
1364 | - |
1365 | -2004-07-30 00:26 levitte |
1366 | - |
1367 | - Changed: |
1368 | - fips/fips-lib.com (1.1.2.2), "Exp", lines: +3 -3 |
1369 | - |
1370 | - We're building crypto stuff, not ssl stuff. Additionally, we're in |
1371 | - the fips subdirectory, not the crypto one... |
1372 | - |
1373 | -2004-07-30 16:37 levitte |
1374 | - |
1375 | - Changed: |
1376 | - fips/sha1/fingerprint.sha1 (1.1.2.7), "Exp", lines: +2 -2 |
1377 | - fips/sha1/fips_md32_common.h (1.1.2.6), "Exp", lines: +1 -1 |
1378 | - fips/sha1/fips_sha_locl.h (1.1.2.5), "Exp", lines: +2 -2 |
1379 | - fips/sha1/fips_standalone_sha1.c (1.1.2.5), "Exp", lines: +1 -1 |
1380 | - fips/sha1/standalone.sha1 (1.1.2.8), "Exp", lines: +3 -3 |
1381 | - ssl/ssl_ciph.c (1.33.2.10), "Exp", lines: +2 -2 |
1382 | - fips/rsa/fingerprint.sha1 (1.1.4.4), "Exp", lines: +2 -2 |
1383 | - fips/rsa/fips_rsa_eay.c (1.1.4.3), "Exp", lines: +1 -1 |
1384 | - fips/rsa/fips_rsa_gen.c (1.1.4.3), "Exp", lines: +1 -1 |
1385 | - fips/dh/fingerprint.sha1 (1.1.2.3), "Exp", lines: +1 -1 |
1386 | - fips/dh/fips_dh_gen.c (1.1.2.3), "Exp", lines: +1 -1 |
1387 | - fips/dsa/fingerprint.sha1 (1.1.2.6), "Exp", lines: +2 -2 |
1388 | - fips/dsa/fips_dsa_gen.c (1.1.4.3), "Exp", lines: +4 -3 |
1389 | - fips/dsa/fips_dsa_ossl.c (1.1.2.6), "Exp", lines: +2 -2 |
1390 | - fips/des/fingerprint.sha1 (1.1.2.5), "Exp", lines: +2 -2 |
1391 | - fips/des/fips_des_enc.c (1.1.2.5), "Exp", lines: +2 -2 |
1392 | - fips/des/fips_set_key.c (1.1.4.3), "Exp", lines: +3 -3 |
1393 | - fips/fingerprint.sha1 (1.1.2.8), "Exp", lines: +2 -2 |
1394 | - fips/fips.c (1.1.2.6), "Exp", lines: +76 -23 |
1395 | - fips/fips.h (1.1.2.5), "Exp", lines: +2 -3 |
1396 | - fips/fips_locl.h (1.1.4.2), "Exp", lines: +7 -2 |
1397 | - fips/aes/fingerprint.sha1 (1.1.2.5), "Exp", lines: +1 -1 |
1398 | - fips/aes/fips_aes_core.c (1.1.2.5), "Exp", lines: +1 -1 |
1399 | - crypto/rand/md_rand.c (1.69.2.5), "Exp", lines: +1 -1 |
1400 | - crypto/rand/rand_lib.c (1.15.2.5), "Exp", lines: +2 -1 |
1401 | - crypto/dsa/dsa_sign.c (1.10.2.6), "Exp", lines: +2 -2 |
1402 | - crypto/dsa/dsa_vrf.c (1.10.2.6), "Exp", lines: +1 -1 |
1403 | - crypto/pem/pem_all.c (1.20.2.2), "Exp", lines: +2 -2 |
1404 | - crypto/cryptlib.c (1.32.2.12), "Exp", lines: +122 -6 |
1405 | - crypto/crypto.h (1.62.2.8), "Exp", lines: +8 -1 |
1406 | - crypto/md32_common.h (1.22.2.7), "Exp", lines: +2 -2 |
1407 | - |
1408 | - To protect FIPS-related global variables, add locking mechanisms |
1409 | - around them. |
1410 | - |
1411 | - NOTE: because two new locks are added, this adds potential |
1412 | - binary incompatibility with earlier versions in the 0.9.7 series. |
1413 | - However, those locks will only ever be touched when FIPS_mode_set() |
1414 | - is called and after, thanks to a variable that's only changed from |
1415 | - 0 to 1 once (when FIPS_mode_set() is called). So basically, as |
1416 | - long as FIPS mode hasn't been engaged explicitely by the calling |
1417 | - application, the new locks are treated as if they didn't exist at |
1418 | - all, thus not becoming a problem. Applications that are built or |
1419 | - rebuilt to use FIPS functionality will need to be recompiled in any |
1420 | - case, thus not being a problem either. |
1421 | - |
1422 | -2004-08-02 16:15 levitte |
1423 | - |
1424 | - Changed: |
1425 | - crypto/cryptlib.c (1.32.2.13), "Exp", lines: +4 -4 |
1426 | - |
1427 | - Let's lock a write lock when changing values, shall we? |
1428 | - |
1429 | - Thanks to Dr Stephen Henson <shenson@drh-consultancy.co.uk> |
1430 | - for making me aware of this error. |
1431 | - |
1432 | -2004-08-05 20:11 steve |
1433 | - |
1434 | - Changed: |
1435 | - fips/fingerprint.sha1 (1.1.2.9), "Exp", lines: +1 -1 |
1436 | - fips/fips.c (1.1.2.7), "Exp", lines: +1 -1 |
1437 | - |
1438 | - Stop compiler giving bogus shadow warning. |
1439 | - |
1440 | -2004-08-09 14:13 levitte |
1441 | - |
1442 | - Changed: |
1443 | - makevms.com (1.35.2.8), "Exp", lines: +1 -1 |
1444 | - |
1445 | - In the fips directory, we use FIPS-LIB.COM, not CRYPTO-LIB.COM... |
1446 | - |
1447 | -2004-08-09 14:14 levitte |
1448 | - |
1449 | - Changed: |
1450 | - fips/fips-lib.com (1.1.2.3), "Exp", lines: +4 -4 |
1451 | - |
1452 | - Correct typos and include directory specifications. |
1453 | - |
1454 | -2004-08-10 11:11 levitte |
1455 | - |
1456 | - Changed: |
1457 | - fips/fips-lib.com (1.1.2.4), "Exp", lines: +2 -1 |
1458 | - |
1459 | - Update the VMS fips library builder with the DH library. |
1460 | - |
1461 | -2004-08-10 12:04 levitte |
1462 | - |
1463 | - Changed: |
1464 | - fips/rand/fingerprint.sha1 (1.1.2.8), "Exp", lines: +1 -1 |
1465 | - fips/rand/fips_rand.c (1.1.2.8), "Exp", lines: +7 -1 |
1466 | - |
1467 | - With DEC C in ANSI C mode, we need to define _XOPEN_SOURCE_EXTENDED |
1468 | - to get struct timeval and gettimeofday(). |
1469 | - |
1470 | -2004-09-06 16:19 levitte |
1471 | - |
1472 | - Changed: |
1473 | - fips/fips.c (1.1.2.8), "Exp", lines: +5 -4 |
1474 | - |
1475 | - Replace the bogus checks of n with proper uses of feof(), ferror() |
1476 | - and clearerr(). |
1477 | - |
1478 | -2004-09-06 16:21 levitte |
1479 | - |
1480 | - Changed: |
1481 | - fips/sha1/fips_sha_locl.h (1.1.2.6), "Exp", lines: +2 -2 |
1482 | - |
1483 | - num is an unsigned long, but since it was transfered from |
1484 | - crypto/sha/sha_locl.h, where it is in fact an int, we need to check |
1485 | - for less-than-zero as if it was an int... |
1486 | - |
1487 | -2004-10-08 12:03 ben |
1488 | - |
1489 | - Changed: |
1490 | - fips/fingerprint.sha1 (1.1.2.10), "Exp", lines: +1 -1 |
1491 | - fips/sha1/fingerprint.sha1 (1.1.2.8), "Exp", lines: +1 -1 |
1492 | - fips/sha1/standalone.sha1 (1.1.2.9), "Exp", lines: +1 -1 |
1493 | - |
1494 | - Update fingerprints. |
1495 | - |
1496 | -2004-10-14 07:51 levitte |
1497 | - |
1498 | - Changed: |
1499 | - VMS/mkshared.com (1.3.2.1), "Exp", lines: +8 -0 |
1500 | - |
1501 | - We need to check for OPENSSL_FIPS when building shared libraries, |
1502 | - so we get correct transfer vectors for those functions when |
1503 | - required. |
1504 | - |
1505 | -2004-10-26 13:47 steve |
1506 | - |
1507 | - Changed: |
1508 | - util/mkfiles.pl (1.12.2.2), "Exp", lines: +1 -0 |
1509 | - |
1510 | - Add fips/dh directory to mkfiles.pl |
1511 | - |
1512 | -2004-10-26 14:17 levitte |
1513 | - |
1514 | - Changed: |
1515 | - fips/sha1/Makefile (1.1.4.4), "Exp", lines: +3 -1 |
1516 | - util/mkfiles.pl (1.12.2.3), "Exp", lines: +1 -0 |
1517 | - fips/Makefile (1.1.4.5), "Exp", lines: +7 -1 |
1518 | - crypto/sha/Makefile (1.1.4.4), "Exp", lines: +1 -7 |
1519 | - |
1520 | - fips/dh was missing in mkfiles.pl. make update |
1521 | - |
1522 | -2004-10-26 15:01 steve |
1523 | - |
1524 | - Changed: |
1525 | - util/mkfiles.pl (1.12.2.4), "Exp", lines: +0 -1 |
1526 | - |
1527 | - Only add fips/dh once... |
1528 | - |
1529 | -2004-11-01 09:20 levitte |
1530 | - |
1531 | - Changed: |
1532 | - fips/rand/fingerprint.sha1 (1.1.2.9), "Exp", lines: +1 -1 |
1533 | - fips/rand/fips_rand.c (1.1.2.9), "Exp", lines: +3 -1 |
1534 | - |
1535 | - Make sure _XOPEN_SOURCE_EXTENDED is correctly defined, and only if |
1536 | - not already defined. |
1537 | - |
1538 | -2004-12-09 19:03 appro |
1539 | - |
1540 | - vChanged: |
1541 | - crypto/Makefile (1.1.4.4), "Exp", lines: +2 -0 |
1542 | - |
1543 | - Postpone linking of shared libcrypto in FIPS build. |
1544 | - |
1545 | -2004-12-09 19:13 appro |
1546 | - |
1547 | - Changed: |
1548 | - fips/fingerprint.sha1 (1.1.2.11), "Exp", lines: +1 -1 |
1549 | - fips/fips.c (1.1.2.9), "Exp", lines: +13 -1 |
1550 | - fips/openssl_fips_fingerprint (1.1.4.4), "Exp", lines: +4 -2 |
1551 | - |
1552 | - Cygwin specific FIPS fix-ups. |
1553 | - |
1554 | -2004-12-09 23:43 appro |
1555 | - |
1556 | - Changed: |
1557 | - Configure (1.314.2.100), "Exp", lines: +2 -3 |
1558 | - crypto/des/des_enc.c (1.11.2.5), "Exp", lines: +2 -2 |
1559 | - |
1560 | - Eliminate false dependency on 386 config option is FIPS context. |
1561 | - At the same time limit assembler support to ELF platforms [that's |
1562 | - what is there, ELF modules]. |
1563 | - |
1564 | -2004-12-10 12:37 appro |
1565 | - |
1566 | - Changed: |
1567 | - Configure (1.314.2.101), "Exp", lines: +10 -3 |
1568 | - crypto/des/des_enc.c (1.11.2.6), "Exp", lines: +2 -2 |
1569 | - |
1570 | - Respect no-asm with fips option and disable FIPS DES assembler in |
1571 | - shared context [because it's not PIC]. |
1572 | - |
1573 | -2004-12-10 14:15 appro |
1574 | - |
1575 | - Changed: |
1576 | - fips/sha1/fingerprint.sha1 (1.1.2.10), "Exp", lines: +1 -1 |
1577 | - fips/sha1/standalone.sha1 (1.1.2.11), "Exp", lines: +1 -1 |
1578 | - fips/sha1/asm/sx86-elf.s (1.1.4.3), "Exp", lines: +32 -32 |
1579 | - |
1580 | - Solaris x86 assembler update. |
1581 | - |
1582 | -2004-12-10 17:30 appro |
1583 | - |
1584 | - Changed: |
1585 | - fips/fips_check_sha1 (1.1.2.7), "Exp", lines: +1 -1 |
1586 | - fips/openssl_fips_fingerprint (1.1.4.5), "Exp", lines: +1 -1 |
1587 | - fips/sha1/Makefile (1.1.4.6), "Exp", lines: +1 -1 |
1588 | - |
1589 | - Adapt FIPS sub-tree for mingw. |
1590 | - |
1591 | -2005-01-03 18:46 steve |
1592 | - |
1593 | - Changed: |
1594 | - fips/rsa/fingerprint.sha1 (1.1.4.5), "Exp", lines: +1 -1 |
1595 | - fips/rsa/fips_rsa_selftest.c (1.1.4.3), "Exp", lines: +55 -11 |
1596 | - |
1597 | - RSA KAT. |
1598 | - |
1599 | -2005-01-11 17:54 levitte |
1600 | - |
1601 | - Changed: |
1602 | - fips/rsa/fingerprint.sha1 (1.1.4.6), "Exp", lines: +1 -1 |
1603 | - fips/rsa/fips_rsa_selftest.c (1.1.4.4), "Exp", lines: +2 -2 |
1604 | - |
1605 | - Clear signed vs. unsigned conflicts. Change the fingerprint |
1606 | - accordingly. |
1607 | - |
1608 | -2005-01-11 19:25 levitte |
1609 | - |
1610 | - Changed: |
1611 | - ssl/ssltest.c (1.53.2.24), "Exp", lines: +2 -2 |
1612 | - fips/rand/fips_randtest.c (1.1.2.6), "Exp", lines: +3 -3 |
1613 | - fips/sha1/fips_sha1test.c (1.1.2.5), "Exp", lines: +10 -4 |
1614 | - fips/des/fips_desmovs.c (1.1.2.6), "Exp", lines: +8 -7 |
1615 | - fips/dsa/fips_dsatest.c (1.1.2.5), "Exp", lines: +2 -2 |
1616 | - apps/openssl.c (1.48.2.12), "Exp", lines: +1 -1 |
1617 | - fips/aes/fips_aesavs.c (1.1.2.12), "Exp", lines: +8 -7 |
1618 | - |
1619 | - Use EXIT() instead of exit(). |
1620 | - |
1621 | -2005-01-26 21:00 steve |
1622 | - |
1623 | - Changed: |
1624 | - apps/dgst.c (1.23.2.13), "Exp", lines: +10 -0 |
1625 | - apps/pkcs12.c (1.60.2.13), "Exp", lines: +8 -1 |
1626 | - crypto/crypto.h (1.62.2.9), "Exp", lines: +49 -0 |
1627 | - crypto/md32_common.h (1.22.2.9), "Exp", lines: +1 -1 |
1628 | - crypto/bf/bf_skey.c (1.6.2.1), "Exp", lines: +2 -1 |
1629 | - crypto/bf/blowfish.h (1.9.2.1), "Exp", lines: +4 -1 |
1630 | - crypto/cast/c_skey.c (1.5.6.1), "Exp", lines: +3 -1 |
1631 | - crypto/cast/cast.h (1.7.2.1), "Exp", lines: +4 -1 |
1632 | - crypto/evp/bio_md.c (1.11.2.3), "Exp", lines: +2 -7 |
1633 | - crypto/evp/digest.c (1.21.2.7), "Exp", lines: +11 -0 |
1634 | - crypto/evp/e_aes.c (1.6.2.11), "Exp", lines: +11 -11 |
1635 | - crypto/evp/e_des.c (1.5.2.9), "Exp", lines: +5 -3 |
1636 | - crypto/evp/e_des3.c (1.8.2.8), "Exp", lines: +6 -6 |
1637 | - crypto/evp/evp.h (1.86.2.16), "Exp", lines: +17 -0 |
1638 | - crypto/evp/evp_enc.c (1.28.2.11), "Exp", lines: +15 -1 |
1639 | - crypto/evp/evp_err.c (1.23.2.4), "Exp", lines: +6 -1 |
1640 | - crypto/evp/evp_locl.h (1.7.2.7), "Exp", lines: +17 -2 |
1641 | - crypto/evp/m_dss.c (1.8.2.1), "Exp", lines: +1 -1 |
1642 | - crypto/evp/m_md2.c (1.9.2.1), "Exp", lines: +1 -0 |
1643 | - crypto/evp/m_md4.c (1.8.2.1), "Exp", lines: +1 -0 |
1644 | - crypto/evp/m_md5.c (1.9.2.1), "Exp", lines: +1 -0 |
1645 | - crypto/evp/m_mdc2.c (1.9.2.1), "Exp", lines: +1 -0 |
1646 | - crypto/evp/m_sha.c (1.8.2.2), "Exp", lines: +1 -0 |
1647 | - crypto/evp/m_sha1.c (1.8.2.1), "Exp", lines: +1 -1 |
1648 | - crypto/evp/names.c (1.7.2.1), "Exp", lines: +3 -0 |
1649 | - crypto/hmac/hmac.c (1.12.2.3), "Exp", lines: +7 -0 |
1650 | - crypto/hmac/hmac.h (1.14.2.2), "Exp", lines: +1 -0 |
1651 | - crypto/idea/i_skey.c (1.5.6.1), "Exp", lines: +13 -0 |
1652 | - crypto/idea/idea.h (1.10.2.1), "Exp", lines: +4 -0 |
1653 | - crypto/md2/md2.h (1.11.2.1), "Exp", lines: +3 -0 |
1654 | - crypto/md2/md2_dgst.c (1.13.2.4), "Exp", lines: +3 -1 |
1655 | - crypto/md4/md4.h (1.3.2.1), "Exp", lines: +3 -0 |
1656 | - crypto/md4/md4_dgst.c (1.2.2.2), "Exp", lines: +1 -1 |
1657 | - crypto/md5/md5.h (1.10.2.3), "Exp", lines: +3 -0 |
1658 | - crypto/md5/md5_dgst.c (1.16.2.2), "Exp", lines: +1 -1 |
1659 | - crypto/mdc2/mdc2.h (1.9.2.1), "Exp", lines: +3 -1 |
1660 | - crypto/mdc2/mdc2dgst.c (1.13.2.1), "Exp", lines: +3 -1 |
1661 | - crypto/rc2/rc2.h (1.10.2.1), "Exp", lines: +4 -1 |
1662 | - crypto/rc2/rc2_skey.c (1.4.6.1), "Exp", lines: +13 -0 |
1663 | - crypto/rc4/rc4.h (1.10.2.2), "Exp", lines: +3 -0 |
1664 | - crypto/rc4/rc4_skey.c (1.10.8.2), "Exp", lines: +2 -1 |
1665 | - crypto/rc5/rc5.h (1.5.2.1), "Exp", lines: +4 -1 |
1666 | - crypto/rc5/rc5_skey.c (1.4.6.1), "Exp", lines: +14 -0 |
1667 | - crypto/ripemd/ripemd.h (1.8.2.1), "Exp", lines: +3 -0 |
1668 | - crypto/ripemd/rmd_dgst.c (1.13.2.2), "Exp", lines: +2 -1 |
1669 | - crypto/sha/sha.h (1.11.2.2), "Exp", lines: +3 -0 |
1670 | - crypto/sha/sha_locl.h (1.16.2.3), "Exp", lines: +4 -0 |
1671 | - crypto/x509/x509_cmp.c (1.22.2.4), "Exp", lines: +7 -1 |
1672 | - crypto/x509/x509_vfy.c (1.56.2.13), "Exp", lines: +1 -1 |
1673 | - ssl/s3_clnt.c (1.53.2.18), "Exp", lines: +2 -0 |
1674 | - ssl/s3_enc.c (1.31.2.9), "Exp", lines: +3 -0 |
1675 | - ssl/s3_srvr.c (1.85.2.23), "Exp", lines: +2 -0 |
1676 | - ssl/t1_enc.c (1.27.2.9), "Exp", lines: +2 -0 |
1677 | - |
1678 | - FIPS algorithm blocking. |
1679 | - |
1680 | - Non FIPS algorithms are not normally allowed in FIPS mode. |
1681 | - |
1682 | - Any attempt to use them via high level functions will |
1683 | - return an error. |
1684 | - |
1685 | - The low level non-FIPS algorithm functions cannot return |
1686 | - errors so they produce assertion failures. HMAC also has to give an |
1687 | - assertion error because it (erroneously) can't return an error |
1688 | - either. |
1689 | - |
1690 | - There are exceptions (such as MD5 in TLS and non |
1691 | - cryptographic use of algorithms) and applications can override the |
1692 | - blocking and use non FIPS algorithms anyway. |
1693 | - |
1694 | - For low level functions the override is perfomed by |
1695 | - prefixing the algorithm initalization function with "private_" for |
1696 | - example private_MD5_Init(). |
1697 | - |
1698 | - For high level functions an override is performed by |
1699 | - setting a flag in the context. |
1700 | - |
1701 | -2005-01-27 02:49 steve |
1702 | - |
1703 | - Changed: |
1704 | - apps/dgst.c (1.23.2.14), "Exp", lines: +9 -5 |
1705 | - crypto/crypto.h (1.62.2.10), "Exp", lines: +3 -0 |
1706 | - crypto/evp/digest.c (1.21.2.8), "Exp", lines: +34 -0 |
1707 | - crypto/hmac/hmac.c (1.12.2.4), "Exp", lines: +9 -0 |
1708 | - |
1709 | - More FIPS algorithm blocking. |
1710 | - |
1711 | - Catch attempted use of non FIPS algorithms with HMAC. |
1712 | - |
1713 | - Give an assertion error for applications that ignore FIPS |
1714 | - digest errors. |
1715 | - |
1716 | - Make -non-fips-allow work with dgst and HMAC. |
1717 | - |
1718 | -2005-01-28 15:03 steve |
1719 | - |
1720 | - Changed: |
1721 | - apps/dgst.c (1.23.2.15), "Exp", lines: +2 -1 |
1722 | - apps/enc.c (1.35.2.13), "Exp", lines: +38 -4 |
1723 | - crypto/evp/e_rc4.c (1.11.2.2), "Exp", lines: +1 -0 |
1724 | - crypto/evp/evp.h (1.86.2.17), "Exp", lines: +3 -0 |
1725 | - crypto/evp/evp_enc.c (1.28.2.12), "Exp", lines: +60 -15 |
1726 | - crypto/evp/evp_locl.h (1.7.2.8), "Exp", lines: +1 -0 |
1727 | - test/testenc (1.3.8.2), "Exp", lines: +8 -8 |
1728 | - |
1729 | - Further FIPS algorithm blocking. |
1730 | - |
1731 | - Fixes to cipher blocking and enabling code. |
1732 | - |
1733 | - Add option -non-fips-allow to 'enc' and update testenc. |
1734 | - |
1735 | -2005-01-31 02:33 steve |
1736 | - |
1737 | - Changed: |
1738 | - ssl/s23_clnt.c (1.20.2.7), "Exp", lines: +16 -0 |
1739 | - ssl/s23_srvr.c (1.41.2.6), "Exp", lines: +9 -0 |
1740 | - ssl/s3_clnt.c (1.53.2.19), "Exp", lines: +0 -8 |
1741 | - ssl/s3_enc.c (1.31.2.10), "Exp", lines: +1 -0 |
1742 | - ssl/s3_srvr.c (1.85.2.24), "Exp", lines: +0 -8 |
1743 | - ssl/ssl.h (1.126.2.21), "Exp", lines: +1 -0 |
1744 | - ssl/ssl_cert.c (1.48.2.10), "Exp", lines: +0 -8 |
1745 | - ssl/ssl_err.c (1.41.2.4), "Exp", lines: +2 -1 |
1746 | - ssl/ssl_lib.c (1.110.2.13), "Exp", lines: +8 -9 |
1747 | - ssl/t1_enc.c (1.27.2.10), "Exp", lines: +0 -18 |
1748 | - |
1749 | - Only allow TLS is FIPS mode. |
1750 | - |
1751 | - Remove old FIPS_allow_md5() calls. |
1752 | - |
1753 | -2005-02-05 19:24 steve |
1754 | - |
1755 | - Changed: |
1756 | - apps/req.c (1.88.2.18), "Exp", lines: +8 -1 |
1757 | - apps/x509.c (1.67.2.20), "Exp", lines: +8 -1 |
1758 | - |
1759 | - In FIPS mode use SHA1 as default digest in x509 and req utilities. |
1760 | - |
1761 | -2005-03-15 10:46 appro |
1762 | - |
1763 | - Changed: |
1764 | - Makefile.org (1.154.2.96), "Exp", lines: +1 -1 |
1765 | - crypto/Makefile (1.1.4.6), "Exp", lines: +2 -3 |
1766 | - fips/Makefile (1.1.4.8), "Exp", lines: +4 -1 |
1767 | - |
1768 | - Real Bourne shell doesn't accept ! as in "if ! grep ..." Fix this |
1769 | - in crypto/Makefile and make Makefile.org and fips/Makefile more |
1770 | - discreet. |
1771 | - |
1772 | -2005-03-22 18:29 steve |
1773 | - |
1774 | - Changed: |
1775 | - fips/fingerprint.sha1 (1.1.2.12), "Exp", lines: +1 -1 |
1776 | - fips/fips.c (1.1.2.10), "Exp", lines: +1 -0 |
1777 | - |
1778 | - Fix memory leak. |
1779 | - |
1780 | -2005-03-27 05:36 steve |
1781 | - |
1782 | - Changed: |
1783 | - crypto/evp/e_null.c (1.9.2.1), "Exp", lines: +1 -1 |
1784 | - ssl/s3_lib.c (1.57.2.13), "Exp", lines: +3 -3 |
1785 | - |
1786 | - Allow 'null' cipher and appropriate Kerberos ciphersuites in FIPS |
1787 | - mode. |
1788 | - |
1789 | -2005-04-14 14:44 steve |
1790 | - |
1791 | - Changed: |
1792 | - fips/fipshashes.sha1 (1.1.2.1), "Exp", lines: +29 -0 |
1793 | - util/checkhash.pl (1.1.2.1), "Exp", lines: +181 -0 |
1794 | - |
1795 | - Perl script that checks or rebuilds FIPS hash files. This works on |
1796 | - both Unix and Windows. |
1797 | - |
1798 | - Merge all FIPS hash files into a single hash file |
1799 | - fips/fips.sha1 |
1800 | - |
1801 | -2005-04-15 05:27 steve |
1802 | - |
1803 | - Changed: |
1804 | - fips/Makefile (1.1.4.9), "Exp", lines: +1 -1 |
1805 | - fips/aes/Makefile (1.1.4.4), "Exp", lines: +1 -4 |
1806 | - fips/des/Makefile (1.1.4.6), "Exp", lines: +1 -4 |
1807 | - fips/dh/Makefile (1.1.2.5), "Exp", lines: +1 -4 |
1808 | - fips/dsa/Makefile (1.1.4.4), "Exp", lines: +1 -4 |
1809 | - fips/rand/Makefile (1.1.4.3), "Exp", lines: +1 -4 |
1810 | - fips/rsa/Makefile (1.1.4.5), "Exp", lines: +1 -4 |
1811 | - fips/sha1/Makefile (1.1.4.9), "Exp", lines: +1 -7 |
1812 | - |
1813 | - Update hash checking in makefiles to use new perl script. |
1814 | - |
1815 | -2005-04-17 06:37 steve |
1816 | - |
1817 | - Changed: |
1818 | - util/checkhash.pl (1.1.2.2), "Exp", lines: +163 -127 |
1819 | - |
1820 | - Modify checkhash.pl so it can be run standalone or included as a |
1821 | - funtion in another perl script. |
1822 | - |
1823 | -2005-04-17 16:00 appro |
1824 | - |
1825 | - Changed: |
1826 | - fips/sha1/Makefile (1.1.4.10), "Exp", lines: +9 -5 |
1827 | - |
1828 | - Bring back fips_standalone_sha1. |
1829 | - |
1830 | -2005-04-17 16:17 appro |
1831 | - |
1832 | - Deleted: |
1833 | - fips/sha1/asm/sx86-elf.s (1.1.4.4) |
1834 | - Changed: |
1835 | - Configure (1.314.2.114), "Exp", lines: +1 -1 |
1836 | - fips/fipshashes.sha1 (1.1.2.2), "Exp", lines: +1 -1 |
1837 | - fips/sha1/Makefile (1.1.4.11), "Exp", lines: +1 -1 |
1838 | - fips/sha1/standalone.sha1 (1.1.2.13), "Exp", lines: +1 -1 |
1839 | - fips/sha1/asm/fips-sx86-elf.s (1.1.2.1), "Exp", lines: +1568 -0 |
1840 | - |
1841 | - Rename fips/sha1/sx86-elf.s to fips/sha1/fips-sx86-elf.s. |
1842 | - |
1843 | -2005-04-17 16:21 steve |
1844 | - |
1845 | - Changed: |
1846 | - util/checkhash.pl (1.1.2.3), "Exp", lines: +2 -0 |
1847 | - |
1848 | - Return 0 for successful hash check. |
1849 | - |
1850 | -2005-04-17 16:54 appro |
1851 | - |
1852 | - Changed: |
1853 | - Configure (1.314.2.116), "Exp", lines: +8 -1 |
1854 | - Makefile.org (1.154.2.99), "Exp", lines: +3 -2 |
1855 | - crypto/aes/aes_cbc.c (1.1.2.11), "Exp", lines: +2 -0 |
1856 | - fips/fipshashes.sha1 (1.1.2.4), "Exp", lines: +1 -0 |
1857 | - fips/aes/Makefile (1.1.4.5), "Exp", lines: +4 -2 |
1858 | - fips/aes/asm/fips-ax86-elf.s (1.1.2.1), "Exp", lines: +1822 -0 |
1859 | - |
1860 | - Throw in fips/aes/asm/fips-ax86-elf.s. |
1861 | - |
1862 | -2005-04-17 16:35 appro |
1863 | - |
1864 | - Changed: |
1865 | - Configure (1.314.2.115), "Exp", lines: +1 -1 |
1866 | - fips/fipshashes.sha1 (1.1.2.3), "Exp", lines: +1 -1 |
1867 | - fips/des/asm/fips-dx86-elf.s (1.1.4.2), "Exp", lines: +108 -98 |
1868 | - |
1869 | - Regenerate fips/des/asm/fips-dx86-elf.s with -fPIC flag. |
1870 | - |
1871 | -2005-04-17 17:26 appro |
1872 | - |
1873 | - Changed: |
1874 | - crypto/cryptlib.c (1.32.2.18), "Exp", lines: +6 -55 |
1875 | - crypto/crypto.h (1.62.2.11), "Exp", lines: +0 -3 |
1876 | - fips/fips.c (1.1.2.11), "Exp", lines: +62 -8 |
1877 | - fips/fips.h (1.1.2.7), "Exp", lines: +2 -3 |
1878 | - fips/fips_locl.h (1.1.4.3), "Exp", lines: +6 -3 |
1879 | - fips/fipshashes.sha1 (1.1.2.5), "Exp", lines: +4 -4 |
1880 | - fips/rand/fips_rand.c (1.1.2.10), "Exp", lines: +3 -1 |
1881 | - fips/rsa/fips_rsa_gen.c (1.1.4.4), "Exp", lines: +4 -2 |
1882 | - |
1883 | - Resolve minor binary compatibility issues in fips. |
1884 | - |
1885 | -2005-04-17 18:22 appro |
1886 | - |
1887 | - Changed: |
1888 | - fips/fipshashes.sha1 (1.1.2.6), "Exp", lines: +12 -12 |
1889 | - fips/des/fips_des_locl.h (1.1.2.4), "Exp", lines: +1 -1 |
1890 | - fips/des/fips_set_key.c (1.1.4.4), "Exp", lines: +2 -2 |
1891 | - fips/dh/fips_dh_key.c (1.1.2.3), "Exp", lines: +1 -1 |
1892 | - fips/dsa/fips_dsa_ossl.c (1.1.2.7), "Exp", lines: +1 -1 |
1893 | - fips/dsa/fips_dsa_selftest.c (1.1.4.2), "Exp", lines: +3 -3 |
1894 | - fips/rand/fips_rand.c (1.1.2.11), "Exp", lines: +2 -2 |
1895 | - fips/rand/fips_rand.h (1.1.2.5), "Exp", lines: +1 -1 |
1896 | - fips/rsa/fips_rsa_eay.c (1.1.4.4), "Exp", lines: +1 -1 |
1897 | - fips/rsa/fips_rsa_gen.c (1.1.4.5), "Exp", lines: +1 -1 |
1898 | - fips/rsa/fips_rsa_selftest.c (1.1.4.5), "Exp", lines: +11 -11 |
1899 | - fips/sha1/fips_sha1_selftest.c (1.1.4.2), "Exp", lines: +1 -1 |
1900 | - fips/sha1/fips_sha1dgst.c (1.1.2.5), "Exp", lines: +1 -1 |
1901 | - fips/sha1/standalone.sha1 (1.1.2.14), "Exp", lines: +2 -2 |
1902 | - |
1903 | - Minor fips const-ification. |
1904 | - |
1905 | -2005-04-18 07:02 steve |
1906 | - |
1907 | - Changed: |
1908 | - crypto/bf/bf_skey.c (1.6.2.2), "Exp", lines: +1 -0 |
1909 | - crypto/cast/c_skey.c (1.5.6.2), "Exp", lines: +1 -0 |
1910 | - crypto/idea/i_skey.c (1.5.6.2), "Exp", lines: +1 -0 |
1911 | - crypto/rc2/rc2_skey.c (1.4.6.2), "Exp", lines: +1 -0 |
1912 | - crypto/rc4/rc4_skey.c (1.10.8.3), "Exp", lines: +1 -0 |
1913 | - crypto/rc5/rc5_skey.c (1.4.6.2), "Exp", lines: +1 -0 |
1914 | - |
1915 | - Pick up definition of FIPS_mode() in fips.h to avoid warnings. |
1916 | - |
1917 | -2005-04-18 10:34 steve |
1918 | - |
1919 | - Deleted: |
1920 | - fips/fingerprint.sha1 (1.1.2.14) |
1921 | - fips/fips_check_sha1 (1.1.2.8) |
1922 | - fips/fips_make_sha1 (1.1.2.7) |
1923 | - fips/aes/fingerprint.sha1 (1.1.2.7) |
1924 | - fips/des/fingerprint.sha1 (1.1.2.6) |
1925 | - fips/dh/fingerprint.sha1 (1.1.2.4) |
1926 | - fips/dsa/fingerprint.sha1 (1.1.2.7) |
1927 | - fips/rand/fingerprint.sha1 (1.1.2.10) |
1928 | - fips/rsa/fingerprint.sha1 (1.1.4.7) |
1929 | - fips/sha1/fingerprint.sha1 (1.1.2.12) |
1930 | - Changed: |
1931 | - fips/sha1/Makefile (1.1.4.12), "Exp", lines: +1 -4 |
1932 | - |
1933 | - Remove obsolete fingerprint.sha1 files and associated scripts. |
1934 | - Delete test in fips/sha1/Makefile: the top level test checks the |
1935 | - same files. |
1936 | - |
1937 | -2005-04-19 09:11 appro |
1938 | - |
1939 | - Deleted: |
1940 | - fips/fipshashes.sha1 (1.1.2.7) |
1941 | - fips/sha1/standalone.sha1 (1.1.2.15) |
1942 | - Changed: |
1943 | - fips/fipshashes.c (1.1.2.1), "Exp", lines: +32 -0 |
1944 | - util/checkhash.pl (1.1.2.4), "Exp", lines: +7 -4 |
1945 | - |
1946 | - Maintain fingerprint hashes as C source. |
1947 | - |
1948 | -2005-04-19 09:17 appro |
1949 | - |
1950 | - Changed: |
1951 | - util/checkhash.pl (1.1.2.5), "Exp", lines: +1 -1 |
1952 | - |
1953 | - Complete the transition C-code hashes. |
1954 | - |
1955 | -2005-04-21 19:06 steve |
1956 | - |
1957 | - Changed: |
1958 | - apps/openssl.c (1.48.2.13), "Exp", lines: +0 -2 |
1959 | - fips/fips.c (1.1.2.12), "Exp", lines: +0 -27 |
1960 | - fips/fips.h (1.1.2.8), "Exp", lines: +0 -2 |
1961 | - fips/fipshashes.c (1.1.2.2), "Exp", lines: +2 -2 |
1962 | - |
1963 | - Remove defunct FIPS_allow_md5() and related functions. |
1964 | - |
1965 | -2005-04-22 06:15 appro |
1966 | - |
1967 | - Changed: |
1968 | - fips/fips.c (1.1.2.13), "Exp", lines: +3 -3 |
1969 | - fips/fips_err.h (1.1.4.4), "Exp", lines: +3 -3 |
1970 | - fips/fipshashes.c (1.1.2.4), "Exp", lines: +2 -2 |
1971 | - |
1972 | - Move some variables to .bss. |
1973 | - |
1974 | |
1975 | === modified file 'Configure' |
1976 | --- Configure 2008-11-11 17:24:44 +0000 |
1977 | +++ Configure 2009-12-07 19:46:11 +0000 |
1978 | @@ -6,11 +6,13 @@ |
1979 | ## |
1980 | |
1981 | require 5.000; |
1982 | -use strict; |
1983 | +eval 'use strict;'; |
1984 | + |
1985 | +print STDERR "Warning: perl module strict not found.\n" if ($@); |
1986 | |
1987 | # see INSTALL for instructions. |
1988 | |
1989 | -my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; |
1990 | +my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; |
1991 | |
1992 | # Options: |
1993 | # |
1994 | @@ -54,6 +56,8 @@ |
1995 | # [no-]zlib [don't] compile support for zlib compression. |
1996 | # zlib-dynamic Like "zlib", but the zlib library is expected to be a shared |
1997 | # library and will be loaded in run-time by the OpenSSL library. |
1998 | +# enable-montasm 0.9.8 branch only: enable Montgomery x86 assembler backport |
1999 | +# from 0.9.9 |
2000 | # 386 generate 80386 code |
2001 | # no-sse2 disables IA-32 SSE2 code, above option implies no-sse2 |
2002 | # no-<cipher> build without specified algorithm (rsa, idea, rc5, ...) |
2003 | @@ -97,6 +101,11 @@ |
2004 | # SHA512_ASM sha512_block is implemented in assembler |
2005 | # AES_ASM ASE_[en|de]crypt is implemented in assembler |
2006 | |
2007 | +# Minimum warning options... any contributions to OpenSSL should at least get |
2008 | +# past these. |
2009 | + |
2010 | +my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED"; |
2011 | + |
2012 | my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; |
2013 | |
2014 | # MD2_CHAR slags pentium pros |
2015 | @@ -114,13 +123,12 @@ |
2016 | my $bits1="THIRTY_TWO_BIT "; |
2017 | my $bits2="SIXTY_FOUR_BIT "; |
2018 | |
2019 | -my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o"; |
2020 | -my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o"; |
2021 | -my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o"; |
2022 | +my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o MAYBE-MO86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o rc4_skey.o:rm86-elf.o:r586-elf.o"; |
2023 | +my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o MAYBE-MO86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o rc4_skey.o:rm86-cof.o:r586-cof.o"; |
2024 | +my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o MAYBE-MO86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o rc4_skey.o:rm86-out.o:r586-out.o"; |
2025 | |
2026 | -#my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::"; |
2027 | -my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::::"; |
2028 | -my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o::"; |
2029 | +my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::"; |
2030 | +my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o::"; |
2031 | |
2032 | my $no_asm="::::::::::"; |
2033 | |
2034 | @@ -151,11 +159,14 @@ |
2035 | "debug-ben", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::bn86-elf.o co86-elf.o", |
2036 | "debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::", |
2037 | "debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::", |
2038 | -"debug-ben-debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::::", |
2039 | +"debug-ben-debug", "gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -g3 -O2 -pipe::(unknown)::::::", |
2040 | "debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::", |
2041 | "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", |
2042 | -"debug-bodo", "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", |
2043 | +"debug-bodo", "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", |
2044 | "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll", |
2045 | +"debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2046 | +"debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2047 | +"debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2048 | "debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -m32 -g -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared", |
2049 | "debug-steve-linux-pseudo64", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT:${no_asm}:dlfcn:linux-shared", |
2050 | "debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2051 | @@ -202,11 +213,11 @@ |
2052 | "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:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2053 | "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::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2054 | # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc |
2055 | -"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2056 | -"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2057 | +"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2058 | +"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2059 | #### |
2060 | "debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_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::sparcv8.o::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2061 | -"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2062 | +"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2063 | |
2064 | #### SPARC Solaris with Sun C setups |
2065 | # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2. |
2066 | @@ -214,11 +225,11 @@ |
2067 | # SC5.0 note: Compiler common patch 107357-01 or later is required! |
2068 | "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:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2069 | "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::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2070 | -"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2071 | -"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", |
2072 | +"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2073 | +"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", |
2074 | #### |
2075 | "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_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::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2076 | -"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o::::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2077 | +"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2078 | |
2079 | #### SunOS configs, assuming sparc for the gcc one. |
2080 | #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::", |
2081 | @@ -309,48 +320,6 @@ |
2082 | "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so", |
2083 | "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so", |
2084 | |
2085 | -# Debian GNU/* (various architectures) |
2086 | -"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2087 | -"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2088 | -"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2089 | -"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2090 | -"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2091 | -"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2092 | -#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2093 | -"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2094 | -"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2095 | -#"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -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)", |
2096 | -"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2097 | -"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2098 | -"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -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)", |
2099 | -"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2100 | -#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC", |
2101 | -"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2102 | -"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2103 | -"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2104 | -"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2105 | -"debian-lpia","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mtune=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2106 | -"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2107 | -"debian-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2108 | -"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2109 | -"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2110 | -"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2111 | -"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2112 | -"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2113 | -"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2114 | -"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -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)", |
2115 | -"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2116 | -"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2117 | -"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2118 | -"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2119 | -"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2120 | -"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2121 | -"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2122 | -"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2123 | -"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl -Wl,-Bsymbolic-functions:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2124 | -"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2125 | -"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2126 | - |
2127 | #### |
2128 | #### Variety of LINUX:-) |
2129 | #### |
2130 | @@ -375,9 +344,9 @@ |
2131 | "linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2132 | # it's a real mess with -mcpu=ultrasparc option under Linux, but |
2133 | # -Wa,-Av8plus should do the trick no matter what. |
2134 | -"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2135 | +"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2136 | # GCC 3.1 is a requirement |
2137 | -"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::md5-sparcv9.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2138 | +"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2139 | #### Alpha Linux with GNU C and Compaq C setups |
2140 | # Special notes: |
2141 | # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you |
2142 | @@ -407,7 +376,7 @@ |
2143 | # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it |
2144 | # simply *happens* to work around a compiler bug in gcc 3.3.3, |
2145 | # triggered by RIPEMD160 code. |
2146 | -"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2147 | +"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2148 | "BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2149 | "BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", |
2150 | |
2151 | @@ -445,12 +414,12 @@ |
2152 | |
2153 | #### IBM's AIX. |
2154 | "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::", |
2155 | -"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", |
2156 | -"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64", |
2157 | +"aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", |
2158 | +"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64", |
2159 | # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE |
2160 | # at build time. $OBJECT_MODE is respected at ./config stage! |
2161 | -"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", |
2162 | -"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64", |
2163 | +"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", |
2164 | +"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64", |
2165 | |
2166 | # |
2167 | # Cray T90 and similar (SDSC) |
2168 | @@ -519,17 +488,22 @@ |
2169 | # Cygwin |
2170 | "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", |
2171 | "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", |
2172 | --"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", |
2173 | +"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", |
2174 | |
2175 | -# NetWare from David Ward (dsward@novell.com) - requires MetroWerks NLM development tools |
2176 | +# NetWare from David Ward (dsward@novell.com) |
2177 | +# requires either MetroWerks NLM development tools, or gcc / nlmconv |
2178 | +# NetWare defaults socket bio to WinSock sockets. However, |
2179 | +# the builds can be configured to use BSD sockets instead. |
2180 | # netware-clib => legacy CLib c-runtime support |
2181 | -"netware-clib", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::", |
2182 | +"netware-clib", "mwccnlm::::::${x86_gcc_opts}::", |
2183 | +"netware-clib-bsdsock", "mwccnlm::::::${x86_gcc_opts}::", |
2184 | +"netware-clib-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::", |
2185 | +"netware-clib-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::", |
2186 | # netware-libc => LibC/NKS support |
2187 | -# NetWare defaults socket bio to WinSock sockets. However, the LibC build can be |
2188 | -# configured to use BSD sockets instead. |
2189 | "netware-libc", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::", |
2190 | "netware-libc-bsdsock", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::", |
2191 | "netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::", |
2192 | +"netware-libc-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::", |
2193 | |
2194 | # DJGPP |
2195 | "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:", |
2196 | @@ -543,8 +517,9 @@ |
2197 | ##### MacOS X (a.k.a. Rhapsody or Darwin) setup |
2198 | "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", |
2199 | "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2200 | -"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx64.o:osx_ppc64.o osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o:::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2201 | -"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2202 | +"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2203 | +"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2204 | +"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2205 | "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2206 | "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |
2207 | |
2208 | @@ -574,7 +549,9 @@ |
2209 | |
2210 | my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A |
2211 | VC-NT VC-CE VC-WIN32 |
2212 | - BC-32 OS2-EMX netware-clib netware-libc netware-libc-bsdsock); |
2213 | + BC-32 OS2-EMX |
2214 | + netware-clib netware-clib-bsdsock |
2215 | + netware-libc netware-libc-bsdsock); |
2216 | |
2217 | my $idx = 0; |
2218 | my $idx_cc = $idx++; |
2219 | @@ -607,12 +584,18 @@ |
2220 | my $openssldir=""; |
2221 | my $exe_ext=""; |
2222 | my $install_prefix=""; |
2223 | +my $fipslibdir="/usr/local/ssl/fips-1.0/lib/"; |
2224 | +my $nofipscanistercheck=0; |
2225 | +my $fipsdso=0; |
2226 | +my $fipscanisterinternal="n"; |
2227 | +my $baseaddr="0xFB00000"; |
2228 | my $no_threads=0; |
2229 | my $threads=0; |
2230 | my $no_shared=0; # but "no-shared" is default |
2231 | my $zlib=1; # but "no-zlib" is default |
2232 | my $no_krb5=0; # but "no-krb5" is implied unless "--with-krb5-..." is used |
2233 | my $no_rfc3779=1; # but "no-rfc3779" is default |
2234 | +my $montasm=1; # but "no-montasm" is default |
2235 | my $no_asm=0; |
2236 | my $no_dso=0; |
2237 | my $no_gmp=0; |
2238 | @@ -629,10 +612,11 @@ |
2239 | my $bf ="crypto/bf/bf_locl.h"; |
2240 | my $bn_asm ="bn_asm.o"; |
2241 | my $des_enc="des_enc.o fcrypt_b.o"; |
2242 | +my $fips_des_enc="fips_des_enc.o"; |
2243 | my $aes_enc="aes_core.o aes_cbc.o"; |
2244 | my $bf_enc ="bf_enc.o"; |
2245 | my $cast_enc="c_enc.o"; |
2246 | -my $rc4_enc="rc4_enc.o"; |
2247 | +my $rc4_enc="rc4_enc.o rc4_skey.o"; |
2248 | my $rc5_enc="rc5_enc.o"; |
2249 | my $md5_obj=""; |
2250 | my $sha1_obj=""; |
2251 | @@ -640,29 +624,40 @@ |
2252 | my $processor=""; |
2253 | my $default_ranlib; |
2254 | my $perl; |
2255 | +my $fips=0; |
2256 | |
2257 | |
2258 | # All of the following is disabled by default (RC5 was enabled before 0.9.8): |
2259 | |
2260 | -my %disabled = ( # "what" => "comment" |
2261 | +my %disabled = ( # "what" => "comment" [or special keyword "experimental"] |
2262 | "camellia" => "default", |
2263 | + "capieng" => "default", |
2264 | + "cms" => "default", |
2265 | "gmp" => "default", |
2266 | + "jpake" => "experimental", |
2267 | "mdc2" => "default", |
2268 | + "montasm" => "default", # explicit option in 0.9.8 only (implicitly enabled in 0.9.9) |
2269 | "rc5" => "default", |
2270 | "rfc3779" => "default", |
2271 | "seed" => "default", |
2272 | "shared" => "default", |
2273 | - "tlsext" => "default", |
2274 | "zlib" => "default", |
2275 | "zlib-dynamic" => "default" |
2276 | ); |
2277 | - |
2278 | -# Additional "no-..." options will be collected in %disabled. |
2279 | -# To remove something from %disabled, use e.g. "enable-rc5". |
2280 | -# For symmetry, "disable-..." is a synonym for "no-...". |
2281 | - |
2282 | -# This is what $depflags will look like with the above default: |
2283 | -my $default_depflags = "-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT "; |
2284 | +my @experimental = (); |
2285 | + |
2286 | +# This is what $depflags will look like with the above defaults |
2287 | +# (we need this to see if we should advise the user to run "make depend"): |
2288 | +my $default_depflags = " -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED"; |
2289 | + |
2290 | + |
2291 | +# Explicit "no-..." options will be collected in %disabled along with the defaults. |
2292 | +# To remove something from %disabled, use "enable-foo" (unless it's experimental). |
2293 | +# For symmetry, "disable-foo" is a synonym for "no-foo". |
2294 | + |
2295 | +# For features called "experimental" here, a more explicit "experimental-foo" is needed to enable. |
2296 | +# We will collect such requests in @experimental. |
2297 | +# To avoid accidental use of experimental features, applications will have to use -DOPENSSL_EXPERIMENTAL_FOO. |
2298 | |
2299 | |
2300 | my $no_sse2=0; |
2301 | @@ -671,6 +666,7 @@ |
2302 | |
2303 | my $flags; |
2304 | my $depflags; |
2305 | +my $openssl_experimental_defines; |
2306 | my $openssl_algorithm_defines; |
2307 | my $openssl_thread_defines; |
2308 | my $openssl_sys_defines=""; |
2309 | @@ -691,6 +687,7 @@ |
2310 | { |
2311 | $flags=""; |
2312 | $depflags=""; |
2313 | + $openssl_experimental_defines=""; |
2314 | $openssl_algorithm_defines=""; |
2315 | $openssl_thread_defines=""; |
2316 | $openssl_sys_defines=""; |
2317 | @@ -716,25 +713,35 @@ |
2318 | |
2319 | if (/^no-(.+)$/ || /^disable-(.+)$/) |
2320 | { |
2321 | - if ($1 eq "ssl") |
2322 | - { |
2323 | - $disabled{"ssl2"} = "option(ssl)"; |
2324 | - $disabled{"ssl3"} = "option(ssl)"; |
2325 | - } |
2326 | - elsif ($1 eq "tls") |
2327 | - { |
2328 | - $disabled{"tls1"} = "option(tls)" |
2329 | - } |
2330 | - else |
2331 | - { |
2332 | - $disabled{$1} = "option"; |
2333 | + if (!($disabled{$1} eq "experimental")) |
2334 | + { |
2335 | + if ($1 eq "ssl") |
2336 | + { |
2337 | + $disabled{"ssl2"} = "option(ssl)"; |
2338 | + $disabled{"ssl3"} = "option(ssl)"; |
2339 | + } |
2340 | + elsif ($1 eq "tls") |
2341 | + { |
2342 | + $disabled{"tls1"} = "option(tls)" |
2343 | + } |
2344 | + else |
2345 | + { |
2346 | + $disabled{$1} = "option"; |
2347 | + } |
2348 | } |
2349 | } |
2350 | - elsif (/^enable-(.+)$/) |
2351 | + elsif (/^enable-(.+)$/ || /^experimental-(.+)$/) |
2352 | { |
2353 | - delete $disabled{$1}; |
2354 | + my $algo = $1; |
2355 | + if ($disabled{$algo} eq "experimental") |
2356 | + { |
2357 | + die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n" |
2358 | + unless (/^experimental-/); |
2359 | + push @experimental, $algo; |
2360 | + } |
2361 | + delete $disabled{$algo}; |
2362 | |
2363 | - $threads = 1 if ($1 eq "threads"); |
2364 | + $threads = 1 if ($algo eq "threads"); |
2365 | } |
2366 | elsif (/^--test-sanity$/) |
2367 | { |
2368 | @@ -765,12 +772,36 @@ |
2369 | } |
2370 | elsif (/^386$/) |
2371 | { $processor=386; } |
2372 | + elsif (/^fips$/) |
2373 | + { |
2374 | + $fips=1; |
2375 | + } |
2376 | elsif (/^rsaref$/) |
2377 | { |
2378 | # No RSAref support any more since it's not needed. |
2379 | # The check for the option is there so scripts aren't |
2380 | # broken |
2381 | } |
2382 | + elsif (/^nofipscanistercheck$/) |
2383 | + { |
2384 | + $fips = 1; |
2385 | + $nofipscanistercheck = 1; |
2386 | + } |
2387 | + elsif (/^fipscanisterbuild$/) |
2388 | + { |
2389 | + $fips = 1; |
2390 | + $nofipscanistercheck = 1; |
2391 | + $fipslibdir=""; |
2392 | + $fipscanisterinternal="y"; |
2393 | + } |
2394 | + elsif (/^fipsdso$/) |
2395 | + { |
2396 | + $fips = 1; |
2397 | + $nofipscanistercheck = 1; |
2398 | + $fipslibdir=""; |
2399 | + $fipscanisterinternal="y"; |
2400 | + $fipsdso = 1; |
2401 | + } |
2402 | elsif (/^[-+]/) |
2403 | { |
2404 | if (/^-[lL](.*)$/) |
2405 | @@ -805,6 +836,14 @@ |
2406 | { |
2407 | $withargs{"zlib-include"}="-I$1"; |
2408 | } |
2409 | + elsif (/^--with-fipslibdir=(.*)$/) |
2410 | + { |
2411 | + $fipslibdir="$1/"; |
2412 | + } |
2413 | + elsif (/^--with-baseaddr=(.*)$/) |
2414 | + { |
2415 | + $baseaddr="$1"; |
2416 | + } |
2417 | else |
2418 | { |
2419 | print STDERR $usage; |
2420 | @@ -912,6 +951,54 @@ |
2421 | |
2422 | &usage if (!defined($table{$target})); |
2423 | |
2424 | +my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); |
2425 | +my $cc = $fields[$idx_cc]; |
2426 | +# Allow environment CC to override compiler... |
2427 | +if($ENV{CC}) { |
2428 | + $cc = $ENV{CC}; |
2429 | +} |
2430 | +my $cflags = $fields[$idx_cflags]; |
2431 | +my $unistd = $fields[$idx_unistd]; |
2432 | +my $thread_cflag = $fields[$idx_thread_cflag]; |
2433 | +my $sys_id = $fields[$idx_sys_id]; |
2434 | +my $lflags = $fields[$idx_lflags]; |
2435 | +my $bn_ops = $fields[$idx_bn_ops]; |
2436 | +my $cpuid_obj = $fields[$idx_cpuid_obj]; |
2437 | +my $bn_obj = $fields[$idx_bn_obj]; |
2438 | +my $des_obj = $fields[$idx_des_obj]; |
2439 | +my $aes_obj = $fields[$idx_aes_obj]; |
2440 | +my $bf_obj = $fields[$idx_bf_obj]; |
2441 | +my $md5_obj = $fields[$idx_md5_obj]; |
2442 | +my $sha1_obj = $fields[$idx_sha1_obj]; |
2443 | +my $cast_obj = $fields[$idx_cast_obj]; |
2444 | +my $rc4_obj = $fields[$idx_rc4_obj]; |
2445 | +my $rmd160_obj = $fields[$idx_rmd160_obj]; |
2446 | +my $rc5_obj = $fields[$idx_rc5_obj]; |
2447 | +my $dso_scheme = $fields[$idx_dso_scheme]; |
2448 | +my $shared_target = $fields[$idx_shared_target]; |
2449 | +my $shared_cflag = $fields[$idx_shared_cflag]; |
2450 | +my $shared_ldflag = $fields[$idx_shared_ldflag]; |
2451 | +my $shared_extension = $fields[$idx_shared_extension]; |
2452 | +my $ranlib = $fields[$idx_ranlib]; |
2453 | +my $arflags = $fields[$idx_arflags]; |
2454 | + |
2455 | +if ($fips) |
2456 | + { |
2457 | + delete $disabled{"shared"} if ($disabled{"shared"} eq "default"); |
2458 | + $disabled{"asm"}="forced" |
2459 | + if ($target !~ "VC\-.*" && |
2460 | + "$cpuid_obj:$bn_obj:$aes_obj:$des_obj:$sha1_obj" eq "::::"); |
2461 | + } |
2462 | + |
2463 | +foreach (sort @experimental) |
2464 | + { |
2465 | + my $ALGO; |
2466 | + ($ALGO = $_) =~ tr/[a-z]/[A-Z]/; |
2467 | + |
2468 | + # opensslconf.h will set OPENSSL_NO_... unless OPENSSL_EXPERIMENTAL_... is defined |
2469 | + $openssl_experimental_defines .= "#define OPENSSL_NO_$ALGO\n"; |
2470 | + $cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO"; |
2471 | + } |
2472 | |
2473 | foreach (sort (keys %disabled)) |
2474 | { |
2475 | @@ -927,6 +1014,8 @@ |
2476 | { $no_shared = 1; } |
2477 | elsif (/^zlib$/) |
2478 | { $zlib = 0; } |
2479 | + elsif (/^montasm$/) |
2480 | + { $montasm = 0; } |
2481 | elsif (/^static-engine$/) |
2482 | { } |
2483 | elsif (/^zlib-dynamic$/) |
2484 | @@ -960,7 +1049,7 @@ |
2485 | push @skip, $algo; |
2486 | print " (skip dir)"; |
2487 | |
2488 | - $depflags .="-DOPENSSL_NO_$ALGO "; |
2489 | + $depflags .= " -DOPENSSL_NO_$ALGO"; |
2490 | } |
2491 | } |
2492 | } |
2493 | @@ -968,14 +1057,26 @@ |
2494 | print "\n"; |
2495 | } |
2496 | |
2497 | - |
2498 | my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; |
2499 | |
2500 | $IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys()); |
2501 | |
2502 | +$no_shared = 0 if ($fipsdso && !$IsMK1MF); |
2503 | + |
2504 | $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw"); |
2505 | +$exe_ext=".nlm" if ($target =~ /netware/); |
2506 | $exe_ext=".pm" if ($target =~ /vos/); |
2507 | -$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); |
2508 | +if ($openssldir eq "" and $prefix eq "") |
2509 | + { |
2510 | + if ($fips) |
2511 | + { |
2512 | + $openssldir="/usr/local/ssl/fips"; |
2513 | + } |
2514 | + else |
2515 | + { |
2516 | + $openssldir="/usr/local/ssl"; |
2517 | + } |
2518 | + } |
2519 | $prefix=$openssldir if $prefix eq ""; |
2520 | |
2521 | $default_ranlib= &which("ranlib") or $default_ranlib="true"; |
2522 | @@ -983,7 +1084,7 @@ |
2523 | or $perl="perl"; |
2524 | |
2525 | chop $openssldir if $openssldir =~ /\/$/; |
2526 | -chop $prefix if $prefix =~ /\/$/; |
2527 | +chop $prefix if $prefix =~ /.\/$/; |
2528 | |
2529 | $openssldir=$prefix . "/ssl" if $openssldir eq ""; |
2530 | $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/; |
2531 | @@ -991,33 +1092,6 @@ |
2532 | |
2533 | print "IsMK1MF=$IsMK1MF\n"; |
2534 | |
2535 | -my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); |
2536 | -my $cc = $fields[$idx_cc]; |
2537 | -my $cflags = $fields[$idx_cflags]; |
2538 | -my $unistd = $fields[$idx_unistd]; |
2539 | -my $thread_cflag = $fields[$idx_thread_cflag]; |
2540 | -my $sys_id = $fields[$idx_sys_id]; |
2541 | -my $lflags = $fields[$idx_lflags]; |
2542 | -my $bn_ops = $fields[$idx_bn_ops]; |
2543 | -my $cpuid_obj = $fields[$idx_cpuid_obj]; |
2544 | -my $bn_obj = $fields[$idx_bn_obj]; |
2545 | -my $des_obj = $fields[$idx_des_obj]; |
2546 | -my $aes_obj = $fields[$idx_aes_obj]; |
2547 | -my $bf_obj = $fields[$idx_bf_obj]; |
2548 | -my $md5_obj = $fields[$idx_md5_obj]; |
2549 | -my $sha1_obj = $fields[$idx_sha1_obj]; |
2550 | -my $cast_obj = $fields[$idx_cast_obj]; |
2551 | -my $rc4_obj = $fields[$idx_rc4_obj]; |
2552 | -my $rmd160_obj = $fields[$idx_rmd160_obj]; |
2553 | -my $rc5_obj = $fields[$idx_rc5_obj]; |
2554 | -my $dso_scheme = $fields[$idx_dso_scheme]; |
2555 | -my $shared_target = $fields[$idx_shared_target]; |
2556 | -my $shared_cflag = $fields[$idx_shared_cflag]; |
2557 | -my $shared_ldflag = $fields[$idx_shared_ldflag]; |
2558 | -my $shared_extension = $fields[$idx_shared_extension]; |
2559 | -my $ranlib = $fields[$idx_ranlib]; |
2560 | -my $arflags = $fields[$idx_arflags]; |
2561 | - |
2562 | # '%' in $lflags is used to split flags to "pre-" and post-flags |
2563 | my ($prelflags,$postlflags)=split('%',$lflags); |
2564 | if (defined($postlflags)) { $lflags=$postlflags; } |
2565 | @@ -1151,6 +1225,16 @@ |
2566 | { |
2567 | $cpuid_obj=$bn_obj=$des_obj=$aes_obj=$bf_obj=$cast_obj=$rc4_obj=$rc5_obj=""; |
2568 | $sha1_obj=$md5_obj=$rmd160_obj=""; |
2569 | + $cflags=~s/\-D[BL]_ENDIAN// if ($fips); |
2570 | + $thread_cflags=~s/\-D[BL]_ENDIAN// if ($fips); |
2571 | + } |
2572 | +if ($montasm) |
2573 | + { |
2574 | + $bn_obj =~ s/MAYBE-MO86-/mo86-/; |
2575 | + } |
2576 | +else |
2577 | + { |
2578 | + $bn_obj =~ s/MAYBE-MO86-[a-z.]*//; |
2579 | } |
2580 | |
2581 | if (!$no_shared) |
2582 | @@ -1181,7 +1265,7 @@ |
2583 | my $shared_mark = ""; |
2584 | if ($shared_target eq "") |
2585 | { |
2586 | - $no_shared_warn = 1 if !$no_shared; |
2587 | + $no_shared_warn = 1 if !$no_shared && !$fips; |
2588 | $no_shared = 1; |
2589 | } |
2590 | if (!$no_shared) |
2591 | @@ -1271,6 +1355,13 @@ |
2592 | $cflags.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($bn_obj =~ /bn86/); |
2593 | $cflags.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $bn_obj =~ /bn86/); |
2594 | |
2595 | +$cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /\-mont|mo86\-/); |
2596 | + |
2597 | +if ($fips) |
2598 | + { |
2599 | + $openssl_other_defines.="#define OPENSSL_FIPS\n"; |
2600 | + } |
2601 | + |
2602 | $des_obj=$des_enc unless ($des_obj =~ /\.o$/); |
2603 | $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/); |
2604 | $cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/); |
2605 | @@ -1343,8 +1434,6 @@ |
2606 | $shlib_minor=$2; |
2607 | } |
2608 | |
2609 | -$shared_ldflag .= " -Wl,--version-script=openssl.ld"; |
2610 | - |
2611 | open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; |
2612 | unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new"; |
2613 | open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n"; |
2614 | @@ -1357,10 +1446,13 @@ |
2615 | if ($sdirs) { |
2616 | my $dir; |
2617 | foreach $dir (@skip) { |
2618 | - s/([ ])$dir /\1/; |
2619 | + s/(\s)$dir\s/$1/; |
2620 | + s/\s$dir$//; |
2621 | } |
2622 | } |
2623 | $sdirs = 0 unless /\\$/; |
2624 | + s/fips // if (/^DIRS=/ && !$fips); |
2625 | + s/engines // if (/^DIRS=/ && $disabled{"engine"}); |
2626 | s/^VERSION=.*/VERSION=$version/; |
2627 | s/^MAJOR=.*/MAJOR=$major/; |
2628 | s/^MINOR=.*/MINOR=$minor/; |
2629 | @@ -1378,7 +1470,7 @@ |
2630 | s/^CC=.*$/CC= $cc/; |
2631 | s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc"; |
2632 | s/^CFLAG=.*$/CFLAG= $cflags/; |
2633 | - s/^DEPFLAG=.*$/DEPFLAG= $depflags/; |
2634 | + s/^DEPFLAG=.*$/DEPFLAG=$depflags/; |
2635 | s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/; |
2636 | s/^EX_LIBS=.*$/EX_LIBS= $lflags/; |
2637 | s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/; |
2638 | @@ -1401,9 +1493,24 @@ |
2639 | s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/; |
2640 | s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/; |
2641 | s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/; |
2642 | + s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/; |
2643 | + if ($fipsdso) |
2644 | + { |
2645 | + s/^FIPSCANLIB=.*/FIPSCANLIB=libfips/; |
2646 | + s/^SHARED_FIPS=.*/SHARED_FIPS=libfips\$(SHLIB_EXT)/; |
2647 | + s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl fips/; |
2648 | + } |
2649 | + else |
2650 | + { |
2651 | + s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips; |
2652 | + s/^SHARED_FIPS=.*/SHARED_FIPS=/; |
2653 | + s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/; |
2654 | + } |
2655 | + s/^FIPSCANISTERINTERNAL=.*/FIPSCANISTERINTERNAL=$fipscanisterinternal/; |
2656 | + s/^BASEADDR=.*/BASEADDR=$baseaddr/; |
2657 | s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/; |
2658 | s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/; |
2659 | - s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared); |
2660 | + s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_FIPS) \$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared); |
2661 | if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/) |
2662 | { |
2663 | my $sotmp = $1; |
2664 | @@ -1416,8 +1523,7 @@ |
2665 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) |
2666 | { |
2667 | my $sotmp = $1; |
2668 | -# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; |
2669 | - s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; |
2670 | + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; |
2671 | } |
2672 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) |
2673 | { |
2674 | @@ -1508,6 +1614,7 @@ |
2675 | |
2676 | print OUT "/* OpenSSL was configured with the following options: */\n"; |
2677 | my $openssl_algorithm_defines_trans = $openssl_algorithm_defines; |
2678 | +$openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg; |
2679 | $openssl_algorithm_defines_trans =~ s/^\s*#\s*define\s+OPENSSL_(.*)/# if defined(OPENSSL_$1) \&\& !defined($1)\n# define $1\n# endif/mg; |
2680 | $openssl_algorithm_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg; |
2681 | $openssl_algorithm_defines = " /* no ciphers excluded */\n" if $openssl_algorithm_defines eq ""; |
2682 | @@ -1516,8 +1623,10 @@ |
2683 | $openssl_other_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg; |
2684 | print OUT $openssl_sys_defines; |
2685 | print OUT "#ifndef OPENSSL_DOING_MAKEDEPEND\n\n"; |
2686 | +print OUT $openssl_experimental_defines; |
2687 | +print OUT "\n"; |
2688 | print OUT $openssl_algorithm_defines; |
2689 | -print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n"; |
2690 | +print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n\n"; |
2691 | print OUT $openssl_thread_defines; |
2692 | print OUT $openssl_other_defines,"\n"; |
2693 | |
2694 | @@ -1536,7 +1645,7 @@ |
2695 | if (/^#define\s+OPENSSLDIR/) |
2696 | { print OUT "#define OPENSSLDIR \"$openssldir\"\n"; } |
2697 | elsif (/^#define\s+ENGINESDIR/) |
2698 | - { print OUT "#define ENGINESDIR \"$prefix/lib/ssl/engines\"\n"; } |
2699 | + { print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; } |
2700 | elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/) |
2701 | { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n" |
2702 | if $export_var_as_fn; |
2703 | @@ -1668,7 +1777,7 @@ |
2704 | } |
2705 | |
2706 | # create the ms/version32.rc file if needed |
2707 | -if ($IsMK1MF) { |
2708 | +if ($IsMK1MF && ($target !~ /^netware/)) { |
2709 | my ($v1, $v2, $v3, $v4); |
2710 | if ($version_num =~ /(^[0-9a-f]{1})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})/i) { |
2711 | $v1=hex $1; |
2712 | @@ -1699,9 +1808,16 @@ |
2713 | BEGIN |
2714 | BLOCK "040904b0" |
2715 | BEGIN |
2716 | +#if defined(FIPS) |
2717 | + VALUE "Comments", "WARNING: TEST VERSION ONLY ***NOT*** FIPS 140-2 VALIDATED.\\0" |
2718 | +#endif |
2719 | // Required: |
2720 | VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0" |
2721 | +#if defined(FIPS) |
2722 | + VALUE "FileDescription", "TEST UNVALIDATED FIPS140-2 DLL\\0" |
2723 | +#else |
2724 | VALUE "FileDescription", "OpenSSL Shared Library\\0" |
2725 | +#endif |
2726 | VALUE "FileVersion", "$version\\0" |
2727 | #if defined(CRYPTO) |
2728 | VALUE "InternalName", "libeay32\\0" |
2729 | @@ -1709,12 +1825,15 @@ |
2730 | #elif defined(SSL) |
2731 | VALUE "InternalName", "ssleay32\\0" |
2732 | VALUE "OriginalFilename", "ssleay32.dll\\0" |
2733 | +#elif defined(FIPS) |
2734 | + VALUE "InternalName", "libosslfips\\0" |
2735 | + VALUE "OriginalFilename", "libosslfips.dll\\0" |
2736 | #endif |
2737 | VALUE "ProductName", "The OpenSSL Toolkit\\0" |
2738 | VALUE "ProductVersion", "$version\\0" |
2739 | // Optional: |
2740 | //VALUE "Comments", "\\0" |
2741 | - VALUE "LegalCopyright", "Copyright © 1998-2005 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0" |
2742 | + VALUE "LegalCopyright", "Copyright © 1998-2007 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0" |
2743 | //VALUE "LegalTrademarks", "\\0" |
2744 | //VALUE "PrivateBuild", "\\0" |
2745 | //VALUE "SpecialBuild", "\\0" |
2746 | @@ -1751,6 +1870,21 @@ |
2747 | (but please first make sure you have tried with a current version of OpenSSL). |
2748 | EOF |
2749 | |
2750 | +print <<\EOF if ($fipscanisterinternal eq "y"); |
2751 | + |
2752 | +WARNING: OpenSSL has been configured using unsupported option(s) to internally |
2753 | +generate a fipscanister.o object module for TESTING PURPOSES ONLY; that |
2754 | +compiled module is NOT FIPS 140-2 validated and CANNOT be used to replace the |
2755 | +OpenSSL FIPS Object Module as identified by the CMVP |
2756 | +(http://csrc.nist.gov/cryptval/) in any application requiring the use of FIPS |
2757 | +140-2 validated software. |
2758 | + |
2759 | +This is an OpenSSL 0.9.8 test version. |
2760 | + |
2761 | +See the file README.FIPS for details of how to build a test library. |
2762 | + |
2763 | +EOF |
2764 | + |
2765 | exit(0); |
2766 | |
2767 | sub usage |
2768 | |
2769 | === modified file 'FAQ' |
2770 | --- FAQ 2007-12-05 00:13:39 +0000 |
2771 | +++ FAQ 2009-12-07 19:46:11 +0000 |
2772 | @@ -32,6 +32,8 @@ |
2773 | * How do I install a CA certificate into a browser? |
2774 | * Why is OpenSSL x509 DN output not conformant to RFC2253? |
2775 | * What is a "128 bit certificate"? Can I create one with OpenSSL? |
2776 | +* Why does OpenSSL set the authority key identifier extension incorrectly? |
2777 | +* How can I set up a bundle of commercial root CA certificates? |
2778 | |
2779 | [BUILD] Questions about building and testing OpenSSL |
2780 | |
2781 | @@ -67,6 +69,7 @@ |
2782 | * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier? |
2783 | * I think I've detected a memory leak, is this a bug? |
2784 | * Why does Valgrind complain about the use of uninitialized data? |
2785 | +* Why doesn't a memory BIO work when a file does? |
2786 | |
2787 | =============================================================================== |
2788 | |
2789 | @@ -75,7 +78,7 @@ |
2790 | * Which is the current version of OpenSSL? |
2791 | |
2792 | The current version is available from <URL: http://www.openssl.org>. |
2793 | -OpenSSL 0.9.8g was released on October 19th, 2007. |
2794 | +OpenSSL 0.9.8k was released on Mar 25th, 2009. |
2795 | |
2796 | In addition to the current stable release, you can also access daily |
2797 | snapshots of the OpenSSL development version at <URL: |
2798 | @@ -402,10 +405,10 @@ |
2799 | need to any more. Nowadays web browsers using unrestricted strong encryption |
2800 | are generally available. |
2801 | |
2802 | -When there were tight export restrictions on the export of strong encryption |
2803 | +When there were tight restrictions on the export of strong encryption |
2804 | software from the US only weak encryption algorithms could be freely exported |
2805 | (initially 40 bit and then 56 bit). It was widely recognised that this was |
2806 | -inadequate. A relaxation the rules allowed the use of strong encryption but |
2807 | +inadequate. A relaxation of the rules allowed the use of strong encryption but |
2808 | only to an authorised server. |
2809 | |
2810 | Two slighly different techniques were developed to support this, one used by |
2811 | @@ -426,6 +429,39 @@ |
2812 | encryption so these certificates are now obsolete. |
2813 | |
2814 | |
2815 | +* Why does OpenSSL set the authority key identifier (AKID) extension incorrectly? |
2816 | + |
2817 | +It doesn't: this extension is often the cause of confusion. |
2818 | + |
2819 | +Consider a certificate chain A->B->C so that A signs B and B signs C. Suppose |
2820 | +certificate C contains AKID. |
2821 | + |
2822 | +The purpose of this extension is to identify the authority certificate B. This |
2823 | +can be done either by including the subject key identifier of B or its issuer |
2824 | +name and serial number. |
2825 | + |
2826 | +In this latter case because it is identifying certifcate B it must contain the |
2827 | +issuer name and serial number of B. |
2828 | + |
2829 | +It is often wrongly assumed that it should contain the subject name of B. If it |
2830 | +did this would be redundant information because it would duplicate the issuer |
2831 | +name of C. |
2832 | + |
2833 | + |
2834 | +* How can I set up a bundle of commercial root CA certificates? |
2835 | + |
2836 | +The OpenSSL software is shipped without any root CA certificate as the |
2837 | +OpenSSL project does not have any policy on including or excluding |
2838 | +any specific CA and does not intend to set up such a policy. Deciding |
2839 | +about which CAs to support is up to application developers or |
2840 | +administrators. |
2841 | + |
2842 | +Other projects do have other policies so you can for example extract the CA |
2843 | +bundle used by Mozilla and/or modssl as described in this article: |
2844 | + |
2845 | + http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html |
2846 | + |
2847 | + |
2848 | [BUILD] ======================================================================= |
2849 | |
2850 | * Why does the linker complain about undefined symbols? |
2851 | @@ -823,11 +859,11 @@ |
2852 | |
2853 | * Why do I get errors about unknown algorithms? |
2854 | |
2855 | -This can happen under several circumstances such as reading in an |
2856 | -encrypted private key or attempting to decrypt a PKCS#12 file. The cause |
2857 | -is forgetting to load OpenSSL's table of algorithms with |
2858 | -OpenSSL_add_all_algorithms(). See the manual page for more information. |
2859 | - |
2860 | +The cause is forgetting to load OpenSSL's table of algorithms with |
2861 | +OpenSSL_add_all_algorithms(). See the manual page for more information. This |
2862 | +can cause several problems such as being unable to read in an encrypted |
2863 | +PEM file, unable to decrypt a PKCS#12 file or signature failure when |
2864 | +verifying certificates. |
2865 | |
2866 | * Why can't the OpenSSH configure script detect OpenSSL? |
2867 | |
2868 | @@ -905,5 +941,25 @@ |
2869 | to get rid of these warnings. |
2870 | |
2871 | |
2872 | +* Why doesn't a memory BIO work when a file does? |
2873 | + |
2874 | +This can occur in several cases for example reading an S/MIME email message. |
2875 | +The reason is that a memory BIO can do one of two things when all the data |
2876 | +has been read from it. |
2877 | + |
2878 | +The default behaviour is to indicate that no more data is available and that |
2879 | +the call should be retried, this is to allow the application to fill up the BIO |
2880 | +again if necessary. |
2881 | + |
2882 | +Alternatively it can indicate that no more data is available and that EOF has |
2883 | +been reached. |
2884 | + |
2885 | +If a memory BIO is to behave in the same way as a file this second behaviour |
2886 | +is needed. This must be done by calling: |
2887 | + |
2888 | + BIO_set_mem_eof_return(bio, 0); |
2889 | + |
2890 | +See the manual pages for more details. |
2891 | + |
2892 | + |
2893 | =============================================================================== |
2894 | - |
2895 | |
2896 | === modified file 'INSTALL' |
2897 | --- INSTALL 2007-03-10 17:11:46 +0000 |
2898 | +++ INSTALL 2009-12-07 19:46:11 +0000 |
2899 | @@ -158,7 +158,7 @@ |
2900 | standard headers). If it is a problem with OpenSSL itself, please |
2901 | report the problem to <openssl-bugs@openssl.org> (note that your |
2902 | message will be recorded in the request tracker publicly readable |
2903 | - via http://www.openssl.org/support/rt2.html and will be forwarded to a |
2904 | + via http://www.openssl.org/support/rt.html and will be forwarded to a |
2905 | public mailing list). Include the output of "make report" in your message. |
2906 | Please check out the request tracker. Maybe the bug was already |
2907 | reported or has already been fixed. |
2908 | @@ -180,7 +180,7 @@ |
2909 | in Makefile.ssl and run "make clean; make". Please send a bug |
2910 | report to <openssl-bugs@openssl.org>, including the output of |
2911 | "make report" in order to be added to the request tracker at |
2912 | - http://www.openssl.org/support/rt2.html. |
2913 | + http://www.openssl.org/support/rt.html. |
2914 | |
2915 | 4. If everything tests ok, install OpenSSL with |
2916 | |
2917 | |
2918 | === modified file 'INSTALL.NW' |
2919 | --- INSTALL.NW 2005-12-13 21:37:42 +0000 |
2920 | +++ INSTALL.NW 2009-12-07 19:46:11 +0000 |
2921 | @@ -8,58 +8,62 @@ |
2922 | BUILD PLATFORM: |
2923 | --------------- |
2924 | The build scripts (batch files, perl scripts, etc) have been developed and |
2925 | -tested on W2K. The scripts should run fine on other Windows |
2926 | -platforms (NT, Win9x, WinXP) but they haven't been tested. They may require |
2927 | -some modifications. |
2928 | +tested on W2K. The scripts should run fine on other Windows platforms |
2929 | +(NT, Win9x, WinXP) but they have not been tested. They may require some |
2930 | +modifications. |
2931 | |
2932 | |
2933 | Supported NetWare Platforms - NetWare 5.x, NetWare 6.x: |
2934 | ------------------------------------------- |
2935 | -OpenSSL uses the WinSock interfaces introduced in NetWare 5. Therefore, |
2936 | -previous versions of NetWare, 4.x and 3.x, are not supported. |
2937 | +------------------------------------------------------- |
2938 | +OpenSSL can either use the WinSock interfaces introduced in NetWare 5, |
2939 | +or the BSD socket interface. Previous versions of NetWare, 4.x and 3.x, |
2940 | +are only supported if OpenSSL is build for CLIB and BSD sockets; |
2941 | +WinSock builds only support NetWare 5 and up. |
2942 | |
2943 | On NetWare there are two c-runtime libraries. There is the legacy CLIB |
2944 | -interfaces and the newer LibC interfaces. Being ANSI-C libraries, the |
2945 | -functionality in CLIB and LibC is similar but the LibC interfaces are built |
2946 | +interfaces and the newer LIBC interfaces. Being ANSI-C libraries, the |
2947 | +functionality in CLIB and LIBC is similar but the LIBC interfaces are built |
2948 | using Novell Kernal Services (NKS) which is designed to leverage |
2949 | multi-processor environments. |
2950 | |
2951 | -The NetWare port of OpenSSL can configured to build using CLIB or LibC. The |
2952 | -CLIB build was developed and tested using NetWare 5.0 sp6.0a. The LibC |
2953 | +The NetWare port of OpenSSL can be configured to build using CLIB or LIBC. |
2954 | +The CLIB build was developed and tested using NetWare 5.0 sp6.0a. The LIBC |
2955 | build was developed and tested using the NetWare 6.0 FCS. |
2956 | |
2957 | -The necessary LibC functionality ships with NetWare 6. However, earlier |
2958 | -NetWare 5.x versions will require updates in order to run the OpenSSL LibC |
2959 | -build. |
2960 | +The necessary LIBC functionality ships with NetWare 6. However, earlier |
2961 | +NetWare 5.x versions will require updates in order to run the OpenSSL LIBC |
2962 | +build (NetWare 5.1 SP8 is known to work). |
2963 | |
2964 | -As of June 2005, the LibC build can be configured to use BSD sockets instead |
2965 | +As of June 2005, the LIBC build can be configured to use BSD sockets instead |
2966 | of WinSock sockets. Call Configure (usually through netware\build.bat) using |
2967 | a target of "netware-libc-bsdsock" instead of "netware-libc". |
2968 | |
2969 | +As of June 2007, support for CLIB and BSD sockets is also now available |
2970 | +using a target of "netware-clib-bsdsock" instead of "netware-clib"; |
2971 | +also gcc builds are now supported on both Linux and Win32 (post 0.9.8e). |
2972 | |
2973 | REQUIRED TOOLS: |
2974 | --------------- |
2975 | Based upon the configuration and build options used, some or all of the |
2976 | following tools may be required: |
2977 | |
2978 | - |
2979 | * Perl for Win32 - required (http://www.activestate.com/ActivePerl) |
2980 | Used to run the various perl scripts on the build platform. |
2981 | |
2982 | - |
2983 | * Perl 5.8.0 for NetWare v3.20 (or later) - required |
2984 | (http://developer.novell.com) Used to run the test script on NetWare |
2985 | after building. |
2986 | |
2987 | - |
2988 | -* Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare - required: |
2989 | - Provides command line tools used for building. |
2990 | - |
2991 | - Tools: |
2992 | - mwccnlm.exe - C/C++ Compiler for NetWare |
2993 | - mwldnlm.exe - Linker for NetWare |
2994 | - mwasmnlm.exe - x86 assembler for NetWare (if using assembly option) |
2995 | - |
2996 | +* Compiler / Linker - required: |
2997 | + Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare (commercial): |
2998 | + Provides command line tools used for building. |
2999 | + Tools: |
3000 | + mwccnlm.exe - C/C++ Compiler for NetWare |
3001 | + mwldnlm.exe - Linker for NetWare |
3002 | + mwasmnlm.exe - x86 assembler for NetWare (if using assembly option) |
3003 | + |
3004 | + gcc / nlmconv Cross-Compiler, available from Novell Forge (free): |
3005 | + http://forge.novell.com/modules/xfmod/project/?aunixnw |
3006 | |
3007 | * Assemblers - optional: |
3008 | If you intend to build using the assembly options you will need an |
3009 | @@ -79,11 +83,11 @@ |
3010 | In order to build you will need a make tool. Two make tools are |
3011 | supported, GNU make (gmake.exe) or Microsoft nmake.exe. |
3012 | |
3013 | - gmake.exe - GNU make for Windows (version 3.75 used for development) |
3014 | - http://www.gnu.org/software/make/make.html |
3015 | + make.exe - GNU make for Windows (version 3.75 used for development) |
3016 | + http://gnuwin32.sourceforge.net/packages/make.htm |
3017 | |
3018 | nmake.exe - Microsoft make (Version 6.00.8168.0 used for development) |
3019 | - |
3020 | + http://support.microsoft.com/kb/132084/EN-US/ |
3021 | |
3022 | * Novell Developer Kit (NDK) - required: (http://developer.novell.com) |
3023 | |
3024 | @@ -123,14 +127,14 @@ |
3025 | |
3026 | LIBC - BUILDS: |
3027 | |
3028 | - Libraries for C (LibC) - LibC headers and import files |
3029 | - If you are going to build a LibC version of OpenSSL, you will |
3030 | - need the LibC headers and imports. The March 14, 2002 NDK release or |
3031 | + Libraries for C (LIBC) - LIBC headers and import files |
3032 | + If you are going to build a LIBC version of OpenSSL, you will |
3033 | + need the LIBC headers and imports. The March 14, 2002 NDK release or |
3034 | later is required. |
3035 | |
3036 | - NOTE: The LibC SDK includes the necessary WinSock2 support. It |
3037 | - It is not necessary to download the WinSock2 Developer when building |
3038 | - for LibC. The LibC SDK also includes the appropriate BSD socket support |
3039 | + NOTE: The LIBC SDK includes the necessary WinSock2 support. |
3040 | + It is not necessary to download the WinSock2 NDK when building for |
3041 | + LIBC. The LIBC SDK also includes the appropriate BSD socket support |
3042 | if configuring to use BSD sockets. |
3043 | |
3044 | |
3045 | @@ -143,33 +147,36 @@ |
3046 | and environment variables you will need to build. Modify the |
3047 | various lines to point to YOUR tools and run set_env.bat. |
3048 | |
3049 | - netware\set_env.bat [target] |
3050 | - |
3051 | - target - "netware-clib" - CLib NetWare build |
3052 | - - "netware-libc" - LibC NetWare build |
3053 | + netware\set_env.bat <target> [compiler] |
3054 | + |
3055 | + target - "netware-clib" - CLIB NetWare build |
3056 | + - "netware-libc" - LIBC NetWare build |
3057 | + |
3058 | + compiler - "gnuc" - GNU GCC Compiler |
3059 | + - "codewarrior" - MetroWerks CodeWarrior (default) |
3060 | |
3061 | If you don't use set_env.bat, you will need to set up the following |
3062 | environment variables: |
3063 | |
3064 | - path - Set path to point to the tools you will use. |
3065 | + PATH - Set PATH to point to the tools you will use. |
3066 | |
3067 | - MWCIncludes - The location of the NDK include files. |
3068 | + INCLUDE - The location of the NDK include files. |
3069 | |
3070 | - CLIB ex: set MWCIncludes=c:\ndk\nwsdk\include\nlm |
3071 | - LibC ex: set MWCIncludes=c:\ndk\libc\include |
3072 | + CLIB ex: set INCLUDE=c:\ndk\nwsdk\include\nlm |
3073 | + LIBC ex: set INCLUDE=c:\ndk\libc\include |
3074 | |
3075 | PRELUDE - The absolute path of the prelude object to link with. For |
3076 | a CLIB build it is recommended you use the "clibpre.o" files shipped |
3077 | - with the Metrowerks PDK for NetWare. For a LibC build you should |
3078 | - use the "libcpre.o" file delivered with the LibC NDK components. |
3079 | + with the Metrowerks PDK for NetWare. For a LIBC build you should |
3080 | + use the "libcpre.o" file delivered with the LIBC NDK components. |
3081 | |
3082 | CLIB ex: set PRELUDE=c:\ndk\nwsdk\imports\clibpre.o |
3083 | - LibC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o |
3084 | + LIBC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o |
3085 | |
3086 | IMPORTS - The locaton of the NDK import files. |
3087 | |
3088 | CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports |
3089 | - LibC ex: set IMPORTS=c:\ndk\libc\imports |
3090 | + LIBC ex: set IMPORTS=c:\ndk\libc\imports |
3091 | |
3092 | |
3093 | In order to build, you need to run the Perl scripts to configure the build |
3094 | @@ -182,9 +189,10 @@ |
3095 | |
3096 | netware\build [target] [debug opts] [assembly opts] [configure opts] |
3097 | |
3098 | - target - "netware-clib" - CLib NetWare build (WinSock Sockets) |
3099 | - - "netware-libc" - LibC NetWare build (WinSock Sockets) |
3100 | - - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets) |
3101 | + target - "netware-clib" - CLIB NetWare build (WinSock Sockets) |
3102 | + - "netware-clib-bsdsock" - CLIB NetWare build (BSD Sockets) |
3103 | + - "netware-libc" - LIBC NetWare build (WinSock Sockets) |
3104 | + - "netware-libc-bsdsock" - LIBC NetWare build (BSD Sockets) |
3105 | |
3106 | debug opts - "debug" - build debug |
3107 | |
3108 | @@ -193,25 +201,27 @@ |
3109 | "no-asm" - don't use assembly |
3110 | |
3111 | configure opts- all unrecognized arguments are passed to the |
3112 | - perl configure script |
3113 | + perl 'configure' script. See that script for |
3114 | + internal documentation regarding options that |
3115 | + are available. |
3116 | |
3117 | examples: |
3118 | |
3119 | CLIB build, debug, without assembly: |
3120 | netware\build.bat netware-clib debug no-asm |
3121 | |
3122 | - LibC build, non-debug, using NASM assembly: |
3123 | - netware\build.bat netware-libc nw-nasm |
3124 | + LIBC build, non-debug, using NASM assembly, add mdc2 support: |
3125 | + netware\build.bat netware-libc nw-nasm enable-mdc2 |
3126 | |
3127 | - LibC build, BSD sockets, non-debug, without assembly: |
3128 | + LIBC build, BSD sockets, non-debug, without assembly: |
3129 | netware\build.bat netware-libc-bsdsock no-asm |
3130 | |
3131 | Running build.bat generates a make file to be processed by your make |
3132 | tool (gmake or nmake): |
3133 | |
3134 | CLIB ex: gmake -f netware\nlm_clib_dbg.mak |
3135 | - LibC ex: gmake -f netware\nlm_libc.mak |
3136 | - LibC ex: gmake -f netware\nlm_libc_bsdsock.mak |
3137 | + LIBC ex: gmake -f netware\nlm_libc.mak |
3138 | + LIBC ex: gmake -f netware\nlm_libc_bsdsock.mak |
3139 | |
3140 | |
3141 | You can also run the build scripts manually if you do not want to use the |
3142 | @@ -220,7 +230,7 @@ |
3143 | |
3144 | perl configure no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock] |
3145 | configures no assembly build for specified netware environment |
3146 | - (CLIB or LibC). |
3147 | + (CLIB or LIBC). |
3148 | |
3149 | perl util\mkfiles.pl >MINFO |
3150 | generates a listing of source files (used by mk1mf) |
3151 | @@ -250,12 +260,12 @@ |
3152 | tmp_nw_clib - temporary build files |
3153 | outinc_nw_clib - necesary include files |
3154 | |
3155 | - LibC Debug build: |
3156 | + LIBC Debug build: |
3157 | out_nw_libc.dbg - static libs & test nlm(s) |
3158 | tmp_nw_libc.dbg - temporary build files |
3159 | outinc_nw_libc - necessary include files |
3160 | |
3161 | - LibC Non-debug build: |
3162 | + LIBC Non-debug build: |
3163 | out_nw_libc - static libs & test nlm(s) |
3164 | tmp_nw_libc - temporary build files |
3165 | outinc_nw_libc - necesary include files |
3166 | @@ -281,7 +291,7 @@ |
3167 | NetWare drive - drive letter of mapped drive |
3168 | |
3169 | CLIB ex: netware\cpy_tests out_nw_clib m: |
3170 | - LibC ex: netware\cpy_tests out_nw_libc m: |
3171 | + LIBC ex: netware\cpy_tests out_nw_libc m: |
3172 | |
3173 | |
3174 | The Perl script, "do_tests.pl", in the "OpenSSL" directory on the server |
3175 | @@ -356,9 +366,9 @@ |
3176 | |
3177 | Multi-threaded Development |
3178 | --------------------------- |
3179 | -The NetWare version of OpenSSL is thread-safe however, multi-threaded |
3180 | +The NetWare version of OpenSSL is thread-safe, however multi-threaded |
3181 | applications must provide the necessary locking function callbacks. This |
3182 | -is described in doc\threads.doc. The file "openssl\crypto\threads\mttest.c" |
3183 | +is described in doc\threads.doc. The file "openssl-x.x.x\crypto\threads\mttest.c" |
3184 | is a multi-threaded test program and demonstrates the locking functions. |
3185 | |
3186 | |
3187 | @@ -428,7 +438,7 @@ |
3188 | ------------------ |
3189 | The generated makefile has a "vclean" target which cleans up the build |
3190 | directories. If you have been building successfully and suddenly |
3191 | -experience problems, use "vclean" (gmake -f netware\nlm.mak vclean) and retry. |
3192 | +experience problems, use "vclean" (gmake -f netware\nlm_xxxx.mak vclean) and retry. |
3193 | |
3194 | |
3195 | "Undefined Symbol" Linker errors |
3196 | |
3197 | === modified file 'LICENSE' |
3198 | --- LICENSE 2007-03-10 17:11:46 +0000 |
3199 | +++ LICENSE 2009-12-07 19:46:11 +0000 |
3200 | @@ -12,7 +12,7 @@ |
3201 | --------------- |
3202 | |
3203 | /* ==================================================================== |
3204 | - * Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. |
3205 | + * Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved. |
3206 | * |
3207 | * Redistribution and use in source and binary forms, with or without |
3208 | * modification, are permitted provided that the following conditions |
3209 | |
3210 | === modified file 'MacOS/GetHTTPS.src/ErrorHandling.hpp' |
3211 | --- MacOS/GetHTTPS.src/ErrorHandling.hpp 2004-05-24 17:02:29 +0000 |
3212 | +++ MacOS/GetHTTPS.src/ErrorHandling.hpp 2009-12-07 19:46:11 +0000 |
3213 | @@ -29,7 +29,7 @@ |
3214 | |
3215 | |
3216 | |
3217 | -// A bunch of evil macros that would be uneccessary if I were always using C++ ! |
3218 | +// A bunch of evil macros that would be unnecessary if I were always using C++ ! |
3219 | |
3220 | #define SetErrorMessageAndBailIfNil(theArg,theMessage) \ |
3221 | { \ |
3222 | |
3223 | === modified file 'Makefile' |
3224 | --- Makefile 2009-03-27 08:23:35 +0000 |
3225 | +++ Makefile 2009-12-07 19:46:11 +0000 |
3226 | @@ -4,7 +4,7 @@ |
3227 | ## Makefile for OpenSSL |
3228 | ## |
3229 | |
3230 | -VERSION=0.9.8g |
3231 | +VERSION=0.9.8k |
3232 | MAJOR=0 |
3233 | MINOR=9.8 |
3234 | SHLIB_VERSION_NUMBER=0.9.8 |
3235 | @@ -13,8 +13,8 @@ |
3236 | SHLIB_MINOR=9.8 |
3237 | SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR) |
3238 | PLATFORM=debian-amd64 |
3239 | -OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl enable-zlib enable-tlsext no-camellia no-gmp no-idea no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-sslv2 no-zlib-dynamic |
3240 | -CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext no-sslv2 debian-amd64 |
3241 | +OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl enable-zlib enable-tlsext no-camellia no-capieng no-cms no-gmp no-idea no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib-dynamic |
3242 | +CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext debian-amd64 |
3243 | SHLIB_TARGET=linux-shared |
3244 | |
3245 | # HERE indicates where this Makefile lives. This can be used to indicate |
3246 | @@ -60,13 +60,14 @@ |
3247 | # PKCS1_CHECK - pkcs1 tests. |
3248 | |
3249 | CC= gcc |
3250 | -CFLAG= -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int -DMD5_ASM |
3251 | -DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_SSLV2 |
3252 | +CFLAG= -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM |
3253 | +DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED |
3254 | PEX_LIBS= |
3255 | -EX_LIBS= -ldl -Wl,-Bsymbolic-functions -lz |
3256 | +EX_LIBS= -ldl -lz |
3257 | EXE_EXT= |
3258 | ARFLAGS= |
3259 | AR=ar $(ARFLAGS) r |
3260 | +ARD=ar $(ARFLAGS) d |
3261 | RANLIB= /usr/bin/ranlib |
3262 | PERL= /usr/bin/perl |
3263 | TAR= tar |
3264 | @@ -87,15 +88,15 @@ |
3265 | |
3266 | # CPUID module collects small commonly used assembler snippets |
3267 | CPUID_OBJ= x86_64cpuid.o |
3268 | -BN_ASM= x86_64-gcc.o |
3269 | +BN_ASM= x86_64-gcc.o x86_64-mont.o |
3270 | DES_ENC= des_enc.o fcrypt_b.o |
3271 | -AES_ASM_OBJ= aes_core.o aes_cbc.o |
3272 | +AES_ASM_OBJ= aes-x86_64.o |
3273 | BF_ENC= bf_enc.o |
3274 | CAST_ENC= c_enc.o |
3275 | -RC4_ENC= rc4_enc.o |
3276 | +RC4_ENC= rc4_enc.o rc4_skey.o |
3277 | RC5_ENC= rc5_enc.o |
3278 | MD5_ASM_OBJ= md5-x86_64.o |
3279 | -SHA1_ASM_OBJ= |
3280 | +SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o |
3281 | RMD160_ASM_OBJ= |
3282 | |
3283 | # KRB5 stuff |
3284 | @@ -106,6 +107,32 @@ |
3285 | ZLIB_INCLUDE= |
3286 | LIBZLIB= |
3287 | |
3288 | +# This is the location of fipscanister.o and friends. |
3289 | +# The FIPS module build will place it $(INSTALLTOP)/lib |
3290 | +# but since $(INSTALLTOP) can only take the default value |
3291 | +# when the module is built it will be in /usr/local/ssl/lib |
3292 | +# $(INSTALLTOP) for this build make be different so hard |
3293 | +# code the path. |
3294 | + |
3295 | +FIPSLIBDIR=/usr/local/ssl/fips-1.0/lib/ |
3296 | + |
3297 | +# This is set to "y" if fipscanister.o is compiled internally as |
3298 | +# opposed to coming from an external validated location. |
3299 | + |
3300 | +FIPSCANISTERINTERNAL=n |
3301 | + |
3302 | +# The location of the library which contains fipscanister.o |
3303 | +# normally it will be libcrypto unless fipsdso is set in which |
3304 | +# case it will be libfips. If not compiling in FIPS mode at all |
3305 | +# this is empty making it a useful test for a FIPS compile. |
3306 | + |
3307 | +FIPSCANLIB= |
3308 | + |
3309 | +# Shared library base address. Currently only used on Windows. |
3310 | +# |
3311 | + |
3312 | +BASEADDR=0xFB00000 |
3313 | + |
3314 | DIRS= crypto ssl engines apps tools |
3315 | SHLIBDIRS= crypto ssl |
3316 | |
3317 | @@ -141,6 +168,7 @@ |
3318 | LIBS= libcrypto.a libssl.a |
3319 | SHARED_CRYPTO=libcrypto$(SHLIB_EXT) |
3320 | SHARED_SSL=libssl$(SHLIB_EXT) |
3321 | +SHARED_FIPS= |
3322 | SHARED_LIBS= |
3323 | SHARED_LIBS_LINK_EXTS=.so |
3324 | SHARED_LDFLAGS=-m64 -Wl,--version-script=openssl.ld |
3325 | @@ -194,6 +222,10 @@ |
3326 | SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' \ |
3327 | MD5_ASM_OBJ='${MD5_ASM_OBJ}' \ |
3328 | RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' \ |
3329 | + FIPSLIBDIR='${FIPSLIBDIR}' \ |
3330 | + FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}" \ |
3331 | + FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}' \ |
3332 | + FIPS_EX_OBJ='${FIPS_EX_OBJ}' \ |
3333 | THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES= |
3334 | # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors, |
3335 | # which in turn eliminates ambiguities in variable treatment with -e. |
3336 | @@ -212,7 +244,8 @@ |
3337 | # subdirectories defined in $(DIRS). It requires that the target |
3338 | # is given through the shell variable `target'. |
3339 | BUILD_CMD= if [ -d "$$dir" ]; then \ |
3340 | - ( cd $$dir && echo "making $$target in $$dir..." && \ |
3341 | + ( [ $$target != all -a -z "$(FIPSCANLIB)" ] && FIPSCANLIB=/dev/null; \ |
3342 | + cd $$dir && echo "making $$target in $$dir..." && \ |
3343 | $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \ |
3344 | ) || exit 1; \ |
3345 | fi |
3346 | @@ -225,13 +258,84 @@ |
3347 | reflect: |
3348 | @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV) |
3349 | |
3350 | +FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ |
3351 | + ../crypto/aes/aes_ecb.o \ |
3352 | + ../crypto/aes/aes_ofb.o \ |
3353 | + ../crypto/bn/bn_add.o \ |
3354 | + ../crypto/bn/bn_blind.o \ |
3355 | + ../crypto/bn/bn_ctx.o \ |
3356 | + ../crypto/bn/bn_div.o \ |
3357 | + ../crypto/bn/bn_exp2.o \ |
3358 | + ../crypto/bn/bn_exp.o \ |
3359 | + ../crypto/bn/bn_gcd.o \ |
3360 | + ../crypto/bn/bn_lib.o \ |
3361 | + ../crypto/bn/bn_mod.o \ |
3362 | + ../crypto/bn/bn_mont.o \ |
3363 | + ../crypto/bn/bn_mul.o \ |
3364 | + ../crypto/bn/bn_prime.o \ |
3365 | + ../crypto/bn/bn_rand.o \ |
3366 | + ../crypto/bn/bn_recp.o \ |
3367 | + ../crypto/bn/bn_shift.o \ |
3368 | + ../crypto/bn/bn_sqr.o \ |
3369 | + ../crypto/bn/bn_word.o \ |
3370 | + ../crypto/bn/bn_x931p.o \ |
3371 | + ../crypto/buffer/buf_str.o \ |
3372 | + ../crypto/cryptlib.o \ |
3373 | + ../crypto/des/cfb64ede.o \ |
3374 | + ../crypto/des/cfb64enc.o \ |
3375 | + ../crypto/des/cfb_enc.o \ |
3376 | + ../crypto/des/ecb3_enc.o \ |
3377 | + ../crypto/des/ecb_enc.o \ |
3378 | + ../crypto/des/ofb64ede.o \ |
3379 | + ../crypto/des/ofb64enc.o \ |
3380 | + ../crypto/des/fcrypt.o \ |
3381 | + ../crypto/des/set_key.o \ |
3382 | + ../crypto/dsa/dsa_utl.o \ |
3383 | + ../crypto/dsa/dsa_sign.o \ |
3384 | + ../crypto/dsa/dsa_vrf.o \ |
3385 | + ../crypto/err/err.o \ |
3386 | + ../crypto/evp/digest.o \ |
3387 | + ../crypto/evp/enc_min.o \ |
3388 | + ../crypto/evp/e_aes.o \ |
3389 | + ../crypto/evp/e_des3.o \ |
3390 | + ../crypto/evp/p_sign.o \ |
3391 | + ../crypto/evp/p_verify.o \ |
3392 | + ../crypto/mem_clr.o \ |
3393 | + ../crypto/mem.o \ |
3394 | + ../crypto/rand/md_rand.o \ |
3395 | + ../crypto/rand/rand_egd.o \ |
3396 | + ../crypto/rand/randfile.o \ |
3397 | + ../crypto/rand/rand_lib.o \ |
3398 | + ../crypto/rand/rand_os2.o \ |
3399 | + ../crypto/rand/rand_unix.o \ |
3400 | + ../crypto/rand/rand_win.o \ |
3401 | + ../crypto/rsa/rsa_lib.o \ |
3402 | + ../crypto/rsa/rsa_none.o \ |
3403 | + ../crypto/rsa/rsa_oaep.o \ |
3404 | + ../crypto/rsa/rsa_pk1.o \ |
3405 | + ../crypto/rsa/rsa_pss.o \ |
3406 | + ../crypto/rsa/rsa_ssl.o \ |
3407 | + ../crypto/rsa/rsa_x931.o \ |
3408 | + ../crypto/sha/sha1dgst.o \ |
3409 | + ../crypto/sha/sha256.o \ |
3410 | + ../crypto/sha/sha512.o \ |
3411 | + ../crypto/uid.o |
3412 | + |
3413 | sub_all: build_all |
3414 | build_all: build_libs build_apps build_tests build_tools |
3415 | |
3416 | -build_libs: build_crypto build_ssl build_engines |
3417 | +build_libs: build_crypto build_fips build_ssl build_shared build_engines |
3418 | |
3419 | build_crypto: |
3420 | - @dir=crypto; target=all; $(BUILD_ONE_CMD) |
3421 | + if [ -n "$(FIPSCANLIB)" ]; then \ |
3422 | + EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \ |
3423 | + ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \ |
3424 | + else \ |
3425 | + ARX='${AR}' ; \ |
3426 | + fi ; export ARX ; \ |
3427 | + dir=crypto; target=all; $(BUILD_ONE_CMD) |
3428 | +build_fips: |
3429 | + @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD) |
3430 | build_ssl: |
3431 | @dir=ssl; target=all; $(BUILD_ONE_CMD) |
3432 | build_engines: |
3433 | @@ -247,9 +351,20 @@ |
3434 | build_testapps: |
3435 | @dir=crypto; target=testapps; $(BUILD_ONE_CMD) |
3436 | |
3437 | -libcrypto$(SHLIB_EXT): libcrypto.a |
3438 | +build_shared: $(SHARED_LIBS) |
3439 | +libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS) |
3440 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ |
3441 | - $(MAKE) SHLIBDIRS=crypto build-shared; \ |
3442 | + if [ "$(FIPSCANLIB)" = "libfips" ]; then \ |
3443 | + $(ARD) libcrypto.a fipscanister.o ; \ |
3444 | + $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \ |
3445 | + $(AR) libcrypto.a fips/fipscanister.o ; \ |
3446 | + else \ |
3447 | + if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ |
3448 | + FIPSLD_CC=$(CC); CC=fips/fipsld; \ |
3449 | + export CC FIPSLD_CC; \ |
3450 | + fi; \ |
3451 | + $(MAKE) -e SHLIBDIRS='crypto' build-shared; \ |
3452 | + fi \ |
3453 | else \ |
3454 | echo "There's no support for shared libraries on this platform" >&2; \ |
3455 | exit 1; \ |
3456 | @@ -257,12 +372,32 @@ |
3457 | |
3458 | libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a |
3459 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ |
3460 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ |
3461 | + shlibdeps=-lcrypto; \ |
3462 | + [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \ |
3463 | + $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ |
3464 | + else \ |
3465 | + echo "There's no support for shared libraries on this platform" >&2 ; \ |
3466 | + exit 1; \ |
3467 | + fi |
3468 | + |
3469 | +fips/fipscanister.o: build_fips |
3470 | +libfips$(SHLIB_EXT): fips/fipscanister.o |
3471 | + @if [ "$(SHLIB_TARGET)" != "" ]; then \ |
3472 | + FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \ |
3473 | + $(MAKE) -f Makefile.shared -e $(BUILDENV) \ |
3474 | + CC=$${CC} LIBNAME=fips THIS=$@ \ |
3475 | + LIBEXTRAS=fips/fipscanister.o \ |
3476 | + LIBDEPS="$(EX_LIBS)" \ |
3477 | + LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \ |
3478 | + link_o.$(SHLIB_TARGET) || { rm -f $@; exit 1; } \ |
3479 | else \ |
3480 | echo "There's no support for shared libraries on this platform" >&2; \ |
3481 | exit 1; \ |
3482 | fi |
3483 | |
3484 | +libfips.a: |
3485 | + dir=fips; target=all; $(BUILD_ONE_CMD) |
3486 | + |
3487 | clean-shared: |
3488 | @set -e; for i in $(SHLIBDIRS); do \ |
3489 | if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \ |
3490 | @@ -375,6 +510,9 @@ |
3491 | @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl |
3492 | @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) |
3493 | @set -e; target=links; $(RECURSIVE_BUILD_CMD) |
3494 | + @if [ -z "$(FIPSCANLIB)" ]; then \ |
3495 | + set -e; target=links; dir=fips ; $(BUILD_CMD) ; \ |
3496 | + fi |
3497 | |
3498 | gentests: |
3499 | @(cd test && echo "generating dummy tests (if needed)..." && \ |
3500 | |
3501 | === modified file 'Makefile.org' |
3502 | --- Makefile.org 2008-11-11 17:24:44 +0000 |
3503 | +++ Makefile.org 2009-12-07 19:46:11 +0000 |
3504 | @@ -65,6 +65,7 @@ |
3505 | EXE_EXT= |
3506 | ARFLAGS= |
3507 | AR=ar $(ARFLAGS) r |
3508 | +ARD=ar $(ARFLAGS) d |
3509 | RANLIB= ranlib |
3510 | PERL= perl |
3511 | TAR= tar |
3512 | @@ -104,8 +105,34 @@ |
3513 | ZLIB_INCLUDE= |
3514 | LIBZLIB= |
3515 | |
3516 | -DIRS= crypto ssl engines apps tools |
3517 | -SHLIBDIRS= crypto ssl |
3518 | +# This is the location of fipscanister.o and friends. |
3519 | +# The FIPS module build will place it $(INSTALLTOP)/lib |
3520 | +# but since $(INSTALLTOP) can only take the default value |
3521 | +# when the module is built it will be in /usr/local/ssl/lib |
3522 | +# $(INSTALLTOP) for this build make be different so hard |
3523 | +# code the path. |
3524 | + |
3525 | +FIPSLIBDIR=/usr/local/ssl/lib/ |
3526 | + |
3527 | +# This is set to "y" if fipscanister.o is compiled internally as |
3528 | +# opposed to coming from an external validated location. |
3529 | + |
3530 | +FIPSCANISTERINTERNAL=n |
3531 | + |
3532 | +# The location of the library which contains fipscanister.o |
3533 | +# normally it will be libcrypto unless fipsdso is set in which |
3534 | +# case it will be libfips. If not compiling in FIPS mode at all |
3535 | +# this is empty making it a useful test for a FIPS compile. |
3536 | + |
3537 | +FIPSCANLIB= |
3538 | + |
3539 | +# Shared library base address. Currently only used on Windows. |
3540 | +# |
3541 | + |
3542 | +BASEADDR= |
3543 | + |
3544 | +DIRS= crypto fips ssl engines apps test tools |
3545 | +SHLIBDIRS= crypto ssl fips |
3546 | |
3547 | # dirs in crypto to build |
3548 | SDIRS= \ |
3549 | @@ -115,7 +142,7 @@ |
3550 | bn ec rsa dsa ecdsa dh ecdh dso engine \ |
3551 | buffer bio stack lhash rand err \ |
3552 | evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ |
3553 | - store pqueue |
3554 | + store cms pqueue jpake |
3555 | # keep in mind that the above list is adjusted by ./Configure |
3556 | # according to no-xxx arguments... |
3557 | |
3558 | @@ -125,11 +152,10 @@ |
3559 | |
3560 | MAKEFILE= Makefile |
3561 | |
3562 | -MANDIR=/usr/share/man |
3563 | +MANDIR=$(OPENSSLDIR)/man |
3564 | MAN1=1 |
3565 | MAN3=3 |
3566 | -MANSUFFIX=ssl |
3567 | -MANSECTION=SSL |
3568 | +MANSUFFIX= |
3569 | SHELL=/bin/sh |
3570 | |
3571 | TOP= . |
3572 | @@ -139,6 +165,7 @@ |
3573 | LIBS= libcrypto.a libssl.a |
3574 | SHARED_CRYPTO=libcrypto$(SHLIB_EXT) |
3575 | SHARED_SSL=libssl$(SHLIB_EXT) |
3576 | +SHARED_FIPS= |
3577 | SHARED_LIBS= |
3578 | SHARED_LIBS_LINK_EXTS= |
3579 | SHARED_LDFLAGS= |
3580 | @@ -192,6 +219,10 @@ |
3581 | SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' \ |
3582 | MD5_ASM_OBJ='${MD5_ASM_OBJ}' \ |
3583 | RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' \ |
3584 | + FIPSLIBDIR='${FIPSLIBDIR}' \ |
3585 | + FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}" \ |
3586 | + FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}' \ |
3587 | + FIPS_EX_OBJ='${FIPS_EX_OBJ}' \ |
3588 | THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES= |
3589 | # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors, |
3590 | # which in turn eliminates ambiguities in variable treatment with -e. |
3591 | @@ -210,7 +241,8 @@ |
3592 | # subdirectories defined in $(DIRS). It requires that the target |
3593 | # is given through the shell variable `target'. |
3594 | BUILD_CMD= if [ -d "$$dir" ]; then \ |
3595 | - ( cd $$dir && echo "making $$target in $$dir..." && \ |
3596 | + ( [ $$target != all -a -z "$(FIPSCANLIB)" ] && FIPSCANLIB=/dev/null; \ |
3597 | + cd $$dir && echo "making $$target in $$dir..." && \ |
3598 | $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \ |
3599 | ) || exit 1; \ |
3600 | fi |
3601 | @@ -223,13 +255,84 @@ |
3602 | reflect: |
3603 | @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV) |
3604 | |
3605 | +FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ |
3606 | + ../crypto/aes/aes_ecb.o \ |
3607 | + ../crypto/aes/aes_ofb.o \ |
3608 | + ../crypto/bn/bn_add.o \ |
3609 | + ../crypto/bn/bn_blind.o \ |
3610 | + ../crypto/bn/bn_ctx.o \ |
3611 | + ../crypto/bn/bn_div.o \ |
3612 | + ../crypto/bn/bn_exp2.o \ |
3613 | + ../crypto/bn/bn_exp.o \ |
3614 | + ../crypto/bn/bn_gcd.o \ |
3615 | + ../crypto/bn/bn_lib.o \ |
3616 | + ../crypto/bn/bn_mod.o \ |
3617 | + ../crypto/bn/bn_mont.o \ |
3618 | + ../crypto/bn/bn_mul.o \ |
3619 | + ../crypto/bn/bn_prime.o \ |
3620 | + ../crypto/bn/bn_rand.o \ |
3621 | + ../crypto/bn/bn_recp.o \ |
3622 | + ../crypto/bn/bn_shift.o \ |
3623 | + ../crypto/bn/bn_sqr.o \ |
3624 | + ../crypto/bn/bn_word.o \ |
3625 | + ../crypto/bn/bn_x931p.o \ |
3626 | + ../crypto/buffer/buf_str.o \ |
3627 | + ../crypto/cryptlib.o \ |
3628 | + ../crypto/des/cfb64ede.o \ |
3629 | + ../crypto/des/cfb64enc.o \ |
3630 | + ../crypto/des/cfb_enc.o \ |
3631 | + ../crypto/des/ecb3_enc.o \ |
3632 | + ../crypto/des/ecb_enc.o \ |
3633 | + ../crypto/des/ofb64ede.o \ |
3634 | + ../crypto/des/ofb64enc.o \ |
3635 | + ../crypto/des/fcrypt.o \ |
3636 | + ../crypto/des/set_key.o \ |
3637 | + ../crypto/dsa/dsa_utl.o \ |
3638 | + ../crypto/dsa/dsa_sign.o \ |
3639 | + ../crypto/dsa/dsa_vrf.o \ |
3640 | + ../crypto/err/err.o \ |
3641 | + ../crypto/evp/digest.o \ |
3642 | + ../crypto/evp/enc_min.o \ |
3643 | + ../crypto/evp/e_aes.o \ |
3644 | + ../crypto/evp/e_des3.o \ |
3645 | + ../crypto/evp/p_sign.o \ |
3646 | + ../crypto/evp/p_verify.o \ |
3647 | + ../crypto/mem_clr.o \ |
3648 | + ../crypto/mem.o \ |
3649 | + ../crypto/rand/md_rand.o \ |
3650 | + ../crypto/rand/rand_egd.o \ |
3651 | + ../crypto/rand/randfile.o \ |
3652 | + ../crypto/rand/rand_lib.o \ |
3653 | + ../crypto/rand/rand_os2.o \ |
3654 | + ../crypto/rand/rand_unix.o \ |
3655 | + ../crypto/rand/rand_win.o \ |
3656 | + ../crypto/rsa/rsa_lib.o \ |
3657 | + ../crypto/rsa/rsa_none.o \ |
3658 | + ../crypto/rsa/rsa_oaep.o \ |
3659 | + ../crypto/rsa/rsa_pk1.o \ |
3660 | + ../crypto/rsa/rsa_pss.o \ |
3661 | + ../crypto/rsa/rsa_ssl.o \ |
3662 | + ../crypto/rsa/rsa_x931.o \ |
3663 | + ../crypto/sha/sha1dgst.o \ |
3664 | + ../crypto/sha/sha256.o \ |
3665 | + ../crypto/sha/sha512.o \ |
3666 | + ../crypto/uid.o |
3667 | + |
3668 | sub_all: build_all |
3669 | build_all: build_libs build_apps build_tests build_tools |
3670 | |
3671 | -build_libs: build_crypto build_ssl build_engines |
3672 | +build_libs: build_crypto build_fips build_ssl build_shared build_engines |
3673 | |
3674 | build_crypto: |
3675 | - @dir=crypto; target=all; $(BUILD_ONE_CMD) |
3676 | + if [ -n "$(FIPSCANLIB)" ]; then \ |
3677 | + EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \ |
3678 | + ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \ |
3679 | + else \ |
3680 | + ARX='${AR}' ; \ |
3681 | + fi ; export ARX ; \ |
3682 | + dir=crypto; target=all; $(BUILD_ONE_CMD) |
3683 | +build_fips: |
3684 | + @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD) |
3685 | build_ssl: |
3686 | @dir=ssl; target=all; $(BUILD_ONE_CMD) |
3687 | build_engines: |
3688 | @@ -245,9 +348,20 @@ |
3689 | build_testapps: |
3690 | @dir=crypto; target=testapps; $(BUILD_ONE_CMD) |
3691 | |
3692 | -libcrypto$(SHLIB_EXT): libcrypto.a |
3693 | +build_shared: $(SHARED_LIBS) |
3694 | +libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS) |
3695 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ |
3696 | - $(MAKE) SHLIBDIRS=crypto build-shared; \ |
3697 | + if [ "$(FIPSCANLIB)" = "libfips" ]; then \ |
3698 | + $(ARD) libcrypto.a fipscanister.o ; \ |
3699 | + $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \ |
3700 | + $(AR) libcrypto.a fips/fipscanister.o ; \ |
3701 | + else \ |
3702 | + if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ |
3703 | + FIPSLD_CC=$(CC); CC=fips/fipsld; \ |
3704 | + export CC FIPSLD_CC; \ |
3705 | + fi; \ |
3706 | + $(MAKE) -e SHLIBDIRS='crypto' build-shared; \ |
3707 | + fi \ |
3708 | else \ |
3709 | echo "There's no support for shared libraries on this platform" >&2; \ |
3710 | exit 1; \ |
3711 | @@ -255,12 +369,32 @@ |
3712 | |
3713 | libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a |
3714 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ |
3715 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ |
3716 | + shlibdeps=-lcrypto; \ |
3717 | + [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \ |
3718 | + $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ |
3719 | + else \ |
3720 | + echo "There's no support for shared libraries on this platform" >&2 ; \ |
3721 | + exit 1; \ |
3722 | + fi |
3723 | + |
3724 | +fips/fipscanister.o: build_fips |
3725 | +libfips$(SHLIB_EXT): fips/fipscanister.o |
3726 | + @if [ "$(SHLIB_TARGET)" != "" ]; then \ |
3727 | + FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \ |
3728 | + $(MAKE) -f Makefile.shared -e $(BUILDENV) \ |
3729 | + CC=$${CC} LIBNAME=fips THIS=$@ \ |
3730 | + LIBEXTRAS=fips/fipscanister.o \ |
3731 | + LIBDEPS="$(EX_LIBS)" \ |
3732 | + LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \ |
3733 | + link_o.$(SHLIB_TARGET) || { rm -f $@; exit 1; } \ |
3734 | else \ |
3735 | echo "There's no support for shared libraries on this platform" >&2; \ |
3736 | exit 1; \ |
3737 | fi |
3738 | |
3739 | +libfips.a: |
3740 | + dir=fips; target=all; $(BUILD_ONE_CMD) |
3741 | + |
3742 | clean-shared: |
3743 | @set -e; for i in $(SHLIBDIRS); do \ |
3744 | if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \ |
3745 | @@ -309,8 +443,7 @@ |
3746 | echo 'Description: OpenSSL cryptography library'; \ |
3747 | echo 'Version: '$(VERSION); \ |
3748 | echo 'Requires: '; \ |
3749 | - echo 'Libs: -L$${libdir} -lcrypto'; \ |
3750 | - echo 'Libs.private: $(EX_LIBS)'; \ |
3751 | + echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \ |
3752 | echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc |
3753 | |
3754 | libssl.pc: Makefile |
3755 | @@ -323,8 +456,7 @@ |
3756 | echo 'Description: Secure Sockets Layer and cryptography libraries'; \ |
3757 | echo 'Version: '$(VERSION); \ |
3758 | echo 'Requires: '; \ |
3759 | - echo 'Libs: -L$${libdir} -lssl'; \ |
3760 | - echo 'Libs.private: -lcrypto $(EX_LIBS)'; \ |
3761 | + echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ |
3762 | echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc |
3763 | |
3764 | openssl.pc: Makefile |
3765 | @@ -337,8 +469,7 @@ |
3766 | echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ |
3767 | echo 'Version: '$(VERSION); \ |
3768 | echo 'Requires: '; \ |
3769 | - echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ |
3770 | - echo 'Libs.private: $(EX_LIBS)'; \ |
3771 | + echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ |
3772 | echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc |
3773 | |
3774 | Makefile: Makefile.org Configure config |
3775 | @@ -373,6 +504,9 @@ |
3776 | @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl |
3777 | @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) |
3778 | @set -e; target=links; $(RECURSIVE_BUILD_CMD) |
3779 | + @if [ -z "$(FIPSCANLIB)" ]; then \ |
3780 | + set -e; target=links; dir=fips ; $(BUILD_CMD) ; \ |
3781 | + fi |
3782 | |
3783 | gentests: |
3784 | @(cd test && echo "generating dummy tests (if needed)..." && \ |
3785 | @@ -482,7 +616,7 @@ |
3786 | install_sw: |
3787 | @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ |
3788 | $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ |
3789 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines \ |
3790 | + $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ |
3791 | $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ |
3792 | $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ |
3793 | $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ |
3794 | @@ -560,7 +694,7 @@ |
3795 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ |
3796 | (cd `$(PERL) util/dirname.pl $$i`; \ |
3797 | sh -c "$$pod2man \ |
3798 | - --section=$${sec}$(MANSECTION) --center=OpenSSL \ |
3799 | + --section=$$sec --center=OpenSSL \ |
3800 | --release=$(VERSION) `basename $$i`") \ |
3801 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ |
3802 | $(PERL) util/extract-names.pl < $$i | \ |
3803 | @@ -577,7 +711,7 @@ |
3804 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ |
3805 | (cd `$(PERL) util/dirname.pl $$i`; \ |
3806 | sh -c "$$pod2man \ |
3807 | - --section=$${sec}$(MANSECTION) --center=OpenSSL \ |
3808 | + --section=$$sec --center=OpenSSL \ |
3809 | --release=$(VERSION) `basename $$i`") \ |
3810 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ |
3811 | $(PERL) util/extract-names.pl < $$i | \ |
3812 | |
3813 | === modified file 'Makefile.shared' |
3814 | --- Makefile.shared 2008-11-11 17:24:44 +0000 |
3815 | +++ Makefile.shared 2009-12-07 19:46:11 +0000 |
3816 | @@ -101,15 +101,13 @@ |
3817 | LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ |
3818 | SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ |
3819 | SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ |
3820 | - nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \ |
3821 | LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ |
3822 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ |
3823 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ |
3824 | $${SHAREDCMD} $${SHAREDFLAGS} \ |
3825 | -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ |
3826 | $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ |
3827 | - ) && $(SYMLINK_SO); \ |
3828 | - ( $(SET_X); rm -f lib$(LIBNAME).exp ) |
3829 | + ) && $(SYMLINK_SO) |
3830 | |
3831 | SYMLINK_SO= \ |
3832 | if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \ |
3833 | @@ -151,9 +149,9 @@ |
3834 | SHLIB_SUFFIX=; \ |
3835 | ALLSYMSFLAGS='-Wl,--whole-archive'; \ |
3836 | NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ |
3837 | - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" |
3838 | + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" |
3839 | |
3840 | -DO_GNU_APP=LDFLAGS="$(CFLAGS)" |
3841 | +DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" |
3842 | |
3843 | #This is rather special. It's a special target with which one can link |
3844 | #applications without bothering with any features that have anything to |
3845 | @@ -202,8 +200,10 @@ |
3846 | # to use native NSModule(3) API and refers to dlfcn as termporary hack. |
3847 | link_o.darwin: |
3848 | @ $(CALC_VERSIONS); \ |
3849 | - SHLIB=lib$(LIBNAME); \ |
3850 | - SHLIB_SUFFIX=.so; \ |
3851 | + SHLIB=`expr "$$THIS" : '.*/\([^/\.]*\)\.'`; \ |
3852 | + SHLIB=$${SHLIB:-lib$(LIBNAME)}; \ |
3853 | + SHLIB_SUFFIX=`expr "$$THIS" : '.*\(\.[^\.]*\)$$'`; \ |
3854 | + SHLIB_SUFFIX=$${SHLIB_SUFFIX:-.so}; \ |
3855 | ALLSYMSFLAGS='-all_load'; \ |
3856 | NOALLSYMSFLAGS=''; \ |
3857 | SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \ |
3858 | @@ -491,23 +491,23 @@ |
3859 | |
3860 | link_o.aix: |
3861 | @ $(CALC_VERSIONS); \ |
3862 | - OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || :; \ |
3863 | + OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || :; \ |
3864 | OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \ |
3865 | SHLIB=lib$(LIBNAME).so; \ |
3866 | SHLIB_SUFFIX=; \ |
3867 | ALLSYMSFLAGS=''; \ |
3868 | NOALLSYMSFLAGS=''; \ |
3869 | - SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \ |
3870 | + SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \ |
3871 | $(LINK_SO_O); |
3872 | link_a.aix: |
3873 | @ $(CALC_VERSIONS); \ |
3874 | - OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || : ; \ |
3875 | + OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \ |
3876 | OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \ |
3877 | SHLIB=lib$(LIBNAME).so; \ |
3878 | SHLIB_SUFFIX=; \ |
3879 | ALLSYMSFLAGS='-bnogc'; \ |
3880 | NOALLSYMSFLAGS=''; \ |
3881 | - SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \ |
3882 | + SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \ |
3883 | $(LINK_SO_A_VIA_O) |
3884 | link_app.aix: |
3885 | LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \ |
3886 | |
3887 | === modified file 'NEWS' |
3888 | --- NEWS 2007-12-05 00:13:39 +0000 |
3889 | +++ NEWS 2009-12-07 19:46:11 +0000 |
3890 | @@ -5,8 +5,26 @@ |
3891 | This file gives a brief overview of the major changes between each OpenSSL |
3892 | release. For more details please read the CHANGES file. |
3893 | |
3894 | + Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k: |
3895 | + |
3896 | + o Fix various build issues. |
3897 | + o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789) |
3898 | + |
3899 | + Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j: |
3900 | + |
3901 | + o Fix security issue (CVE-2008-5077) |
3902 | + o Merge FIPS 140-2 branch code. |
3903 | + |
3904 | + Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h: |
3905 | + |
3906 | + o CryptoAPI ENGINE support. |
3907 | + o Various precautionary measures. |
3908 | + o Fix for bugs affecting certificate request creation. |
3909 | + o Support for local machine keyset attribute in PKCS#12 files. |
3910 | + |
3911 | Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g: |
3912 | |
3913 | + o Backport of CMS functionality to 0.9.8. |
3914 | o Fixes for bugs introduced with 0.9.8f. |
3915 | |
3916 | Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f: |
3917 | |
3918 | === modified file 'Netware/build.bat' |
3919 | --- Netware/build.bat 2005-12-13 21:37:42 +0000 |
3920 | +++ Netware/build.bat 2009-12-07 19:46:11 +0000 |
3921 | @@ -7,8 +7,9 @@ |
3922 | rem build [target] [debug opts] [assembly opts] [configure opts] |
3923 | rem |
3924 | rem target - "netware-clib" - CLib NetWare build (WinSock Sockets) |
3925 | -rem - "netware-libc" - LibC NKS NetWare build (WinSock Sockets) |
3926 | -rem - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets) |
3927 | +rem - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets) |
3928 | +rem - "netware-libc" - LibC NetWare build (WinSock Sockets) |
3929 | +rem - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets) |
3930 | rem |
3931 | rem debug opts - "debug" - build debug |
3932 | rem |
3933 | @@ -71,10 +72,12 @@ |
3934 | if "%1" == "nw-nasm" set ARG_PROCESSED=YES |
3935 | if "%1" == "nw-mwasm" set ASM_MODE=nw-mwasm |
3936 | if "%1" == "nw-mwasm" set ASSEMBLER=Metrowerks |
3937 | -if "%1" == "nw-mwasm" set NO_ASM= |
3938 | +if "%1" == "nw-mwasm" set NO_ASM= |
3939 | if "%1" == "nw-mwasm" set ARG_PROCESSED=YES |
3940 | if "%1" == "netware-clib" set BLD_TARGET=netware-clib |
3941 | if "%1" == "netware-clib" set ARG_PROCESSED=YES |
3942 | +if "%1" == "netware-clib-bsdsock" set BLD_TARGET=netware-clib-bsdsock |
3943 | +if "%1" == "netware-clib-bsdsock" set ARG_PROCESSED=YES |
3944 | if "%1" == "netware-libc" set BLD_TARGET=netware-libc |
3945 | if "%1" == "netware-libc" set ARG_PROCESSED=YES |
3946 | if "%1" == "netware-libc-bsdsock" set BLD_TARGET=netware-libc-bsdsock |
3947 | @@ -94,6 +97,7 @@ |
3948 | rem build the nlm make file name which includes target and debug info |
3949 | set NLM_MAKE= |
3950 | if "%BLD_TARGET%" == "netware-clib" set NLM_MAKE=netware\nlm_clib |
3951 | +if "%BLD_TARGET%" == "netware-clib-bsdsock" set NLM_MAKE=netware\nlm_clib_bsdsock |
3952 | if "%BLD_TARGET%" == "netware-libc" set NLM_MAKE=netware\nlm_libc |
3953 | if "%BLD_TARGET%" == "netware-libc-bsdsock" set NLM_MAKE=netware\nlm_libc_bsdsock |
3954 | if "%DEBUG%" == "" set NLM_MAKE=%NLM_MAKE%.mak |
3955 | @@ -110,7 +114,14 @@ |
3956 | |
3957 | echo Bignum |
3958 | cd crypto\bn\asm |
3959 | -perl x86.pl %ASM_MODE% > bn-nw.asm |
3960 | +rem perl x86.pl %ASM_MODE% > bn-nw.asm |
3961 | +perl bn-586.pl %ASM_MODE% > bn-nw.asm |
3962 | +perl co-586.pl %ASM_MODE% > co-nw.asm |
3963 | +cd ..\..\.. |
3964 | + |
3965 | +echo AES |
3966 | +cd crypto\aes\asm |
3967 | +perl aes-586.pl %ASM_MODE% > a-nw.asm |
3968 | cd ..\..\.. |
3969 | |
3970 | echo DES |
3971 | @@ -160,6 +171,11 @@ |
3972 | perl rc5-586.pl %ASM_MODE% > r5-nw.asm |
3973 | cd ..\..\.. |
3974 | |
3975 | +echo CPUID |
3976 | +cd crypto |
3977 | +perl x86cpuid.pl %ASM_MODE% > x86cpuid-nw.asm |
3978 | +cd ..\ |
3979 | + |
3980 | rem =============================================================== |
3981 | rem |
3982 | :do_config |
3983 | @@ -176,8 +192,10 @@ |
3984 | echo . |
3985 | perl util\mk1mf.pl %DEBUG% %ASM_MODE% %CONFIG_OPTS% %BLD_TARGET% >%NLM_MAKE% |
3986 | |
3987 | +make -f %NLM_MAKE% vclean |
3988 | +echo . |
3989 | echo The makefile "%NLM_MAKE%" has been created use your maketool to |
3990 | -echo build (ex: gmake -f %NLM_MAKE%) |
3991 | +echo build (ex: make -f %NLM_MAKE%) |
3992 | goto end |
3993 | |
3994 | rem =============================================================== |
3995 | @@ -189,8 +207,9 @@ |
3996 | echo . usage: build [target] [debug opts] [assembly opts] [configure opts] |
3997 | echo . |
3998 | echo . target - "netware-clib" - CLib NetWare build (WinSock Sockets) |
3999 | -echo . - "netware-libc" - LibC NKS NetWare build (WinSock Sockets) |
4000 | -echo . - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets) |
4001 | +echo . - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets) |
4002 | +echo . - "netware-libc" - LibC NetWare build (WinSock Sockets) |
4003 | +echo . - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets) |
4004 | echo . |
4005 | echo . debug opts - "debug" - build debug |
4006 | echo . |
4007 | |
4008 | === modified file 'Netware/cpy_tests.bat' |
4009 | --- Netware/cpy_tests.bat 2005-12-13 21:37:42 +0000 |
4010 | +++ Netware/cpy_tests.bat 2009-12-07 19:46:11 +0000 |
4011 | @@ -73,6 +73,7 @@ |
4012 | copy %loc%\test\testx509.pem %2\openssl\test\ |
4013 | copy %loc%\test\v3-cert1.pem %2\openssl\test\ |
4014 | copy %loc%\test\v3-cert2.pem %2\openssl\test\ |
4015 | +copy %loc%\crypto\evp\evptests.txt %2\openssl\test\ |
4016 | |
4017 | rem copy the apps directory stuff |
4018 | copy %loc%\apps\client.pem %2\openssl\apps\ |
4019 | |
4020 | === modified file 'Netware/do_tests.pl' |
4021 | --- Netware/do_tests.pl 2009-05-14 14:11:05 +0000 |
4022 | +++ Netware/do_tests.pl 2009-12-07 19:46:11 +0000 |
4023 | @@ -34,12 +34,17 @@ |
4024 | # delete all the output files in the output directory |
4025 | unlink <$output_path\\*.*>; |
4026 | |
4027 | - # open the main log file |
4028 | + # open the main log file |
4029 | open(OUT, ">$log_file") || die "unable to open $log_file\n"; |
4030 | |
4031 | - |
4032 | + print( OUT "========================================================\n"); |
4033 | + my $outFile = "$output_path\\version.out"; |
4034 | + system("openssl2 version (CLIB_OPT)/>$outFile"); |
4035 | + log_output("CHECKING FOR OPENSSL VERSION:", $outFile); |
4036 | + |
4037 | algorithm_tests(); |
4038 | encryption_tests(); |
4039 | + evp_tests(); |
4040 | pem_tests(); |
4041 | verify_tests(); |
4042 | ca_tests(); |
4043 | @@ -56,9 +61,10 @@ |
4044 | { |
4045 | my $i; |
4046 | my $outFile; |
4047 | - my @tests = ( rsa_test, destest, ideatest, bftest, shatest, sha1test, |
4048 | - md5test, dsatest, md2test, mdc2test, rc2test, rc4test, randtest, |
4049 | - dhtest, exptest ); |
4050 | + my @tests = ( rsa_test, destest, ideatest, bftest, bntest, shatest, sha1test, |
4051 | + sha256t, sha512t, dsatest, md2test, md4test, md5test, mdc2test, |
4052 | + rc2test, rc4test, rc5test, randtest, rmdtest, dhtest, ecdhtest, |
4053 | + ecdsatest, ectest, exptest, casttest, hmactest ); |
4054 | |
4055 | print( "\nRUNNING CRYPTO ALGORITHM TESTS:\n\n"); |
4056 | |
4057 | @@ -68,16 +74,16 @@ |
4058 | foreach $i (@tests) |
4059 | { |
4060 | if (-e "$base_path\\$i.nlm") |
4061 | - { |
4062 | + { |
4063 | $outFile = "$output_path\\$i.out"; |
4064 | - system("$i > $outFile"); |
4065 | + system("$i (CLIB_OPT)/>$outFile"); |
4066 | log_desc("Test: $i\.nlm:"); |
4067 | log_output("", $outFile ); |
4068 | - } |
4069 | - else |
4070 | - { |
4071 | + } |
4072 | + else |
4073 | + { |
4074 | log_desc("Test: $i\.nlm: file not found"); |
4075 | - } |
4076 | + } |
4077 | } |
4078 | } |
4079 | |
4080 | @@ -109,24 +115,24 @@ |
4081 | |
4082 | # do encryption |
4083 | $outFile = "$output_path\\enc.out"; |
4084 | - system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher > $outFile" ); |
4085 | + system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile" ); |
4086 | log_output("Encrypting: $input --> $cipher", $outFile); |
4087 | |
4088 | # do decryption |
4089 | $outFile = "$output_path\\dec.out"; |
4090 | - system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear > $outFile"); |
4091 | + system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile"); |
4092 | log_output("Decrypting: $cipher --> $clear", $outFile); |
4093 | |
4094 | # compare files |
4095 | $x = compare_files( $input, $clear, 1); |
4096 | if ( $x == 0 ) |
4097 | { |
4098 | - print( "SUCCESS - files match: $input, $clear\n"); |
4099 | + print( "\rSUCCESS - files match: $input, $clear\n"); |
4100 | print( OUT "SUCCESS - files match: $input, $clear\n"); |
4101 | } |
4102 | else |
4103 | { |
4104 | - print( "ERROR: files don't match\n"); |
4105 | + print( "\rERROR: files don't match\n"); |
4106 | print( OUT "ERROR: files don't match\n"); |
4107 | } |
4108 | |
4109 | @@ -136,24 +142,24 @@ |
4110 | |
4111 | # do encryption B64 |
4112 | $outFile = "$output_path\\B64enc.out"; |
4113 | - system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher > $outFile"); |
4114 | + system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile"); |
4115 | log_output("Encrypting(B64): $cipher --> $clear", $outFile); |
4116 | |
4117 | # do decryption B64 |
4118 | $outFile = "$output_path\\B64dec.out"; |
4119 | - system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear > $outFile"); |
4120 | + system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile"); |
4121 | log_output("Decrypting(B64): $cipher --> $clear", $outFile); |
4122 | |
4123 | # compare files |
4124 | $x = compare_files( $input, $clear, 1); |
4125 | if ( $x == 0 ) |
4126 | { |
4127 | - print( "SUCCESS - files match: $input, $clear\n"); |
4128 | + print( "\rSUCCESS - files match: $input, $clear\n"); |
4129 | print( OUT "SUCCESS - files match: $input, $clear\n"); |
4130 | } |
4131 | else |
4132 | { |
4133 | - print( "ERROR: files don't match\n"); |
4134 | + print( "\rERROR: files don't match\n"); |
4135 | print( OUT "ERROR: files don't match\n"); |
4136 | } |
4137 | |
4138 | @@ -199,24 +205,24 @@ |
4139 | |
4140 | if ($i ne "req" ) |
4141 | { |
4142 | - system("openssl2 $i -in $input -out $tmp_out > $outFile"); |
4143 | + system("openssl2 $i -in $input -out $tmp_out (CLIB_OPT)/>$outFile"); |
4144 | log_output( "openssl2 $i -in $input -out $tmp_out", $outFile); |
4145 | } |
4146 | else |
4147 | { |
4148 | - system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config > $outFile"); |
4149 | + system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config (CLIB_OPT)/>$outFile"); |
4150 | log_output( "openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config", $outFile ); |
4151 | } |
4152 | |
4153 | $x = compare_files( $input, $tmp_out); |
4154 | if ( $x == 0 ) |
4155 | { |
4156 | - print( "SUCCESS - files match: $input, $tmp_out\n"); |
4157 | + print( "\rSUCCESS - files match: $input, $tmp_out\n"); |
4158 | print( OUT "SUCCESS - files match: $input, $tmp_out\n"); |
4159 | } |
4160 | else |
4161 | { |
4162 | - print( "ERROR: files don't match\n"); |
4163 | + print( "\rERROR: files don't match\n"); |
4164 | print( OUT "ERROR: files don't match\n"); |
4165 | } |
4166 | do_wait(); |
4167 | @@ -231,7 +237,8 @@ |
4168 | my $i; |
4169 | my $outFile = "$output_path\\verify.out"; |
4170 | |
4171 | - my @cert_files = <$cert_path\\*.pem>; |
4172 | + $cert_path =~ s/\\/\//g; |
4173 | + my @cert_files = <$cert_path/*.pem>; |
4174 | |
4175 | print( "\nRUNNING VERIFY TESTS:\n\n"); |
4176 | |
4177 | @@ -242,7 +249,7 @@ |
4178 | |
4179 | foreach $i (@cert_files) |
4180 | { |
4181 | - system("openssl2 verify -CAfile $tmp_cert $i >$outFile"); |
4182 | + system("openssl2 verify -CAfile $tmp_cert $i (CLIB_OPT)/>$outFile"); |
4183 | log_desc("Verifying cert: $i"); |
4184 | log_output("openssl2 verify -CAfile $tmp_cert $i", $outFile); |
4185 | } |
4186 | @@ -263,103 +270,103 @@ |
4187 | print( OUT "\n========================================================\n"); |
4188 | print( OUT "SSL TESTS:\n\n"); |
4189 | |
4190 | - system("ssltest -ssl2 >$outFile"); |
4191 | + system("ssltest -ssl2 (CLIB_OPT)/>$outFile"); |
4192 | log_desc("Testing sslv2:"); |
4193 | log_output("ssltest -ssl2", $outFile); |
4194 | |
4195 | - system("$ssltest -ssl2 -server_auth >$outFile"); |
4196 | + system("$ssltest -ssl2 -server_auth (CLIB_OPT)/>$outFile"); |
4197 | log_desc("Testing sslv2 with server authentication:"); |
4198 | log_output("$ssltest -ssl2 -server_auth", $outFile); |
4199 | |
4200 | - system("$ssltest -ssl2 -client_auth >$outFile"); |
4201 | + system("$ssltest -ssl2 -client_auth (CLIB_OPT)/>$outFile"); |
4202 | log_desc("Testing sslv2 with client authentication:"); |
4203 | log_output("$ssltest -ssl2 -client_auth", $outFile); |
4204 | |
4205 | - system("$ssltest -ssl2 -server_auth -client_auth >$outFile"); |
4206 | + system("$ssltest -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile"); |
4207 | log_desc("Testing sslv2 with both client and server authentication:"); |
4208 | log_output("$ssltest -ssl2 -server_auth -client_auth", $outFile); |
4209 | |
4210 | - system("ssltest -ssl3 >$outFile"); |
4211 | + system("ssltest -ssl3 (CLIB_OPT)/>$outFile"); |
4212 | log_desc("Testing sslv3:"); |
4213 | log_output("ssltest -ssl3", $outFile); |
4214 | |
4215 | - system("$ssltest -ssl3 -server_auth >$outFile"); |
4216 | + system("$ssltest -ssl3 -server_auth (CLIB_OPT)/>$outFile"); |
4217 | log_desc("Testing sslv3 with server authentication:"); |
4218 | log_output("$ssltest -ssl3 -server_auth", $outFile); |
4219 | |
4220 | - system("$ssltest -ssl3 -client_auth >$outFile"); |
4221 | + system("$ssltest -ssl3 -client_auth (CLIB_OPT)/>$outFile"); |
4222 | log_desc("Testing sslv3 with client authentication:"); |
4223 | log_output("$ssltest -ssl3 -client_auth", $outFile); |
4224 | |
4225 | - system("$ssltest -ssl3 -server_auth -client_auth >$outFile"); |
4226 | + system("$ssltest -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile"); |
4227 | log_desc("Testing sslv3 with both client and server authentication:"); |
4228 | log_output("$ssltest -ssl3 -server_auth -client_auth", $outFile); |
4229 | |
4230 | - system("ssltest >$outFile"); |
4231 | + system("ssltest (CLIB_OPT)/>$outFile"); |
4232 | log_desc("Testing sslv2/sslv3:"); |
4233 | log_output("ssltest", $outFile); |
4234 | |
4235 | - system("$ssltest -server_auth >$outFile"); |
4236 | + system("$ssltest -server_auth (CLIB_OPT)/>$outFile"); |
4237 | log_desc("Testing sslv2/sslv3 with server authentication:"); |
4238 | log_output("$ssltest -server_auth", $outFile); |
4239 | |
4240 | - system("$ssltest -client_auth >$outFile"); |
4241 | + system("$ssltest -client_auth (CLIB_OPT)/>$outFile"); |
4242 | log_desc("Testing sslv2/sslv3 with client authentication:"); |
4243 | log_output("$ssltest -client_auth ", $outFile); |
4244 | |
4245 | - system("$ssltest -server_auth -client_auth >$outFile"); |
4246 | + system("$ssltest -server_auth -client_auth (CLIB_OPT)/>$outFile"); |
4247 | log_desc("Testing sslv2/sslv3 with both client and server authentication:"); |
4248 | log_output("$ssltest -server_auth -client_auth", $outFile); |
4249 | |
4250 | - system("ssltest -bio_pair -ssl2 >$outFile"); |
4251 | + system("ssltest -bio_pair -ssl2 (CLIB_OPT)/>$outFile"); |
4252 | log_desc("Testing sslv2 via BIO pair:"); |
4253 | log_output("ssltest -bio_pair -ssl2", $outFile); |
4254 | |
4255 | - system("ssltest -bio_pair -dhe1024dsa -v >$outFile"); |
4256 | + system("ssltest -bio_pair -dhe1024dsa -v (CLIB_OPT)/>$outFile"); |
4257 | log_desc("Testing sslv2/sslv3 with 1024 bit DHE via BIO pair:"); |
4258 | log_output("ssltest -bio_pair -dhe1024dsa -v", $outFile); |
4259 | |
4260 | - system("$ssltest -bio_pair -ssl2 -server_auth >$outFile"); |
4261 | + system("$ssltest -bio_pair -ssl2 -server_auth (CLIB_OPT)/>$outFile"); |
4262 | log_desc("Testing sslv2 with server authentication via BIO pair:"); |
4263 | log_output("$ssltest -bio_pair -ssl2 -server_auth", $outFile); |
4264 | |
4265 | - system("$ssltest -bio_pair -ssl2 -client_auth >$outFile"); |
4266 | + system("$ssltest -bio_pair -ssl2 -client_auth (CLIB_OPT)/>$outFile"); |
4267 | log_desc("Testing sslv2 with client authentication via BIO pair:"); |
4268 | log_output("$ssltest -bio_pair -ssl2 -client_auth", $outFile); |
4269 | |
4270 | - system("$ssltest -bio_pair -ssl2 -server_auth -client_auth >$outFile"); |
4271 | + system("$ssltest -bio_pair -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile"); |
4272 | log_desc("Testing sslv2 with both client and server authentication via BIO pair:"); |
4273 | log_output("$ssltest -bio_pair -ssl2 -server_auth -client_auth", $outFile); |
4274 | |
4275 | - system("ssltest -bio_pair -ssl3 >$outFile"); |
4276 | + system("ssltest -bio_pair -ssl3 (CLIB_OPT)/>$outFile"); |
4277 | log_desc("Testing sslv3 via BIO pair:"); |
4278 | log_output("ssltest -bio_pair -ssl3", $outFile); |
4279 | |
4280 | - system("$ssltest -bio_pair -ssl3 -server_auth >$outFile"); |
4281 | + system("$ssltest -bio_pair -ssl3 -server_auth (CLIB_OPT)/>$outFile"); |
4282 | log_desc("Testing sslv3 with server authentication via BIO pair:"); |
4283 | log_output("$ssltest -bio_pair -ssl3 -server_auth", $outFile); |
4284 | |
4285 | - system("$ssltest -bio_pair -ssl3 -client_auth >$outFile"); |
4286 | + system("$ssltest -bio_pair -ssl3 -client_auth (CLIB_OPT)/>$outFile"); |
4287 | log_desc("Testing sslv3 with client authentication via BIO pair:"); |
4288 | log_output("$ssltest -bio_pair -ssl3 -client_auth", $outFile); |
4289 | |
4290 | - system("$ssltest -bio_pair -ssl3 -server_auth -client_auth >$outFile"); |
4291 | + system("$ssltest -bio_pair -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile"); |
4292 | log_desc("Testing sslv3 with both client and server authentication via BIO pair:"); |
4293 | log_output("$ssltest -bio_pair -ssl3 -server_auth -client_auth", $outFile); |
4294 | |
4295 | - system("ssltest -bio_pair >$outFile"); |
4296 | + system("ssltest -bio_pair (CLIB_OPT)/>$outFile"); |
4297 | log_desc("Testing sslv2/sslv3 via BIO pair:"); |
4298 | log_output("ssltest -bio_pair", $outFile); |
4299 | |
4300 | - system("$ssltest -bio_pair -server_auth >$outFile"); |
4301 | + system("$ssltest -bio_pair -server_auth (CLIB_OPT)/>$outFile"); |
4302 | log_desc("Testing sslv2/sslv3 with server authentication via BIO pair:"); |
4303 | log_output("$ssltest -bio_pair -server_auth", $outFile); |
4304 | |
4305 | - system("$ssltest -bio_pair -client_auth >$outFile"); |
4306 | + system("$ssltest -bio_pair -client_auth (CLIB_OPT)/>$outFile"); |
4307 | log_desc("Testing sslv2/sslv3 with client authentication via BIO pair:"); |
4308 | log_output("$ssltest -bio_pair -client_auth", $outFile); |
4309 | |
4310 | - system("$ssltest -bio_pair -server_auth -client_auth >$outFile"); |
4311 | + system("$ssltest -bio_pair -server_auth -client_auth (CLIB_OPT)/>$outFile"); |
4312 | log_desc("Testing sslv2/sslv3 with both client and server authentication via BIO pair:"); |
4313 | log_output("$ssltest -bio_pair -server_auth -client_auth", $outFile); |
4314 | } |
4315 | @@ -389,43 +396,43 @@ |
4316 | print( OUT "\n========================================================\n"); |
4317 | print( OUT "CA TESTS:\n"); |
4318 | |
4319 | - system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new >$outFile"); |
4320 | + system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new (CLIB_OPT)/>$outFile"); |
4321 | log_desc("Make a certificate request using req:"); |
4322 | log_output("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new", $outFile); |
4323 | |
4324 | - system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey >$outFile"); |
4325 | + system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey (CLIB_OPT)/>$outFile"); |
4326 | log_desc("Convert the certificate request into a self signed certificate using x509:"); |
4327 | log_output("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey", $outFile); |
4328 | |
4329 | - system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 >$outFile"); |
4330 | + system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 (CLIB_OPT)/>$outFile"); |
4331 | log_desc("Convert a certificate into a certificate request using 'x509':"); |
4332 | log_output("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2", $outFile); |
4333 | |
4334 | - system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout >$outFile"); |
4335 | + system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout (CLIB_OPT)/>$outFile"); |
4336 | log_output("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout", $outFile); |
4337 | |
4338 | - system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout >$outFile"); |
4339 | + system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout (CLIB_OPT)/>$outFile"); |
4340 | log_output( "openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout", $outFile); |
4341 | |
4342 | - system("openssl2 verify -CAfile $CAcert $CAcert >$outFile"); |
4343 | + system("openssl2 verify -CAfile $CAcert $CAcert (CLIB_OPT)/>$outFile"); |
4344 | log_output("openssl2 verify -CAfile $CAcert $CAcert", $outFile); |
4345 | |
4346 | - system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new >$outFile"); |
4347 | + system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new (CLIB_OPT)/>$outFile"); |
4348 | log_desc("Make another certificate request using req:"); |
4349 | log_output("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new", $outFile); |
4350 | |
4351 | - system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial >$outFile"); |
4352 | + system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial (CLIB_OPT)/>$outFile"); |
4353 | log_desc("Sign certificate request with the just created CA via x509:"); |
4354 | log_output("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial", $outFile); |
4355 | |
4356 | - system("openssl2 verify -CAfile $CAcert $Ucert >$outFile"); |
4357 | + system("openssl2 verify -CAfile $CAcert $Ucert (CLIB_OPT)/>$outFile"); |
4358 | log_output("openssl2 verify -CAfile $CAcert $Ucert", $outFile); |
4359 | |
4360 | - system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert >$outFile"); |
4361 | + system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert (CLIB_OPT)/>$outFile"); |
4362 | log_desc("Certificate details"); |
4363 | log_output("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert", $outFile); |
4364 | |
4365 | - print(OUT "-- \n"); |
4366 | + print(OUT "--\n"); |
4367 | print(OUT "The generated CA certificate is $CAcert\n"); |
4368 | print(OUT "The generated CA private key is $CAkey\n"); |
4369 | print(OUT "The current CA signing serial number is in $CAserial\n"); |
4370 | @@ -436,6 +443,29 @@ |
4371 | } |
4372 | |
4373 | ############################################################################ |
4374 | +sub evp_tests |
4375 | +{ |
4376 | + my $i = 'evp_test'; |
4377 | + |
4378 | + print( "\nRUNNING EVP TESTS:\n\n"); |
4379 | + |
4380 | + print( OUT "\n========================================================\n"); |
4381 | + print( OUT "EVP TESTS:\n\n"); |
4382 | + |
4383 | + if (-e "$base_path\\$i.nlm") |
4384 | + { |
4385 | + my $outFile = "$output_path\\$i.out"; |
4386 | + system("$i $test_path\\evptests.txt (CLIB_OPT)/>$outFile"); |
4387 | + log_desc("Test: $i\.nlm:"); |
4388 | + log_output("", $outFile ); |
4389 | + } |
4390 | + else |
4391 | + { |
4392 | + log_desc("Test: $i\.nlm: file not found"); |
4393 | + } |
4394 | +} |
4395 | + |
4396 | +############################################################################ |
4397 | sub log_output( $ $ ) |
4398 | { |
4399 | my( $desc, $file ) = @_; |
4400 | @@ -445,7 +475,7 @@ |
4401 | |
4402 | if ($desc) |
4403 | { |
4404 | - print("$desc\n"); |
4405 | + print("\r$desc\n"); |
4406 | print(OUT "$desc\n"); |
4407 | } |
4408 | |
4409 | @@ -457,8 +487,8 @@ |
4410 | # copy test output to log file |
4411 | open(IN, "<$file"); |
4412 | while (<IN>) |
4413 | - { |
4414 | - print(OUT $_); |
4415 | + { |
4416 | + print(OUT $_); |
4417 | if ( $_ =~ /ERROR/ ) |
4418 | { |
4419 | $error = 1; |
4420 | @@ -485,13 +515,13 @@ |
4421 | $key = getc; |
4422 | print("\n"); |
4423 | } |
4424 | - |
4425 | - # Several of the testing scripts run a loop loading the |
4426 | + |
4427 | + # Several of the testing scripts run a loop loading the |
4428 | # same NLM with different options. |
4429 | - # On slow NetWare machines there appears to be some delay in the |
4430 | + # On slow NetWare machines there appears to be some delay in the |
4431 | # OS actually unloading the test nlms and the OS complains about. |
4432 | - # the NLM already being loaded. This additional pause is to |
4433 | - # to help provide a little more time for unloading before trying to |
4434 | + # the NLM already being loaded. This additional pause is to |
4435 | + # to help provide a little more time for unloading before trying to |
4436 | # load again. |
4437 | sleep(1); |
4438 | } |
4439 | @@ -562,7 +592,7 @@ |
4440 | ############################################################################ |
4441 | sub make_tmp_cert_file() |
4442 | { |
4443 | - my @cert_files = <$cert_path\\*.pem>; |
4444 | + my @cert_files = <$cert_path/*.pem>; |
4445 | |
4446 | # delete the file if it already exists |
4447 | unlink($tmp_cert); |
4448 | @@ -570,7 +600,7 @@ |
4449 | open( TMP_CERT, ">$tmp_cert") || die "\nunable to open $tmp_cert\n"; |
4450 | |
4451 | print("building temporary cert file\n"); |
4452 | - |
4453 | + |
4454 | # create a temporary cert file that contains all the certs |
4455 | foreach $i (@cert_files) |
4456 | { |
4457 | |
4458 | === modified file 'Netware/set_env.bat' |
4459 | --- Netware/set_env.bat 2005-12-13 21:37:42 +0000 |
4460 | +++ Netware/set_env.bat 2009-12-07 19:46:11 +0000 |
4461 | @@ -16,75 +16,97 @@ |
4462 | |
4463 | set LIBC_BUILD= |
4464 | set CLIB_BUILD= |
4465 | +set GNUC= |
4466 | |
4467 | if "%1" == "netware-clib" set CLIB_BUILD=Y |
4468 | if "%1" == "netware-clib" set LIBC_BUILD= |
4469 | |
4470 | -if "%1" == "netware-libc" set LIBC_BUILD=Y |
4471 | -if "%1" == "netware-libc" set CLIB_BUILD= |
4472 | +if "%1" == "netware-libc" set LIBC_BUILD=Y |
4473 | +if "%1" == "netware-libc" set CLIB_BUILD= |
4474 | + |
4475 | +if "%2" == "gnuc" set GNUC=Y |
4476 | +if "%2" == "codewarrior" set GNUC= |
4477 | |
4478 | rem Location of tools (compiler, linker, etc) |
4479 | -set TOOLS=d:\i_drive\tools |
4480 | +if "%NDKBASE%" == "" set NDKBASE=c:\Novell |
4481 | |
4482 | rem If Perl for Win32 is not already in your path, add it here |
4483 | set PERL_PATH= |
4484 | |
4485 | rem Define path to the Metrowerks command line tools |
4486 | +rem or GNU Crosscompiler gcc / nlmconv |
4487 | rem ( compiler, assembler, linker) |
4488 | -set METROWERKS_PATH=%TOOLS%\codewar\pdk_21\tools\command line tools |
4489 | -rem set METROWERKS_PATH=%TOOLS%\codewar\PDK_40\Other Metrowerks Tools\Command Line Tools |
4490 | +if "%GNUC%" == "Y" set COMPILER_PATH=c:\usr\i586-netware\bin;c:\usr\bin |
4491 | +if "%GNUC%" == "" set COMPILER_PATH=c:\prg\cwcmdl40 |
4492 | |
4493 | rem If using gnu make define path to utility |
4494 | -set GNU_MAKE_PATH=%TOOLS%\gnu |
4495 | +rem set GNU_MAKE_PATH=%NDKBASE%\gnu |
4496 | +set GNU_MAKE_PATH=c:\prg\tools |
4497 | |
4498 | rem If using ms nmake define path to nmake |
4499 | -set MS_NMAKE_PATH=%TOOLS%\msvc\600\bin |
4500 | +rem set MS_NMAKE_PATH=%NDKBASE%\msvc\600\bin |
4501 | |
4502 | rem If using NASM assembler define path |
4503 | -set NASM_PATH=%TOOLS%\nasm |
4504 | +rem set NASM_PATH=%NDKBASE%\nasm |
4505 | +set NASM_PATH=c:\prg\tools |
4506 | |
4507 | rem Update path to include tool paths |
4508 | -set path=%path%;%METROWERKS_PATH% |
4509 | +set path=%path%;%COMPILER_PATH% |
4510 | if not "%GNU_MAKE_PATH%" == "" set path=%path%;%GNU_MAKE_PATH% |
4511 | if not "%MS_NMAKE_PATH%" == "" set path=%path%;%MS_NMAKE_PATH% |
4512 | if not "%NASM_PATH%" == "" set path=%path%;%NASM_PATH% |
4513 | if not "%PERL_PATH%" == "" set path=%path%;%PERL_PATH% |
4514 | |
4515 | -rem Set MWCIncludes to location of Novell NDK includes |
4516 | -if "%LIBC_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\libc\include;%TOOLS%\ndk\libc\include\winsock;.\engines |
4517 | -if "%CLIB_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\nwsdk\include\nlm;.\engines |
4518 | -set include= |
4519 | +rem Set INCLUDES to location of Novell NDK includes |
4520 | +if "%LIBC_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\libc\include;%NDKBASE%\ndk\libc\include\winsock |
4521 | +if "%CLIB_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\nwsdk\include\nlm;%NDKBASE%\ws295sdk\include |
4522 | |
4523 | rem Set Imports to location of Novell NDK import files |
4524 | -if "%LIBC_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\libc\imports |
4525 | -if "%CLIB_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\nwsdk\imports |
4526 | +if "%LIBC_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\libc\imports |
4527 | +if "%CLIB_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\nwsdk\imports |
4528 | |
4529 | rem Set PRELUDE to the absolute path of the prelude object to link with in |
4530 | rem the Metrowerks NetWare PDK - NOTE: for Clib builds "clibpre.o" is |
4531 | rem recommended, for LibC NKS builds libcpre.o must be used |
4532 | +if "%GNUC%" == "Y" goto gnuc |
4533 | if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.o |
4534 | -if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.o |
4535 | - |
4536 | +rem if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.o |
4537 | +if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.o |
4538 | +echo using MetroWerks CodeWarrior |
4539 | +goto info |
4540 | + |
4541 | +:gnuc |
4542 | +if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.gcc.o |
4543 | +rem if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.gcc.o |
4544 | +if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.gcc.o |
4545 | +echo using GNU GCC Compiler |
4546 | + |
4547 | +:info |
4548 | +echo. |
4549 | |
4550 | if "%LIBC_BUILD%" == "Y" echo Enviroment configured for LibC build |
4551 | if "%LIBC_BUILD%" == "Y" echo use "netware\build.bat netware-libc ..." |
4552 | |
4553 | if "%CLIB_BUILD%" == "Y" echo Enviroment configured for CLib build |
4554 | if "%CLIB_BUILD%" == "Y" echo use "netware\build.bat netware-clib ..." |
4555 | + |
4556 | goto end |
4557 | |
4558 | :usage |
4559 | rem =============================================================== |
4560 | -echo . |
4561 | -echo . No target build specified! |
4562 | -echo . |
4563 | -echo . usage: set_env [target] |
4564 | -echo . |
4565 | -echo . target - "netware-clib" - Clib build |
4566 | -echo . - "netware-libc" - LibC build |
4567 | -echo . |
4568 | - |
4569 | - |
4570 | +echo. |
4571 | +echo No target build specified! |
4572 | +echo. |
4573 | +echo usage: set_env [target] [compiler] |
4574 | +echo. |
4575 | +echo target - "netware-clib" - Clib build |
4576 | +echo - "netware-libc" - LibC build |
4577 | +echo. |
4578 | +echo compiler - "gnuc" - GNU GCC Compiler |
4579 | +echo - "codewarrior" - MetroWerks CodeWarrior (default) |
4580 | +echo. |
4581 | |
4582 | :end |
4583 | +echo. |
4584 | + |
4585 | |
4586 | |
4587 | === modified file 'README' |
4588 | --- README 2007-12-05 00:13:39 +0000 |
4589 | +++ README 2009-12-07 19:46:11 +0000 |
4590 | @@ -1,7 +1,7 @@ |
4591 | |
4592 | - OpenSSL 0.9.8g |
4593 | + OpenSSL 0.9.8k |
4594 | |
4595 | - Copyright (c) 1998-2007 The OpenSSL Project |
4596 | + Copyright (c) 1998-2008 The OpenSSL Project |
4597 | Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson |
4598 | All rights reserved. |
4599 | |
4600 | @@ -161,7 +161,7 @@ |
4601 | - Stack Traceback (if the application dumps core) |
4602 | |
4603 | Report the bug to the OpenSSL project via the Request Tracker |
4604 | - (http://www.openssl.org/support/rt2.html) by mail to: |
4605 | + (http://www.openssl.org/support/rt.html) by mail to: |
4606 | |
4607 | openssl-bugs@openssl.org |
4608 | |
4609 | |
4610 | === modified file 'apps/CA.pl.in' |
4611 | --- apps/CA.pl.in 2006-05-15 16:00:58 +0000 |
4612 | +++ apps/CA.pl.in 2009-12-07 19:46:11 +0000 |
4613 | @@ -65,7 +65,6 @@ |
4614 | foreach (@ARGV) { |
4615 | if ( /^(-\?|-h|-help)$/ ) { |
4616 | print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; |
4617 | - print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; |
4618 | exit 0; |
4619 | } elsif (/^-newcert$/) { |
4620 | # create a certificate |
4621 | @@ -166,7 +165,6 @@ |
4622 | } else { |
4623 | print STDERR "Unknown arg $_\n"; |
4624 | print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; |
4625 | - print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; |
4626 | exit 1; |
4627 | } |
4628 | } |
4629 | |
4630 | === modified file 'apps/CA.sh' |
4631 | --- apps/CA.sh 2008-11-11 17:24:44 +0000 |
4632 | +++ apps/CA.sh 2009-12-07 19:46:11 +0000 |
4633 | @@ -91,7 +91,6 @@ |
4634 | -out ${CATOP}/$CAREQ |
4635 | $CA -out ${CATOP}/$CACERT $CADAYS -batch \ |
4636 | -keyfile ${CATOP}/private/$CAKEY -selfsign \ |
4637 | - -extensions v3_ca \ |
4638 | -infiles ${CATOP}/$CAREQ |
4639 | RET=$? |
4640 | fi |
4641 | |
4642 | === modified file 'apps/Makefile' |
4643 | --- apps/Makefile 2007-12-05 00:13:39 +0000 |
4644 | +++ apps/Makefile 2009-12-07 19:46:11 +0000 |
4645 | @@ -38,7 +38,7 @@ |
4646 | E_EXE= verify asn1pars req dgst dh dhparam enc passwd gendh errstr \ |
4647 | ca crl rsa rsautl dsa dsaparam ec ecparam \ |
4648 | x509 genrsa gendsa s_server s_client speed \ |
4649 | - s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \ |
4650 | + s_time version pkcs7 cms crl2pkcs7 sess_id ciphers nseq pkcs12 \ |
4651 | pkcs8 spkac smime rand engine ocsp prime |
4652 | |
4653 | PROGS= $(PROGRAM).c |
4654 | @@ -56,7 +56,7 @@ |
4655 | x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \ |
4656 | s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \ |
4657 | ciphers.o nseq.o pkcs12.o pkcs8.o spkac.o smime.o rand.o engine.o \ |
4658 | - ocsp.o prime.o |
4659 | + ocsp.o prime.o cms.o |
4660 | |
4661 | E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \ |
4662 | pkcs7.c crl2p7.c crl.c \ |
4663 | @@ -64,7 +64,7 @@ |
4664 | x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \ |
4665 | s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \ |
4666 | ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c \ |
4667 | - ocsp.c prime.c |
4668 | + ocsp.c prime.c cms.c |
4669 | |
4670 | SRC=$(E_SRC) |
4671 | |
4672 | @@ -152,10 +152,13 @@ |
4673 | $(RM) $(EXE) |
4674 | shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ |
4675 | shlib_target="$(SHLIB_TARGET)"; \ |
4676 | + elif [ -n "$(FIPSCANLIB)" ]; then \ |
4677 | + FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ |
4678 | fi; \ |
4679 | LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ |
4680 | + [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ |
4681 | $(MAKE) -f $(TOP)/Makefile.shared -e \ |
4682 | - APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ |
4683 | + CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ |
4684 | LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ |
4685 | link_app.$${shlib_target} |
4686 | -(cd ..; \ |
4687 | @@ -173,23 +176,25 @@ |
4688 | app_rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h |
4689 | app_rand.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4690 | app_rand.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4691 | -app_rand.o: ../include/openssl/evp.h ../include/openssl/lhash.h |
4692 | -app_rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4693 | +app_rand.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4694 | +app_rand.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4695 | +app_rand.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4696 | app_rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4697 | app_rand.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h |
4698 | app_rand.o: ../include/openssl/rand.h ../include/openssl/safestack.h |
4699 | app_rand.o: ../include/openssl/sha.h ../include/openssl/stack.h |
4700 | app_rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4701 | -app_rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h app_rand.c |
4702 | -app_rand.o: apps.h |
4703 | +app_rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4704 | +app_rand.o: ../include/openssl/x509v3.h app_rand.c apps.h |
4705 | apps.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4706 | apps.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4707 | apps.o: ../include/openssl/conf.h ../include/openssl/crypto.h |
4708 | apps.o: ../include/openssl/e_os2.h ../include/openssl/ec.h |
4709 | apps.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h |
4710 | apps.o: ../include/openssl/engine.h ../include/openssl/err.h |
4711 | -apps.o: ../include/openssl/evp.h ../include/openssl/lhash.h |
4712 | -apps.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4713 | +apps.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4714 | +apps.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4715 | +apps.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4716 | apps.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4717 | apps.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h |
4718 | apps.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h |
4719 | @@ -205,31 +210,32 @@ |
4720 | asn1pars.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4721 | asn1pars.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4722 | asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h |
4723 | -asn1pars.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4724 | -asn1pars.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4725 | +asn1pars.o: ../include/openssl/fips.h ../include/openssl/lhash.h |
4726 | +asn1pars.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4727 | +asn1pars.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4728 | asn1pars.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4729 | asn1pars.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4730 | asn1pars.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h |
4731 | asn1pars.o: ../include/openssl/sha.h ../include/openssl/stack.h |
4732 | asn1pars.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4733 | -asn1pars.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h |
4734 | -asn1pars.o: asn1pars.c |
4735 | +asn1pars.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4736 | +asn1pars.o: ../include/openssl/x509v3.h apps.h asn1pars.c |
4737 | ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4738 | ca.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4739 | ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h |
4740 | ca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h |
4741 | ca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h |
4742 | ca.o: ../include/openssl/engine.h ../include/openssl/err.h |
4743 | -ca.o: ../include/openssl/evp.h ../include/openssl/lhash.h |
4744 | -ca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4745 | -ca.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4746 | -ca.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4747 | -ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4748 | -ca.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h |
4749 | -ca.o: ../include/openssl/sha.h ../include/openssl/stack.h |
4750 | -ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4751 | -ca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4752 | -ca.o: ../include/openssl/x509v3.h apps.h ca.c |
4753 | +ca.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4754 | +ca.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4755 | +ca.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4756 | +ca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4757 | +ca.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h |
4758 | +ca.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h |
4759 | +ca.o: ../include/openssl/safestack.h ../include/openssl/sha.h |
4760 | +ca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h |
4761 | +ca.o: ../include/openssl/txt_db.h ../include/openssl/x509.h |
4762 | +ca.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ca.c |
4763 | ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4764 | ciphers.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4765 | ciphers.o: ../include/openssl/comp.h ../include/openssl/conf.h |
4766 | @@ -237,27 +243,44 @@ |
4767 | ciphers.o: ../include/openssl/e_os2.h ../include/openssl/ec.h |
4768 | ciphers.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h |
4769 | ciphers.o: ../include/openssl/engine.h ../include/openssl/err.h |
4770 | -ciphers.o: ../include/openssl/evp.h ../include/openssl/kssl.h |
4771 | +ciphers.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4772 | +ciphers.o: ../include/openssl/hmac.h ../include/openssl/kssl.h |
4773 | ciphers.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4774 | -ciphers.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4775 | -ciphers.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4776 | -ciphers.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4777 | -ciphers.o: ../include/openssl/pkcs7.h ../include/openssl/pq_compat.h |
4778 | -ciphers.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h |
4779 | -ciphers.o: ../include/openssl/sha.h ../include/openssl/ssl.h |
4780 | -ciphers.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h |
4781 | -ciphers.o: ../include/openssl/ssl3.h ../include/openssl/stack.h |
4782 | -ciphers.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h |
4783 | -ciphers.o: ../include/openssl/txt_db.h ../include/openssl/x509.h |
4784 | -ciphers.o: ../include/openssl/x509_vfy.h apps.h ciphers.c |
4785 | +ciphers.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4786 | +ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4787 | +ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h |
4788 | +ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h |
4789 | +ciphers.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h |
4790 | +ciphers.o: ../include/openssl/safestack.h ../include/openssl/sha.h |
4791 | +ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h |
4792 | +ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h |
4793 | +ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h |
4794 | +ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h |
4795 | +ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4796 | +ciphers.o: ../include/openssl/x509v3.h apps.h ciphers.c |
4797 | +cms.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4798 | +cms.o: ../include/openssl/buffer.h ../include/openssl/conf.h |
4799 | +cms.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h |
4800 | +cms.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4801 | +cms.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4802 | +cms.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4803 | +cms.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4804 | +cms.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4805 | +cms.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4806 | +cms.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h |
4807 | +cms.o: ../include/openssl/safestack.h ../include/openssl/sha.h |
4808 | +cms.o: ../include/openssl/stack.h ../include/openssl/symhacks.h |
4809 | +cms.o: ../include/openssl/txt_db.h ../include/openssl/x509.h |
4810 | +cms.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h cms.c |
4811 | crl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4812 | crl.o: ../include/openssl/buffer.h ../include/openssl/conf.h |
4813 | crl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h |
4814 | crl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4815 | crl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4816 | crl.o: ../include/openssl/err.h ../include/openssl/evp.h |
4817 | -crl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4818 | -crl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4819 | +crl.o: ../include/openssl/fips.h ../include/openssl/lhash.h |
4820 | +crl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4821 | +crl.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4822 | crl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4823 | crl.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4824 | crl.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h |
4825 | @@ -271,30 +294,32 @@ |
4826 | crl2p7.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4827 | crl2p7.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4828 | crl2p7.o: ../include/openssl/err.h ../include/openssl/evp.h |
4829 | -crl2p7.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4830 | -crl2p7.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4831 | +crl2p7.o: ../include/openssl/fips.h ../include/openssl/lhash.h |
4832 | +crl2p7.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4833 | +crl2p7.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4834 | crl2p7.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4835 | crl2p7.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4836 | crl2p7.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h |
4837 | crl2p7.o: ../include/openssl/sha.h ../include/openssl/stack.h |
4838 | crl2p7.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4839 | -crl2p7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h |
4840 | -crl2p7.o: crl2p7.c |
4841 | +crl2p7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4842 | +crl2p7.o: ../include/openssl/x509v3.h apps.h crl2p7.c |
4843 | dgst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4844 | dgst.o: ../include/openssl/buffer.h ../include/openssl/conf.h |
4845 | dgst.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h |
4846 | dgst.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4847 | dgst.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4848 | dgst.o: ../include/openssl/err.h ../include/openssl/evp.h |
4849 | -dgst.o: ../include/openssl/hmac.h ../include/openssl/lhash.h |
4850 | -dgst.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4851 | +dgst.o: ../include/openssl/fips.h ../include/openssl/hmac.h |
4852 | +dgst.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4853 | +dgst.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4854 | dgst.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4855 | dgst.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h |
4856 | dgst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h |
4857 | dgst.o: ../include/openssl/safestack.h ../include/openssl/sha.h |
4858 | dgst.o: ../include/openssl/stack.h ../include/openssl/symhacks.h |
4859 | dgst.o: ../include/openssl/txt_db.h ../include/openssl/x509.h |
4860 | -dgst.o: ../include/openssl/x509_vfy.h apps.h dgst.c |
4861 | +dgst.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dgst.c |
4862 | dh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4863 | dh.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4864 | dh.o: ../include/openssl/conf.h ../include/openssl/crypto.h |
4865 | @@ -302,14 +327,16 @@ |
4866 | dh.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4867 | dh.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4868 | dh.o: ../include/openssl/err.h ../include/openssl/evp.h |
4869 | -dh.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4870 | -dh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4871 | +dh.o: ../include/openssl/fips.h ../include/openssl/lhash.h |
4872 | +dh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4873 | +dh.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4874 | dh.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4875 | dh.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4876 | dh.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h |
4877 | dh.o: ../include/openssl/sha.h ../include/openssl/stack.h |
4878 | dh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4879 | -dh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h dh.c |
4880 | +dh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4881 | +dh.o: ../include/openssl/x509v3.h apps.h dh.c |
4882 | dsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4883 | dsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4884 | dsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h |
4885 | @@ -317,14 +344,16 @@ |
4886 | dsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4887 | dsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4888 | dsa.o: ../include/openssl/err.h ../include/openssl/evp.h |
4889 | -dsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4890 | -dsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4891 | +dsa.o: ../include/openssl/fips.h ../include/openssl/lhash.h |
4892 | +dsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4893 | +dsa.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4894 | dsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4895 | dsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4896 | dsa.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h |
4897 | dsa.o: ../include/openssl/sha.h ../include/openssl/stack.h |
4898 | dsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4899 | -dsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h dsa.c |
4900 | +dsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4901 | +dsa.o: ../include/openssl/x509v3.h apps.h dsa.c |
4902 | dsaparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4903 | dsaparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4904 | dsaparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h |
4905 | @@ -332,8 +361,9 @@ |
4906 | dsaparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h |
4907 | dsaparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h |
4908 | dsaparam.o: ../include/openssl/engine.h ../include/openssl/err.h |
4909 | -dsaparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h |
4910 | -dsaparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4911 | +dsaparam.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4912 | +dsaparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4913 | +dsaparam.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4914 | dsaparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4915 | dsaparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h |
4916 | dsaparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h |
4917 | @@ -342,51 +372,57 @@ |
4918 | dsaparam.o: ../include/openssl/stack.h ../include/openssl/store.h |
4919 | dsaparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4920 | dsaparam.o: ../include/openssl/ui.h ../include/openssl/x509.h |
4921 | -dsaparam.o: ../include/openssl/x509_vfy.h apps.h dsaparam.c |
4922 | +dsaparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h |
4923 | +dsaparam.o: dsaparam.c |
4924 | ec.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4925 | ec.o: ../include/openssl/buffer.h ../include/openssl/conf.h |
4926 | ec.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h |
4927 | ec.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4928 | ec.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4929 | ec.o: ../include/openssl/err.h ../include/openssl/evp.h |
4930 | -ec.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4931 | -ec.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4932 | +ec.o: ../include/openssl/fips.h ../include/openssl/lhash.h |
4933 | +ec.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4934 | +ec.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4935 | ec.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4936 | ec.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4937 | ec.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h |
4938 | ec.o: ../include/openssl/sha.h ../include/openssl/stack.h |
4939 | ec.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h |
4940 | -ec.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h ec.c |
4941 | +ec.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h |
4942 | +ec.o: ../include/openssl/x509v3.h apps.h ec.c |
4943 | ecparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4944 | ecparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4945 | ecparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h |
4946 | ecparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h |
4947 | ecparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h |
4948 | ecparam.o: ../include/openssl/engine.h ../include/openssl/err.h |
4949 | -ecparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h |
4950 | -ecparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4951 | +ecparam.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4952 | +ecparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4953 | +ecparam.o: ../include/openssl/objects.h ../include/openssl/ocsp.h |
4954 | ecparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h |
4955 | ecparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h |
4956 | ecparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h |
4957 | ecparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h |
4958 | ecparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h |
4959 | ecparam.o: ../include/openssl/txt_db.h ../include/openssl/x509.h |
4960 | -ecparam.o: ../include/openssl/x509_vfy.h apps.h ecparam.c |
4961 | +ecparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h |
4962 | +ecparam.o: ecparam.c |
4963 | enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4964 | enc.o: ../include/openssl/buffer.h ../include/openssl/conf.h |
4965 | enc.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h |
4966 | enc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h |
4967 | enc.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h |
4968 | enc.o: ../include/openssl/err.h ../include/openssl/evp.h |
4969 | -enc.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4970 | -enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4971 | +enc.o: ../include/openssl/fips.h ../include/openssl/lhash.h |
4972 | +enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h |
4973 | +enc.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h |
4974 | enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4975 | enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4976 | enc.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h |
4977 | enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h |
4978 | enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h |
4979 | enc.o: ../include/openssl/txt_db.h ../include/openssl/x509.h |
4980 | -enc.o: ../include/openssl/x509_vfy.h apps.h enc.c |
4981 | +enc.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h enc.c |
4982 | engine.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h |
4983 | engine.o: ../include/openssl/bn.h ../include/openssl/buffer.h |
4984 | engine.o: ../include/openssl/comp.h ../include/openssl/conf.h |
4985 | @@ -394,19 +430,21 @@ |
4986 | engine.o: ../include/openssl/e_os2.h ../include/openssl/ec.h |
4987 | engine.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h |
4988 | engine.o: ../include/openssl/engine.h ../include/openssl/err.h |
4989 | -engine.o: ../include/openssl/evp.h ../include/openssl/kssl.h |
4990 | +engine.o: ../include/openssl/evp.h ../include/openssl/fips.h |
4991 | +engine.o: ../include/openssl/hmac.h ../include/openssl/kssl.h |
4992 | engine.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h |
4993 | -engine.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
4994 | -engine.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h |
4995 | -engine.o: ../include/openssl/pem.h ../include/openssl/pem2.h |
4996 | -engine.o: ../include/openssl/pkcs7.h ../include/openssl/pq_compat.h |
4997 | -engine.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h |
4998 | -engine.o: ../include/openssl/sha.h ../include/openssl/ssl.h |
4999 | -engine.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h |
5000 | -engine.o: ../include/openssl/ssl3.h ../include/openssl/stack.h |
Merged with debian testing