Skip to content

Commit a3c40ea

Browse files
authored
Implement more options for req CLI (#2775)
1 parent 981c79b commit a3c40ea

File tree

10 files changed

+2354
-518
lines changed

10 files changed

+2354
-518
lines changed

tests/ci/common_posix_setup.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ function build_openssl {
223223
./config --prefix="${install_dir}/openssl-${branch}" --openssldir="${install_dir}/openssl-${branch}" -d
224224
make "-j${NUM_CPU_THREADS}" > /dev/null
225225
make install_sw
226+
227+
# Copy openssl.cnf to openssldir
228+
cp "${scratch_folder}/openssl-${branch}/apps/openssl.cnf" "${install_dir}/openssl-${branch}/openssl.cnf"
229+
226230
popd
227231
rm -rf "${scratch_folder}/openssl-${branch}"
228232
}

tests/ci/run_openssl_comparison_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export AWSLC_TOOL_PATH="${BUILD_ROOT}/tool-openssl/openssl"
4444
for branch in "${!openssl_branches[@]}"; do
4545
export OPENSSL_TOOL_VERSION="${openssl_versions[$branch]}"
4646
export OPENSSL_TOOL_PATH="${install_dir}/openssl-${branch}/bin/openssl"
47+
export OPENSSL_CONF="${install_dir}/openssl-${branch}/openssl.cnf"
4748
echo "Running ${test} against OpenSSL ${branch}"
4849
LD_LIBRARY_PATH="${install_dir}/openssl-${branch}/${openssl_branches[$branch]}" "${BUILD_ROOT}/tool-openssl/tool_openssl_test"
4950
done

tool-openssl/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ bool X509Tool(const args_list_t &args);
106106

107107

108108
// Req Tool Utilities
109-
bssl::UniquePtr<X509_NAME> parse_subject_name(std::string &subject_string);
109+
bssl::UniquePtr<X509_NAME> ParseSubjectName(std::string &subject_string);
110110

111111

112112
// Rehash tool Utils

0 commit comments

Comments
 (0)