new openssl
This commit is contained in:
christos
parent
2149db96e3
commit
8a6a174d43
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.48 2007/12/09 21:57:36 adrianp Exp $
|
||||
# $NetBSD: Makefile,v 1.49 2008/05/09 21:52:18 christos Exp $
|
||||
|
||||
# RCSid:
|
||||
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
|
||||
|
|
@ -28,7 +28,7 @@ USE_FIPS= no
|
|||
# XXX There's a bit of work to do before we can enable warnings.
|
||||
WARNS=0
|
||||
|
||||
CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -I${OPENSSLSRC}
|
||||
CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp
|
||||
|
||||
CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist
|
||||
|
||||
|
|
@ -69,13 +69,13 @@ CLEANFILES+= buildinf.h
|
|||
# This list is built from the contents of the include/openssl
|
||||
# directory in the OpenSSL source distribution.
|
||||
INCS+= aes.h asn1.h asn1_mac.h asn1t.h bio.h blowfish.h bn.h \
|
||||
buffer.h cast.h comp.h conf.h conf_api.h crypto.h des.h \
|
||||
buffer.h cast.h cms.h comp.h conf.h conf_api.h crypto.h des.h \
|
||||
dh.h dsa.h dso.h e_os2.h ebcdic.h ec.h ecdh.h ecdsa.h engine.h \
|
||||
err.h evp.h hmac.h krb5_asn.h lhash.h md2.h md4.h md5.h \
|
||||
obj_mac.h objects.h ocsp.h opensslconf.h opensslv.h ossl_typ.h \
|
||||
pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h ripemd.h \
|
||||
rsa.h safestack.h sha.h stack.h store.h symhacks.h tmdiff.h txt_db.h \
|
||||
ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h pq_compat.h
|
||||
rsa.h safestack.h sha.h stack.h store.h symhacks.h ts.h txt_db.h \
|
||||
ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h
|
||||
# des_old.h
|
||||
|
||||
# IDEA - patented, but we install the header anyways
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: aes.inc,v 1.3 2007/12/09 22:44:12 adrianp Exp $
|
||||
# $NetBSD: aes.inc,v 1.4 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -8,7 +8,8 @@
|
|||
.PATH: ${OPENSSLSRC}/crypto/aes
|
||||
|
||||
|
||||
AES_SRCS = aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c
|
||||
AES_SRCS = aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c \
|
||||
aes_ctr.c aes_wrap.c aes_ige.c
|
||||
SRCS += ${AES_SRCS}
|
||||
|
||||
.for cryptosrc in ${AES_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: asn1.inc,v 1.8 2007/12/09 22:44:13 adrianp Exp $
|
||||
# $NetBSD: asn1.inc,v 1.9 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -17,10 +17,11 @@ ASN1_SRCS = a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c
|
|||
t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \
|
||||
tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \
|
||||
f_int.c f_string.c n_pkey.c \
|
||||
f_enum.c a_hdr.c x_pkey.c a_bool.c x_exten.c \
|
||||
asn1_par.c asn1_lib.c asn1_err.c a_meth.c a_bytes.c a_strnid.c \
|
||||
f_enum.c x_pkey.c a_bool.c x_exten.c \
|
||||
asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c \
|
||||
evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c \
|
||||
asn1_gen.c
|
||||
asn1_gen.c asn_mime.c ameth_lib.c bio_ndef.c tasn_prn.c \
|
||||
bio_asn1.c x_nx509.c
|
||||
SRCS += ${ASN1_SRCS}
|
||||
|
||||
.for cryptosrc in ${ASN1_SRCS}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
# $NetBSD: cms.inc,v 1.1 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gcmsaty
|
||||
#
|
||||
# SRCS extracted from src/crypto/dist/openssl/crypto/cms/Makefile
|
||||
#
|
||||
|
||||
.PATH: ${OPENSSLSRC}/crypto/cms
|
||||
|
||||
|
||||
CMS_SRCS = cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
|
||||
cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
|
||||
SRCS += ${CMS_SRCS}
|
||||
|
||||
.for cryptosrc in ${CMS_SRCS}
|
||||
CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/cms
|
||||
.endfor
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: crypto.inc,v 1.8 2007/12/09 22:44:14 adrianp Exp $
|
||||
# $NetBSD: crypto.inc,v 1.9 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
.PATH: ${OPENSSLSRC}/crypto
|
||||
|
||||
|
||||
CRYPTO_SRCS = cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c \
|
||||
CRYPTO_SRCS = cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c \
|
||||
cpt_err.c ebcdic.c uid.c o_time.c o_dir.c
|
||||
SRCS += ${CRYPTO_SRCS}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: dh.inc,v 1.7 2007/12/09 22:44:15 adrianp Exp $
|
||||
# $NetBSD: dh.inc,v 1.8 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -8,7 +8,8 @@
|
|||
.PATH: ${OPENSSLSRC}/crypto/dh
|
||||
|
||||
|
||||
DH_SRCS = dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c
|
||||
DH_SRCS = dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c \
|
||||
dh_ameth.c dh_pmeth.c
|
||||
SRCS += ${DH_SRCS}
|
||||
|
||||
.for cryptosrc in ${DH_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: dsa.inc,v 1.7 2007/12/09 22:44:15 adrianp Exp $
|
||||
# $NetBSD: dsa.inc,v 1.8 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
|
||||
DSA_SRCS = dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \
|
||||
dsa_err.c dsa_ossl.c dsa_depr.c
|
||||
dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_pmeth.c dsa_prn.c
|
||||
SRCS += ${DSA_SRCS}
|
||||
|
||||
.for cryptosrc in ${DSA_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: ec.inc,v 1.4 2007/12/09 22:44:16 adrianp Exp $
|
||||
# $NetBSD: ec.inc,v 1.5 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
EC_SRCS = ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \
|
||||
ec_err.c ec_asn1.c ec_key.c ec_print.c ec_curve.c ec2_smpl.c \
|
||||
ec2_mult.c ec_check.c
|
||||
ec2_mult.c ec_check.c ec_ameth.c ec_pmeth.c eck_prn.c
|
||||
SRCS += ${EC_SRCS}
|
||||
|
||||
.for cryptosrc in ${EC_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
# $NetBSD: engine.inc,v 1.4 2007/12/09 22:44:16 adrianp Exp $
|
||||
# $NetBSD: engine.inc,v 1.5 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
# SRCS extracted from src/crypto/dist/openssl/crypto/engine/Makefile
|
||||
#
|
||||
|
||||
.PATH: ${OPENSSLSRC}/crypto/engine ${OPENSSLSRC}/engines
|
||||
.PATH: ${OPENSSLSRC}/crypto/engine ${OPENSSLSRC}/engines \
|
||||
${OPENSSLSRC}/engines/ccgost
|
||||
|
||||
|
||||
ENGINE_SRCS = eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
|
||||
eng_table.c eng_pkey.c eng_fat.c eng_all.c \
|
||||
eng_table.c eng_pkey.c eng_fat.c eng_all.c tb_asnmth.c \
|
||||
tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c tb_cipher.c tb_digest.c \
|
||||
eng_openssl.c eng_dyn.c eng_cnf.c eng_padlock.c \
|
||||
eng_cryptodev.c tb_store.c tb_ecdsa.c tb_ecdh.c \
|
||||
eng_openssl.c eng_dyn.c eng_cnf.c \
|
||||
eng_cryptodev.c tb_store.c tb_ecdsa.c tb_ecdh.c tb_pkmeth.c \
|
||||
e_4758cca.c e_4758cca_err.c \
|
||||
e_aep.c e_aep_err.c \
|
||||
e_atalla.c e_atalla_err.c \
|
||||
|
|
@ -21,7 +22,12 @@ ENGINE_SRCS = eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
|
|||
e_gmp.c e_gmp_err.c \
|
||||
e_nuron.c e_nuron_err.c \
|
||||
e_sureware.c e_sureware_err.c \
|
||||
e_ubsec.c e_ubsec_err.c
|
||||
e_ubsec.c e_ubsec_err.c \
|
||||
|
||||
#ENGINE_SRCS += gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c \
|
||||
# gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c \
|
||||
# gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c
|
||||
|
||||
SRCS += ${ENGINE_SRCS}
|
||||
|
||||
.for cryptosrc in ${ENGINE_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: evp.inc,v 1.8 2007/12/09 22:44:17 adrianp Exp $
|
||||
# $NetBSD: evp.inc,v 1.9 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -17,7 +17,8 @@ EVP_SRCS = encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
|
|||
p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \
|
||||
bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
|
||||
c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
|
||||
evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c
|
||||
evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c pmeth_lib.c \
|
||||
pmeth_fn.c m_sigver.c m_wp.c pmeth_gn.c
|
||||
SRCS += ${EVP_SRCS}
|
||||
|
||||
.for cryptosrc in ${EVP_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: hmac.inc,v 1.6 2007/12/09 22:44:17 adrianp Exp $
|
||||
# $NetBSD: hmac.inc,v 1.7 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
.PATH: ${OPENSSLSRC}/crypto/hmac
|
||||
|
||||
|
||||
HMAC_SRCS = hmac.c
|
||||
HMAC_SRCS = hmac.c hm_ameth.c hm_pmeth.c
|
||||
SRCS += ${HMAC_SRCS}
|
||||
|
||||
.for cryptosrc in ${HMAC_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: objects.inc,v 1.6 2007/12/09 22:44:19 adrianp Exp $
|
||||
# $NetBSD: objects.inc,v 1.7 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
.PATH: ${OPENSSLSRC}/crypto/objects
|
||||
|
||||
|
||||
OBJECTS_SRCS = o_names.c obj_dat.c obj_lib.c obj_err.c
|
||||
OBJECTS_SRCS = o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c
|
||||
SRCS += ${OBJECTS_SRCS}
|
||||
|
||||
.for cryptosrc in ${OBJECTS_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: pem.inc,v 1.6 2007/12/09 22:44:19 adrianp Exp $
|
||||
# $NetBSD: pem.inc,v 1.7 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
|
||||
PEM_SRCS = pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \
|
||||
pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c
|
||||
pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c
|
||||
SRCS += ${PEM_SRCS}
|
||||
|
||||
.for cryptosrc in ${PEM_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: rsa.inc,v 1.8 2007/12/09 22:44:21 adrianp Exp $
|
||||
# $NetBSD: rsa.inc,v 1.9 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
|
|
@ -10,7 +10,8 @@
|
|||
|
||||
RSA_SRCS = rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
|
||||
rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \
|
||||
rsa_asn1.c rsa_x931.c rsa_depr.c
|
||||
rsa_asn1.c rsa_x931.c rsa_depr.c rsa_ameth.c rsa_pmeth.c rsa_pss.c \
|
||||
rsa_prn.c
|
||||
SRCS += ${RSA_SRCS}
|
||||
|
||||
.for cryptosrc in ${RSA_SRCS}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
# $NetBSD: shlib_version,v 1.12 2007/07/18 20:16:01 christos Exp $
|
||||
# $NetBSD: shlib_version,v 1.13 2008/05/09 21:52:18 christos Exp $
|
||||
# Remember to update distrib/sets/lists/base/shl.* when changing
|
||||
#
|
||||
# Also remember to update lib/libdes/shlib_version when changing
|
||||
# (since it just installs a symbolic link to libcrypto)
|
||||
#
|
||||
major=3
|
||||
minor=2
|
||||
major=4
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# $NetBSD: srcs.inc,v 1.13 2005/11/26 00:35:58 christos Exp $
|
||||
# $NetBSD: srcs.inc,v 1.14 2008/05/09 21:52:18 christos Exp $
|
||||
|
||||
CRYPTOINCS= \
|
||||
aes.inc asn1.inc bf.inc bio.inc bn.inc buffer.inc cast.inc \
|
||||
comp.inc conf.inc crypto.inc des.inc dh.inc dsa.inc dso.inc \
|
||||
cms.inc comp.inc conf.inc crypto.inc des.inc dh.inc dsa.inc dso.inc \
|
||||
ec.inc ecdh.inc ecdsa.inc engine.inc err.inc evp.inc hmac.inc \
|
||||
krb5.inc lhash.inc \
|
||||
md2.inc md4.inc md5.inc objects.inc ocsp.inc pem.inc \
|
||||
pkcs12.inc pkcs7.inc pqueue.inc rand.inc rc2.inc rc4.inc ripemd.inc \
|
||||
rsa.inc sha.inc stack.inc store.inc txt_db.inc ui.inc x509.inc \
|
||||
rsa.inc sha.inc stack.inc store.inc txt_db.inc ts.inc ui.inc x509.inc \
|
||||
x509v3.inc
|
||||
|
||||
# patented algorithms - see ../libcrypto_*
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
# $NetBSD: ts.inc,v 1.1 2008/05/09 21:52:18 christos Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1995 Simon J. Gerraty
|
||||
#
|
||||
# SRCS extracted from src/crypto/dist/openssl/crypto/err/Makefile
|
||||
#
|
||||
|
||||
.PATH: ${OPENSSLSRC}/crypto/ts
|
||||
|
||||
|
||||
TS_SRCS = ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c \
|
||||
ts_rsp_sign.c ts_rsp_verify.c ts_verify_ctx.c ts_lib.c ts_conf.c \
|
||||
ts_asn1.c
|
||||
|
||||
SRCS += ${TS_SRCS}
|
||||
|
||||
.for cryptosrc in ${TS_SRCS}
|
||||
CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ts
|
||||
.endfor
|
||||
Loading…
Reference in New Issue