summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--secure/lib/libcrypto/Makefile69
-rw-r--r--secure/lib/libcrypto/Makefile.inc82
-rw-r--r--secure/usr.bin/openssl/Makefile5
3 files changed, 68 insertions, 88 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index dad83d7..a8fe551 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -15,11 +15,14 @@ MAN+= config.5 des_modes.7
.include "Makefile.inc"
# base sources
-SRCS+= cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_clr.c \
+SRCS= cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_clr.c \
mem_dbg.c o_time.c tmdiff.c uid.c
+INCS= crypto.h ebcdic.h opensslv.h ossl_typ.h symhacks.h tmdiff.h \
+ ../e_os.h ../e_os2.h
# aes
SRCS+= aes_cbc.c aes_cfb.c aes_core.c aes_ctr.c aes_ecb.c aes_misc.c aes_ofb.c
+INCS+= aes.h aes_locl.h
# asn1
SRCS+= a_bitstr.c a_bool.c a_bytes.c a_d2i_fp.c a_digest.c \
@@ -35,33 +38,41 @@ SRCS+= a_bitstr.c a_bool.c a_bytes.c a_d2i_fp.c a_digest.c \
tasn_utl.c x_algor.c x_attrib.c x_bignum.c x_crl.c \
x_exten.c x_info.c x_long.c x_name.c x_pkey.c x_pubkey.c \
x_req.c x_sig.c x_spki.c x_val.c x_x509.c x_x509a.c
+INCS+= asn1.h asn1_mac.h asn1t.h
# bf
SRCS+= bf_cfb64.c bf_ecb.c bf_enc.c bf_ofb64.c bf_skey.c
+INCS+= blowfish.h
# bio
SRCS+= b_dump.c b_print.c b_sock.c bf_buff.c bf_lbuf.c bf_nbio.c \
bf_null.c bio_cb.c bio_err.c bio_lib.c bss_acpt.c bss_bio.c \
bss_conn.c bss_fd.c bss_file.c bss_log.c bss_mem.c \
bss_null.c bss_sock.c
+INCS+= bio.h
# bn
SRCS+= bn_add.c bn_asm.c bn_blind.c bn_ctx.c bn_div.c bn_err.c bn_exp.c \
bn_exp2.c bn_gcd.c bn_kron.c bn_lib.c bn_mod.c bn_mont.c \
bn_mpi.c bn_mul.c bn_prime.c bn_print.c bn_rand.c bn_recp.c \
bn_shift.c bn_sqr.c bn_sqrt.c bn_word.c
+INCS+= bn.h
# buffer
SRCS+= buf_err.c buffer.c
+INCS+= buffer.h
# cast
SRCS+= c_cfb64.c c_ecb.c c_enc.c c_ofb64.c c_skey.c
+INCS+= cast.h
# comp
SRCS+= c_rle.c c_zlib.c comp_err.c comp_lib.c
+INCS+= comp.h
# conf
SRCS+= conf_api.c conf_def.c conf_err.c conf_lib.c conf_mall.c conf_mod.c conf_sap.c
+INCS+= conf.h conf_api.h
# des
SRCS+= cbc3_enc.c cbc_cksm.c cbc_enc.c cfb64ede.c cfb64enc.c cfb_enc.c \
@@ -69,19 +80,24 @@ SRCS+= cbc3_enc.c cbc_cksm.c cbc_enc.c cfb64ede.c cfb64enc.c cfb_enc.c \
enc_read.c enc_writ.c fcrypt.c fcrypt_b.c ofb64ede.c ofb64enc.c \
ofb_enc.c pcbc_enc.c qud_cksm.c rand_key.c read2pwd.c \
rpc_enc.c set_key.c str2key.c xcbc_enc.c
+INCS+= des.h des_old.h
# dh
SRCS+= dh_asn1.c dh_check.c dh_err.c dh_gen.c dh_key.c dh_lib.c
+INCS+= dh.h
# dsa
SRCS+= dsa_asn1.c dsa_err.c dsa_gen.c dsa_key.c dsa_lib.c dsa_ossl.c dsa_sign.c dsa_vrf.c
+INCS+= dsa.h
# dso
SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c dso_openssl.c
+INCS+= dso.h
# ec
SRCS+= ec_cvt.c ec_err.c ec_lib.c ec_mult.c ecp_mont.c ecp_nist.c \
ecp_recp.c ecp_smpl.c
+INCS+= ec.h
# engine
SRCS+= eng_all.c eng_cnf.c eng_ctrl.c eng_dyn.c eng_err.c eng_fat.c \
@@ -92,9 +108,13 @@ SRCS+= eng_all.c eng_cnf.c eng_ctrl.c eng_dyn.c eng_err.c eng_fat.c \
hw_nuron_err.c hw_sureware.c hw_sureware_err.c hw_ubsec.c \
hw_ubsec_err.c tb_cipher.c tb_dh.c tb_digest.c tb_dsa.c tb_rand.c \
tb_rsa.c
+INCS+= eng_int.h engine.h hw_4758_cca_err.h hw_aep_err.h hw_atalla_err.h \
+ hw_cswift_err.h hw_ncipher_err.h hw_nuron_err.h hw_sureware_err.h \
+ hw_ubsec_err.h
# err
SRCS+= err.c err_all.c err_prn.c
+INCS+= err.h
# evp
SRCS+= bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \
@@ -108,45 +128,57 @@ SRCS+= bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \
# hmac
SRCS+= hmac.c
+INCS+= hmac.h
# idea
.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
+INCS+= idea.h
.endif
# krb5
#SRCS+= krb5_asn.c
+INCS+= krb5_asn.h
# lhash
SRCS+= lh_stats.c lhash.c
+INCS+= lhash.h
# md2
SRCS+= md2_dgst.c md2_one.c
+INCS+= md2.h
# md4
SRCS+= md4_dgst.c md4_one.c
+INCS+= md4.h
# md5
SRCS+= md5_dgst.c md5_one.c
+INCS+= md5.h
# mdc2
SRCS+= mdc2_one.c mdc2dgst.c
+INCS+= mdc2.h
# objects
SRCS+= o_names.c obj_dat.c obj_err.c obj_lib.c
+INCS+= objects.h obj_mac.h
# ocsp
SRCS+= ocsp_asn.c ocsp_cl.c ocsp_err.c ocsp_ext.c ocsp_ht.c \
ocsp_lib.c ocsp_prn.c ocsp_srv.c ocsp_vfy.c
+INCS+= ocsp.h
# pem
SRCS+= pem_all.c pem_err.c pem_info.c pem_lib.c pem_oth.c pem_pk8.c \
pem_pkey.c pem_seal.c pem_sign.c pem_x509.c pem_xaux.c
+INCS+= pem.h pem2.h
# pkcs12
SRCS+= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c \
p12_decr.c p12_init.c p12_key.c p12_kiss.c p12_mutl.c \
p12_npas.c p12_p8d.c p12_p8e.c p12_utl.c pk12err.c
+INCS+= pkcs12.h pkcs7.h
# pkcs7
SRCS+= example.c pk7_asn1.c pk7_attr.c pk7_dgst.c pk7_doit.c \
@@ -154,38 +186,48 @@ SRCS+= example.c pk7_asn1.c pk7_attr.c pk7_dgst.c pk7_doit.c \
# rand
SRCS+= md_rand.c rand_egd.c rand_err.c rand_lib.c rand_unix.c randfile.c
+INCS+= rand.h
# rc2
SRCS+= rc2_cbc.c rc2_ecb.c rc2_skey.c rc2cfb64.c rc2ofb64.c
+INCS+= rc2.h
# rc4
SRCS+= rc4_enc.c rc4_skey.c
+INCS+= rc4.h
# rc5
SRCS+= rc5_ecb.c rc5_enc.c rc5_skey.c rc5cfb64.c rc5ofb64.c
+INCS+= rc5.h
# ripemd
SRCS+= rmd_dgst.c rmd_one.c
+INCS+= ripemd.h
# rsa
SRCS+= rsa_asn1.c rsa_chk.c rsa_eay.c rsa_err.c rsa_gen.c rsa_lib.c \
rsa_none.c rsa_null.c rsa_oaep.c rsa_pk1.c rsa_saos.c \
rsa_sign.c rsa_ssl.c
+INCS+= rsa.h
# sha
SRCS+= sha1_one.c sha1dgst.c sha_dgst.c sha_one.c
+INCS+= sha.h
# stack
SRCS+= stack.c
+INCS+= stack.h safestack.h
# threads
SRCS+= th-lock.c
# txt_db
SRCS+= txt_db.c
+INCS+= txt_db.h
# ui
SRCS+= ui_compat.c ui_err.c ui_lib.c ui_openssl.c ui_util.c
+INCS+= ui.h ui_compat.h ui_locl.h
# x509
SRCS+= by_dir.c by_file.c x509_att.c x509_cmp.c x509_d2.c \
@@ -193,16 +235,39 @@ SRCS+= by_dir.c by_file.c x509_att.c x509_cmp.c x509_d2.c \
x509_r2x.c x509_req.c x509_set.c x509_trs.c x509_txt.c \
x509_v3.c x509_vfy.c x509cset.c x509name.c x509rset.c \
x509spki.c x509type.c x_all.c
+INCS+= x509.h x509_vfy.h
# x509v3
SRCS+= v3_akey.c v3_akeya.c v3_alt.c v3_bcons.c v3_bitst.c \
v3_conf.c v3_cpols.c v3_crld.c v3_enum.c v3_extku.c \
v3_genn.c v3_ia5.c v3_info.c v3_int.c v3_lib.c v3_ocsp.c \
v3_pku.c v3_prn.c v3_purp.c v3_skey.c v3_sxnet.c v3_utl.c v3err.c
+INCS+= x509v3.h
-INCS= ${HDRS} openssl/evp.h openssl/opensslconf.h
+SRCS+= buildinf.h
+INCS+= opensslconf.h evp.h
INCSDIR= ${INCLUDEDIR}/openssl
+CLEANFILES= buildinf.h opensslconf.h evp.h
+
+buildinf.h:
+ ( echo "#ifndef MK1MF_BUILD"; \
+ echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
+ echo " #define CFLAGS \"$(CC)\""; \
+ echo " #define PLATFORM \"`uname -s`-`uname -m`\""; \
+ echo " #define DATE \"`LC_ALL=C date`\""; \
+ echo "#endif" ) > ${.TARGET}
+
+opensslconf.h: opensslconf-${MACHINE_ARCH}.h
+ cp ${.ALLSRC} ${.TARGET}
+
+evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
+.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
+ sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET}
+.else
+ cp ${.ALLSRC} ${.TARGET}
+.endif
+
OLDSYMLINKS+= libdes.a libdes.so libdes.so.3 libdes_p.a
afterinstall:
@echo "Removing stale symlinks."
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index caa1f36..fa488bc 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -8,8 +8,6 @@ CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR}
.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
CFLAGS+= -DOPENSSL_NO_IDEA
-.else
-_idea_h= idea/idea.h
.endif
.if ${MACHINE_ARCH} == "i386"
@@ -18,86 +16,6 @@ CFLAGS+= -DL_ENDIAN
# no ENDIAN stuff defined for alpha (64-bit)
.endif
-HDRS+= \
- ../e_os.h ../e_os2.h \
- crypto.h \
- ebcdic.h \
- opensslv.h \
- ossl_typ.h \
- symhacks.h \
- tmdiff.h \
- aes/aes.h aes/aes_locl.h \
- asn1/asn1.h asn1/asn1_mac.h asn1/asn1t.h \
- bio/bio.h \
- bf/blowfish.h \
- bn/bn.h \
- buffer/buffer.h \
- cast/cast.h \
- comp/comp.h \
- conf/conf.h conf/conf_api.h \
- des/des.h des/des_old.h \
- dh/dh.h \
- dsa/dsa.h \
- dso/dso.h \
- ec/ec.h \
- engine/eng_int.h engine/engine.h engine/hw_4758_cca_err.h \
- engine/hw_aep_err.h engine/hw_atalla_err.h engine/hw_cswift_err.h \
- engine/hw_ncipher_err.h engine/hw_nuron_err.h engine/hw_sureware_err.h \
- engine/hw_ubsec_err.h \
- err/err.h \
- hmac/hmac.h \
- ${_idea_h} \
- krb5/krb5_asn.h \
- lhash/lhash.h \
- md2/md2.h \
- md4/md4.h \
- md5/md5.h \
- mdc2/mdc2.h \
- ocsp/ocsp.h \
- objects/objects.h objects/obj_mac.h \
- pem/pem.h pem/pem2.h \
- pkcs12/pkcs12.h pkcs7/pkcs7.h \
- rand/rand.h \
- rc2/rc2.h rc4/rc4.h rc5/rc5.h \
- ripemd/ripemd.h \
- rsa/rsa.h \
- stack/stack.h stack/safestack.h \
- sha/sha.h \
- txt_db/txt_db.h \
- ui/ui.h ui/ui_compat.h ui/ui_locl.h \
- x509/x509.h x509/x509_vfy.h x509v3/x509v3.h
-
-SRCS+= buildinf.h openssl/opensslconf.h openssl/evp.h
-CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/evp.h
-CLEANDIRS+= openssl
-
-buildinf.h:
- ( echo "#ifndef MK1MF_BUILD"; \
- echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
- echo " #define CFLAGS \"$(CC)\""; \
- echo " #define PLATFORM \"`uname -s`-`uname -m`\""; \
- echo " #define DATE \"`LC_ALL=C date`\""; \
- echo "#endif" ) > ${.TARGET}
-
-openssl/opensslconf.h: ../../lib/libcrypto/opensslconf-${MACHINE_ARCH}.h
- mkdir -p openssl
- cp ${.OODATE} ${.TARGET}
-
-openssl/evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
- mkdir -p openssl
-.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
- sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET}
-.else
- ${INSTALL} -C -m 444 ${.OODATE} ${.TARGET}
-.endif
-
-SRCS+= ${HDRS:T:S;^;openssl/;}
-.for h in ${HDRS:S/^/${LCRYPTO_SRC}\/crypto\//}
-openssl/${h:T}: ${h}
- mkdir -p openssl
- ${INSTALL} -C -m 444 ${h} openssl
-.endfor
-
MANDIR= ${SHAREDIR}/openssl/man/man
.if defined(LIB)
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 0b41c15..4e65be0 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -1,13 +1,10 @@
# $FreeBSD$
-PROG= xopenssl
-PROGNAME= openssl
+PROG= openssl
DPADD= ${LIBSSL} ${LIBCRYPTO}
LDADD= -lssl -lcrypto
-NOLINT= true
-
.if exists(Makefile.man)
.include "Makefile.man"
.endif
OpenPOWER on IntegriCloud