[Feature][ZXW-65]merged P49 base code
Change-Id: I3e09c0c3d47483bc645f02310380ecb7fc6f4041
diff --git a/ap/lib/libssl/openssl-1.1.1o/include/crypto/bn.h b/ap/lib/libssl/openssl-1.1.1o/include/crypto/bn.h
index 9f866ed..250914c 100644
--- a/ap/lib/libssl/openssl-1.1.1o/include/crypto/bn.h
+++ b/ap/lib/libssl/openssl-1.1.1o/include/crypto/bn.h
@@ -86,10 +86,5 @@
int bn_rshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n);
int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
const BIGNUM *d, BN_CTX *ctx);
-int ossl_bn_rsa_do_unblind(const BIGNUM *intermediate,
- const BN_BLINDING *blinding,
- const BIGNUM *possible_arg2,
- const BIGNUM *to_mod, BN_CTX *ctx,
- unsigned char *buf, int num);
#endif
diff --git a/ap/lib/libssl/openssl-1.1.1o/include/openssl/opensslv.h b/ap/lib/libssl/openssl-1.1.1o/include/openssl/opensslv.h
index 7b6c212..5ed047d 100644
--- a/ap/lib/libssl/openssl-1.1.1o/include/openssl/opensslv.h
+++ b/ap/lib/libssl/openssl-1.1.1o/include/openssl/opensslv.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -39,8 +39,8 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-# define OPENSSL_VERSION_NUMBER 0x1010114fL
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1t 7 Feb 2023"
+# define OPENSSL_VERSION_NUMBER 0x1010115fL
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1u 30 May 2023"
/*-
* The macros below are to be used for shared library (.so, .dll, ...)