[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  97cacc537eba474d27dea0f96796b3b754e60034 (commit)
       via  3418f7b7b01139dbf4a72d2bc71135d918d4cf11 (commit)
      from  133dce447b259e0bb93076bf5fd0ce475d16910a (commit)


- Log -----------------------------------------------------------------
commit 97cacc537eba474d27dea0f96796b3b754e60034
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Jun 3 15:37:39 2015 +0100

    make update.
    
    Make update with manual edit so EVP_PKEY_asn1_set_item uses the same
    ordinal as 1.0.2.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 3418f7b7b01139dbf4a72d2bc71135d918d4cf11
Author: Sergey Agievich <agievich at gmail.com>
Date:   Mon Jun 1 12:48:27 2015 +0100

    Add funtions to set item_sign and item_verify
    
    PR#3872
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (cherry picked from commit ad0fb7f4988c8a717fe6bcb035304385fbdaef41)
    
    Conflicts:
    	crypto/asn1/ameth_lib.c

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/ameth_lib.c | 18 ++++++++++++++++++
 crypto/bn/Makefile      |  2 +-
 include/openssl/evp.h   | 13 +++++++++++++
 util/libeay.num         |  4 ++--
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 1a61543..8060c18 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -466,3 +466,21 @@ void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,
 {
     ameth->pkey_security_bits = pkey_security_bits;
 }
+
+void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,
+                            int (*item_verify) (EVP_MD_CTX *ctx,
+                                                const ASN1_ITEM *it,
+                                                void *asn,
+                                                X509_ALGOR *a,
+                                                ASN1_BIT_STRING *sig,
+                                                EVP_PKEY *pkey),
+                            int (*item_sign) (EVP_MD_CTX *ctx,
+                                              const ASN1_ITEM *it,
+                                              void *asn,
+                                              X509_ALGOR *alg1,
+                                              X509_ALGOR *alg2,
+                                              ASN1_BIT_STRING *sig))
+{
+    ameth->item_sign = item_sign;
+    ameth->item_verify = item_verify;
+}
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 7d55778..8875c41 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -247,7 +247,7 @@ bn_exp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bn_exp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 bn_exp.o: ../../include/openssl/symhacks.h ../include/internal/bn_int.h
-bn_exp.o: ../include/internal/cryptlib.h bn_exp.c bn_lcl.h rsaz_exp.h
+bn_exp.o: ../include/internal/cryptlib.h bn_exp.c bn_lcl.h
 bn_exp2.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index dd4d701..dff81b0 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1171,6 +1171,19 @@ void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
 void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
                             int (*pkey_ctrl) (EVP_PKEY *pkey, int op,
                                               long arg1, void *arg2));
+void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,
+                            int (*item_verify) (EVP_MD_CTX *ctx,
+                                                const ASN1_ITEM *it,
+                                                void *asn,
+                                                X509_ALGOR *a,
+                                                ASN1_BIT_STRING *sig,
+                                                EVP_PKEY *pkey),
+                            int (*item_sign) (EVP_MD_CTX *ctx,
+                                              const ASN1_ITEM *it,
+                                              void *asn,
+                                              X509_ALGOR *alg1,
+                                              X509_ALGOR *alg2,
+                                              ASN1_BIT_STRING *sig));
 
 void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,
                                      int (*pkey_security_bits) (const EVP_PKEY
diff --git a/util/libeay.num b/util/libeay.num
index 27460f0..c297ef7 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4414,8 +4414,8 @@ ECDSA_METHOD_get_app_data               4770	EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_add1_host             4771	EXIST::FUNCTION:
 EC_GROUP_get_mont_data                  4772	EXIST::FUNCTION:EC
 i2d_re_X509_tbs                         4773	EXIST::FUNCTION:
-RSA_security_bits                       4774	EXIST::FUNCTION:RSA
-FIPS_ecdsa_verify_digest                4775	NOEXIST::FUNCTION:
+EVP_PKEY_asn1_set_item                  4774	EXIST::FUNCTION:
+RSA_security_bits                       4775	EXIST::FUNCTION:RSA
 FIPS_ecdsa_verify                       4776	NOEXIST::FUNCTION:
 BN_security_bits                        4777	EXIST::FUNCTION:
 FIPS_ecdsa_verify_ctx                   4778	NOEXIST::FUNCTION: