From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 18 May 2006 17:22:31 +0000 (+0000)
Subject: make update
X-Git-Tag: OpenSSL_0_9_8k^2~1310
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ef3e07a49ef1731d2dcfe08276735ad610957ff;p=oweals%2Fopenssl.git

make update
---

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 5f589f27a9..9530556fd7 100644
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -348,11 +348,11 @@ evp_pbe.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
 evp_pbe.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 evp_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-evp_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_pbe.o: ../cryptlib.h evp_pbe.c
+evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
+evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pbe.c
 evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
 evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/util/libeay.num b/util/libeay.num
index e1c6e003eb..9f1fb575fd 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3694,3 +3694,12 @@ EVP_PKEY_meth_new                       4089	EXIST::FUNCTION:
 ASN1_STRING_set0                        4090	EXIST::FUNCTION:
 EVP_PKEY_id                             4091	EXIST::FUNCTION:
 OBJ_find_sigid_algs                     4092	EXIST::FUNCTION:
+PKCS7_add0_attrib_signing_time          4093	EXIST::FUNCTION:
+PKCS7_final                             4094	EXIST::FUNCTION:
+PKCS7_SIGNER_INFO_sign                  4095	EXIST::FUNCTION:
+PKCS7_sign_add_signer                   4096	EXIST::FUNCTION:
+PKCS5_pbe2_set_iv                       4097	EXIST::FUNCTION:
+EVP_PBE_find                            4098	EXIST::FUNCTION:
+PKCS7_add1_attrib_digest                4099	EXIST::FUNCTION:
+EVP_PBE_alg_add_type                    4100	EXIST::FUNCTION:
+PKCS7_add_attrib_content_type           4101	EXIST::FUNCTION: