[openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  b5f82567afa820bac55b7dd7eb9dd510c32c3ef6 (commit)
       via  08e9684c53deab7d815be47bfdf0f324a0d10ad9 (commit)
      from  28a5f5b39c54751c825c05677e23406eda37d16b (commit)


- Log -----------------------------------------------------------------
commit b5f82567afa820bac55b7dd7eb9dd510c32c3ef6
Author: Henry N <12493969+HenryNe at users.noreply.github.com>
Date:   Thu Sep 10 23:55:28 2020 +0200

    Fix: ecp_nistz256-armv4.S bad arguments
    
    Fix this error:
    
    crypto/ec/ecp_nistz256-armv4.S:3853: Error: bad arguments to instruction -- `orr r11,r10'
    crypto/ec/ecp_nistz256-armv4.S:3854: Error: bad arguments to instruction -- `orr r11,r12'
    crypto/ec/ecp_nistz256-armv4.S:3855: Error: bad arguments to instruction -- `orrs r11,r14'
    
    CLA: trivial
    
    Fixes #12848
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    GH: #12854

commit 08e9684c53deab7d815be47bfdf0f324a0d10ad9
Author: David Benjamin <davidben at google.com>
Date:   Fri Sep 18 15:21:43 2020 -0400

    Deprecate ASN1_STRING_length_set in OpenSSL 3.0.
    
    Fixes #12885
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    GH: #12922

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

Summary of changes:
 crypto/asn1/asn1_lib.c              | 2 ++
 crypto/ec/asm/ecp_nistz256-armv4.pl | 6 +++---
 include/openssl/asn1.h.in           | 2 +-
 util/libcrypto.num                  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 1331f608f4..d6160ac979 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -387,10 +387,12 @@ int ASN1_STRING_length(const ASN1_STRING *x)
     return x->length;
 }
 
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 void ASN1_STRING_length_set(ASN1_STRING *x, int len)
 {
     x->length = len;
 }
+#endif
 
 int ASN1_STRING_type(const ASN1_STRING *x)
 {
diff --git a/crypto/ec/asm/ecp_nistz256-armv4.pl b/crypto/ec/asm/ecp_nistz256-armv4.pl
index 32fd9087e0..0adad26cb1 100755
--- a/crypto/ec/asm/ecp_nistz256-armv4.pl
+++ b/crypto/ec/asm/ecp_nistz256-armv4.pl
@@ -1521,9 +1521,9 @@ ecp_nistz256_point_add:
 	ldr	$t2,[sp,#32*18+12]	@ ~is_equal(S1,S2)
 	mvn	$t0,$t0			@ -1/0 -> 0/-1
 	mvn	$t1,$t1			@ -1/0 -> 0/-1
-	orr	$a0,$t0
-	orr	$a0,$t1
-	orrs	$a0,$t2			@ set flags
+	orr	$a0,$a0,$t0
+	orr	$a0,$a0,$t1
+	orrs	$a0,$a0,$t2		@ set flags
 
 	@ if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2))
 	bne	.Ladd_proceed
diff --git a/include/openssl/asn1.h.in b/include/openssl/asn1.h.in
index c4d6f068ae..dfb1c9cae5 100644
--- a/include/openssl/asn1.h.in
+++ b/include/openssl/asn1.h.in
@@ -539,7 +539,7 @@ int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
 int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
 void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
 int ASN1_STRING_length(const ASN1_STRING *x);
-void ASN1_STRING_length_set(ASN1_STRING *x, int n);
+DEPRECATEDIN_3_0(void ASN1_STRING_length_set(ASN1_STRING *x, int n))
 int ASN1_STRING_type(const ASN1_STRING *x);
 DEPRECATEDIN_1_1_0(unsigned char *ASN1_STRING_data(ASN1_STRING *x))
 const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x);
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 0be0ada89d..96fd637ba0 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -1813,7 +1813,7 @@ BIO_next                                1855	3_0_0	EXIST::FUNCTION:
 ASN1_STRING_set_default_mask_asc        1856	3_0_0	EXIST::FUNCTION:
 X509_CRL_new                            1857	3_0_0	EXIST::FUNCTION:
 i2b_PrivateKey_bio                      1858	3_0_0	EXIST::FUNCTION:DSA
-ASN1_STRING_length_set                  1859	3_0_0	EXIST::FUNCTION:
+ASN1_STRING_length_set                  1859	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 PEM_write_PKCS8                         1860	3_0_0	EXIST::FUNCTION:STDIO
 PKCS7_digest_from_attributes            1861	3_0_0	EXIST::FUNCTION:
 EC_GROUP_set_curve_GFp                  1862	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,EC