diff options
author | markus <> | 2002-09-10 16:31:57 +0000 |
---|---|---|
committer | markus <> | 2002-09-10 16:31:57 +0000 |
commit | 7d038e9d4d83e7c7120e78418e108df70b9025d6 (patch) | |
tree | baf775b286ff801a89f746b1938a3c700bba6822 /src/lib/libssl/crypto | |
parent | 3bd21dd4c3a3e3106321a5f6b3641ab9f18a6e3b (diff) | |
download | openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.tar.gz openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.tar.bz2 openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.zip |
merge openssl-0.9.7-beta3, tested on vax by miod@
Diffstat (limited to 'src/lib/libssl/crypto')
-rw-r--r-- | src/lib/libssl/crypto/Makefile | 11 | ||||
-rw-r--r-- | src/lib/libssl/crypto/shlib_version | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index 490ce259c6..c95efa83ea 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/lib/libssl/crypto/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.26 2002/09/05 22:12:11 markus Exp $ | 1 | # $OpenBSD: Makefile,v 1.27 2002/09/10 16:31:53 markus Exp $ |
2 | 2 | ||
3 | LIB= crypto | 3 | LIB= crypto |
4 | 4 | ||
@@ -51,9 +51,9 @@ SRCS+= aes_cbc.c aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c aes_core.c | |||
51 | CFLAGS+= -I${LCRYPTO_SRC}/des | 51 | CFLAGS+= -I${LCRYPTO_SRC}/des |
52 | SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ | 52 | SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ |
53 | ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ | 53 | ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ |
54 | fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ | 54 | ofb64enc.c ofb_enc.c pcbc_enc.c \ |
55 | qud_cksm.c rand_key.c rpc_enc.c set_key.c \ | 55 | qud_cksm.c rand_key.c rpc_enc.c set_key.c \ |
56 | des_enc.c des_old.c fcrypt_b.c \ | 56 | des_enc.c des_old2.c fcrypt_b.c \ |
57 | fcrypt.c xcbc_enc.c ede_cbcm_enc.c \ | 57 | fcrypt.c xcbc_enc.c ede_cbcm_enc.c \ |
58 | str2key.c cfb64ede.c ofb64ede.c \ | 58 | str2key.c cfb64ede.c ofb64ede.c \ |
59 | des_old.c read2pwd.c | 59 | des_old.c read2pwd.c |
@@ -111,7 +111,7 @@ SRCS+= bio_b64.c e_bf.c m_sha.c p_open.c | |||
111 | SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c | 111 | SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c |
112 | SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c | 112 | SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c |
113 | SRCS+= bio_ok.c e_des3.c evp_enc.c m_md2.c p_verify.c | 113 | SRCS+= bio_ok.c e_des3.c evp_enc.c m_md2.c p_verify.c |
114 | SRCS+= c_all.c evp_err.c m_md4.c p5_crpt.c | 114 | SRCS+= c_all.c evp_err.c evp_acnf.c m_md4.c p5_crpt.c |
115 | SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c | 115 | SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c |
116 | SRCS+= c_alld.c e_null.c evp_lib.c m_mdc2.c p_dec.c | 116 | SRCS+= c_alld.c e_null.c evp_lib.c m_mdc2.c p_dec.c |
117 | SRCS+= digest.c e_rc2.c evp_pbe.c m_null.c p_enc.c | 117 | SRCS+= digest.c e_rc2.c evp_pbe.c m_null.c p_enc.c |
@@ -147,6 +147,7 @@ SRCS+= v3_lib.c v3_pku.c v3_prn.c v3_skey.c v3_sxnet.c v3_utl.c | |||
147 | SRCS+= v3err.c v3_info.c v3_purp.c v3_ocsp.c v3_akeya.c | 147 | SRCS+= v3err.c v3_info.c v3_purp.c v3_ocsp.c v3_akeya.c |
148 | CFLAGS+= -I${LCRYPTO_SRC}/conf | 148 | CFLAGS+= -I${LCRYPTO_SRC}/conf |
149 | SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c | 149 | SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c |
150 | SRCS+= conf_sap.c | ||
150 | CFLAGS+= -I${LCRYPTO_SRC}/txt_db | 151 | CFLAGS+= -I${LCRYPTO_SRC}/txt_db |
151 | SRCS+= txt_db.c | 152 | SRCS+= txt_db.c |
152 | CFLAGS+= -I${LCRYPTO_SRC}/pkcs7 | 153 | CFLAGS+= -I${LCRYPTO_SRC}/pkcs7 |
@@ -154,7 +155,7 @@ SRCS+= pk7_lib.c pkcs7err.c | |||
154 | SRCS+= pk7_asn1.c pk7_doit.c pk7_mime.c | 155 | SRCS+= pk7_asn1.c pk7_doit.c pk7_mime.c |
155 | SRCS+= pk7_attr.c pk7_smime.c | 156 | SRCS+= pk7_attr.c pk7_smime.c |
156 | CFLAGS+= -I${LCRYPTO_SRC}/comp | 157 | CFLAGS+= -I${LCRYPTO_SRC}/comp |
157 | SRCS+= c_rle.c c_zlib.c comp_lib.c | 158 | SRCS+= c_rle.c c_zlib.c comp_lib.c comp_err.c |
158 | CFLAGS+= -I${LCRYPTO_SRC}/pkcs12 | 159 | CFLAGS+= -I${LCRYPTO_SRC}/pkcs12 |
159 | SRCS+= p12_add.c p12_crpt.c p12_init.c p12_mutl.c p12_p8e.c | 160 | SRCS+= p12_add.c p12_crpt.c p12_init.c p12_mutl.c p12_p8e.c |
160 | SRCS+= p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c | 161 | SRCS+= p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c |
diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version index 9c1551636c..5b844bbf42 100644 --- a/src/lib/libssl/crypto/shlib_version +++ b/src/lib/libssl/crypto/shlib_version | |||
@@ -1,2 +1,2 @@ | |||
1 | major=6 | 1 | major=7 |
2 | minor=0 | 2 | minor=0 |