diff --git a/thirdparty/cryptopp/HPKBUILD b/thirdparty/cryptopp/HPKBUILD index 5fe6c221c9de882d6a3a5168a62666c701a28f75..a77144a3bdd56b4c341a66a4fab734fe563b1d09 100644 --- a/thirdparty/cryptopp/HPKBUILD +++ b/thirdparty/cryptopp/HPKBUILD @@ -10,7 +10,7 @@ archs=("armeabi-v7a" "arm64-v8a") license=("Boost Software License" "CRYPTOGAMS License") depends=() makedepends=() -install= + source="https://github.com/weidai11/$pkgname/archive/refs/tags/$pkgver.tar.gz" patchflag=false @@ -46,7 +46,7 @@ build() { package() { cd $builddir-$ARCH-build - make install PREFIX=$LYCIUM_ROOT/usr/$pkgname-$ARCH-install >> `pwd`/build.log 2>&1 + make install PREFIX=$LYCIUM_ROOT/usr/$pkgname/$ARCH >> `pwd`/build.log 2>&1 cd $OLDPWD if [ $ARCH == "armeabi-v7a" ] then @@ -61,8 +61,8 @@ package() { check() { echo "The test must be on an OpenHarmony device!" # real test CMD - # ./cryptest.exe -tv - # ./cryptest.ext -v + # ./cryptest.exe tv + # ./cryptest.exe v } cleanbuild(){ diff --git a/thirdparty/cryptopp/README_zh.md b/thirdparty/cryptopp/README_zh.md index a85c766291c6964d00a2898d42a5b02bca2535f3..f8850f602ca449402b45f1b112179c97a0b9517b 100644 --- a/thirdparty/cryptopp/README_zh.md +++ b/thirdparty/cryptopp/README_zh.md @@ -2,7 +2,7 @@ ## 功能简介 cryptopp是开源的C++密码学库,集成了非常多的密码算法。 ## 使用约束 -- IDE版本:DevEco Studio 3.1 Release +- IDE版本:DevEco Studio 3.1 Beta2 - SDK版本:ohos_sdk_public 3.2.11.9 (API Version 9 Release) - 三方库版本:Crypto++ 8.7 release - 当前适配的功能:支持开源密码算法 diff --git a/thirdparty/cryptopp/docs/hap_integrate.md b/thirdparty/cryptopp/docs/hap_integrate.md index 06407126dbbc2b72603d25d6a9a511c4c7f2312d..0764fe8686cf7d0224ed7d1f1241a84dfc1682fd 100644 --- a/thirdparty/cryptopp/docs/hap_integrate.md +++ b/thirdparty/cryptopp/docs/hap_integrate.md @@ -36,7 +36,7 @@ - 三方库头文件及生成的库 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 ``` - cryptopp-arm64-v8a-install cryptopp-armeabi-v7a-install + cryptopp/arm64-v8a cryptopp/armeabi-v7a ``` - [测试三方库](#测试三方库) @@ -44,19 +44,27 @@ ## 应用中使用三方库 - 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 - ![thirdparty_install_dir](pic/cryptopp_install_dir.png) + +  ![thirdparty_install_dir](pic/cryptopp_install_dir.png) + - 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 ``` #将三方库加入工程中 - target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cryptopp-${OHOS_ARCH}-install/lib/libcryptopp.a) + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cryptopp/${OHOS_ARCH}/lib/libcryptopp.a) #将三方库的头文件加入工程中 - target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cryptopp-${OHOS_ARCH}-install/include) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cryptopp/${OHOS_ARCH}/include) + ``` ![cryptopp_usage](pic/cryptopp_usage.png) ## 测试三方库 -三方库的测试使用原库自带的测试用例来做测试 +三方库的测试使用原库自带的可执行文件来做测试 -进入到构建目录,执行./cryptest.exe -tv运行测试用例(arm64-v8a-build为构建64位的目录,armeabi-v7a-build为构建32位的目录) +进入到构建目录,执行以下命令 +``` +./cryptest.exe tv +./cryptest.exe v +``` +查看运行结果(arm64-v8a-build为构建64位的目录,armeabi-v7a-build为构建32位的目录)  ![cryptopp_test](pic/cryptopp_test.png) diff --git a/thirdparty/cryptopp/docs/pic/cryptopp_install_dir.png b/thirdparty/cryptopp/docs/pic/cryptopp_install_dir.png index 75eed2fb86c6d9dd78a163b8dc1cac1e0686b603..64f8043e9ebc88c4502dc2111e0babeeda5d50ad 100644 Binary files a/thirdparty/cryptopp/docs/pic/cryptopp_install_dir.png and b/thirdparty/cryptopp/docs/pic/cryptopp_install_dir.png differ diff --git a/thirdparty/cryptopp/docs/pic/cryptopp_usage.png b/thirdparty/cryptopp/docs/pic/cryptopp_usage.png index 256308313af92fae512ba6bdc431dfab1d59f409..8114eec1197f6634486de59d9edfddd2daeb1f82 100644 Binary files a/thirdparty/cryptopp/docs/pic/cryptopp_usage.png and b/thirdparty/cryptopp/docs/pic/cryptopp_usage.png differ