lt23 test

loamen · Jan 1, 2024 · 58ca2dc · 58ca2dc
1 parent bb301f0
commit 58ca2dc
Show file tree

Hide file tree

Showing 84 changed files with 323 additions and 1,228 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -50,8 +50,34 @@ else ()
             ${CMAKE_SOURCE_DIR}/src/main/cpp/${ANDROID_ABI}/libnative.so)
 endif ()
 
+#add_library(libssl
+#        STATIC
+#        IMPORTED)
+#
+#set_target_properties( # Specifies the target library.
+#        libssl
+#
+#        # Specifies the parameter you want to define.
+#        PROPERTIES IMPORTED_LOCATION
+#
+#        # Provides the path to the library you want to import.
+#        ${CMAKE_SOURCE_DIR}/src/main/cpp/${ANDROID_ABI}/libssl.so)
+#
+#add_library(libcrypto
+#        SHARED
+#        IMPORTED)
+#
+#set_target_properties( # Specifies the target library.
+#        libcrypto
+#
+#        # Specifies the parameter you want to define.
+#        PROPERTIES IMPORTED_LOCATION
+#
+#        # Provides the path to the library you want to import.
+#        ${CMAKE_SOURCE_DIR}/src/main/cpp/${ANDROID_ABI}/libcrypto.so)
+
 add_library(libssl
-        SHARED
+        STATIC
         IMPORTED)
 
 set_target_properties( # Specifies the target library.
@@ -61,10 +87,10 @@ set_target_properties( # Specifies the target library.
         PROPERTIES IMPORTED_LOCATION
 
         # Provides the path to the library you want to import.
-        ${CMAKE_SOURCE_DIR}/src/main/cpp/${ANDROID_ABI}/libssl.so)
+        ${CMAKE_SOURCE_DIR}/src/main/cpp/${ANDROID_ABI}/libssl.a)
 
 add_library(libcrypto
-        SHARED
+        STATIC
         IMPORTED)
 
 set_target_properties( # Specifies the target library.
@@ -74,7 +100,7 @@ set_target_properties( # Specifies the target library.
         PROPERTIES IMPORTED_LOCATION
 
         # Provides the path to the library you want to import.
-        ${CMAKE_SOURCE_DIR}/src/main/cpp/${ANDROID_ABI}/libcrypto.so)
+        ${CMAKE_SOURCE_DIR}/src/main/cpp/${ANDROID_ABI}/libcrypto.a)
 
 find_library( # Defines the name of the path variable that stores the
         # location of the NDK library.

diff --git a/app/src/main/cpp/arm64-v8a/libcrypto.a b/app/src/main/cpp/arm64-v8a/libcrypto.a
diff --git a/app/src/main/cpp/arm64-v8a/libcrypto.so b/app/src/main/cpp/arm64-v8a/libcrypto.so
diff --git a/app/src/main/cpp/arm64-v8a/libnative.so b/app/src/main/cpp/arm64-v8a/libnative.so
diff --git a/app/src/main/cpp/arm64-v8a/libssl.a b/app/src/main/cpp/arm64-v8a/libssl.a
diff --git a/app/src/main/cpp/arm64-v8a/libssl.so b/app/src/main/cpp/arm64-v8a/libssl.so
diff --git a/app/src/main/cpp/armeabi-v7a/libcrypto.a b/app/src/main/cpp/armeabi-v7a/libcrypto.a
diff --git a/app/src/main/cpp/armeabi-v7a/libcrypto.so b/app/src/main/cpp/armeabi-v7a/libcrypto.so
diff --git a/app/src/main/cpp/armeabi-v7a/libnative.so b/app/src/main/cpp/armeabi-v7a/libnative.so
diff --git a/app/src/main/cpp/armeabi-v7a/libssl.a b/app/src/main/cpp/armeabi-v7a/libssl.a
diff --git a/app/src/main/cpp/armeabi-v7a/libssl.so b/app/src/main/cpp/armeabi-v7a/libssl.so
diff --git a/app/src/main/cpp/include/openssl/asn1.h b/app/src/main/cpp/include/openssl/asn1.h
@@ -1,8 +1,8 @@
 /*
  * WARNING: do not edit!
- * Generated by Makefile from include/openssl/asn1.h.in
+ * Generated by Makefile from openssl-3.1.4/include/openssl/asn1.h.in
  *
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -158,7 +158,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(X509_ALGOR, X509_ALGOR, X509_ALGOR)
 
 
 
-# define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
+# define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */
 /*
  * This indicates that the ASN1_STRING is not a real value but just a place
  * holder for the location where indefinite length constructed data should be
@@ -999,8 +999,6 @@ int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
                                   unsigned char *data, int max_len);
 
 void *ASN1_item_unpack(const ASN1_STRING *oct, const ASN1_ITEM *it);
-void *ASN1_item_unpack_ex(const ASN1_STRING *oct, const ASN1_ITEM *it,
-                          OSSL_LIB_CTX *libctx, const char *propq);
 
 ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,
                             ASN1_OCTET_STRING **oct);

diff --git a/app/src/main/cpp/include/openssl/asn1t.h b/app/src/main/cpp/include/openssl/asn1t.h
@@ -1,6 +1,6 @@
 /*
  * WARNING: do not edit!
- * Generated by Makefile from include/openssl/asn1t.h.in
+ * Generated by Makefile from openssl-3.1.4/include/openssl/asn1t.h.in
  *
  * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
  *

diff --git a/app/src/main/cpp/include/openssl/async.h b/app/src/main/cpp/include/openssl/async.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -80,14 +80,6 @@ int ASYNC_WAIT_CTX_clear_fd(ASYNC_WAIT_CTX *ctx, const void *key);
 
 int ASYNC_is_capable(void);
 
-typedef void *(*ASYNC_stack_alloc_fn)(size_t *num);
-typedef void (*ASYNC_stack_free_fn)(void *addr);
-
-int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
-                            ASYNC_stack_free_fn free_fn);
-void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
-                             ASYNC_stack_free_fn *free_fn);
-
 int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *ctx, int *ret,
                     int (*func)(void *), void *args, size_t size);
 int ASYNC_pause_job(void);