From d49e434d9c1f8cdd17423e00dcfb64d9a4170c5b Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Tue, 16 Jun 2020 10:50:49 +0200 Subject: [PATCH] Remove certificate chain utilities Reordering of certificate chain is not the role of dcm-daemon. dcm-backend must return a certificate chain with correct order. Change-Id: Id6d4adfa9c17d3f05501966c40e5dbf82eca40db --- CMakeLists.txt | 1 - README.md | 3 +- dcm-daemon/CMakeLists.txt | 1 - dcm-daemon/cert_utils.cpp | 261 --------------------------- dcm-daemon/cert_utils.h | 50 ------ dcm-daemon/dcmsession.cpp | 14 +- packaging/device-certificate-manager.spec | 1 - tests/CMakeLists.txt | 30 +--- tests/mbedtls_wrapper.h | 109 ------------ tests/test_cert_rewriter.cpp | 285 ------------------------------ tests/test_data/cert.pem | 18 -- tests/test_data/cert2.pem | 18 -- tests/test_data/create_data.sh | 7 - tests/test_data/server.csr | 16 -- tests/test_data/server.key | 27 --- tests/test_data/server.pass.key | 30 ---- tests/test_data/server2.csr | 16 -- tests/test_data/tizen.org.pem | 103 ----------- tools/CMakeLists.txt | 2 - tools/bin2c.c | 84 --------- 20 files changed, 4 insertions(+), 1072 deletions(-) delete mode 100644 dcm-daemon/cert_utils.cpp delete mode 100644 dcm-daemon/cert_utils.h delete mode 100644 tests/mbedtls_wrapper.h delete mode 100644 tests/test_cert_rewriter.cpp delete mode 100644 tests/test_data/cert.pem delete mode 100644 tests/test_data/cert2.pem delete mode 100755 tests/test_data/create_data.sh delete mode 100644 tests/test_data/server.csr delete mode 100644 tests/test_data/server.key delete mode 100644 tests/test_data/server.pass.key delete mode 100644 tests/test_data/server2.csr delete mode 100644 tests/test_data/tizen.org.pem delete mode 100644 tools/CMakeLists.txt delete mode 100644 tools/bin2c.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 04b5148..5a96e62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,4 +60,3 @@ add_subdirectory(pkgconfig) add_subdirectory(rpm) add_subdirectory(systemd) add_subdirectory(tests) -add_subdirectory(tools) diff --git a/README.md b/README.md index 27e675b..a0fc71a 100644 --- a/README.md +++ b/README.md @@ -40,11 +40,10 @@ The DCM daemon does not need to be modified. ##Testing -There are currently four general testing applications and one KONAI SE specific tool: +There are currently three general testing applications and one KONAI SE specific tool: - *dcm_api_test* - *dcm_example_capi* - *dcm_example_client* -- *dcm_test_cert_rewriter* All testing applications should be executed after implementing changes to the DCM or to the DCM backend repository. There is also one KONAI SE specific tool: *dcm_konaise_tool* used to test the KONAI SE backend implementation. diff --git a/dcm-daemon/CMakeLists.txt b/dcm-daemon/CMakeLists.txt index 97109f2..e29baab 100644 --- a/dcm-daemon/CMakeLists.txt +++ b/dcm-daemon/CMakeLists.txt @@ -49,7 +49,6 @@ add_executable(device-certificate-managerd serviceadapter.cpp ../shared/protobuf_asio.cpp soresolver.cpp - cert_utils.cpp ${PROTO_SRCS} ${PROTO_HDRS} ) diff --git a/dcm-daemon/cert_utils.cpp b/dcm-daemon/cert_utils.cpp deleted file mode 100644 index 2714904..0000000 --- a/dcm-daemon/cert_utils.cpp +++ /dev/null @@ -1,261 +0,0 @@ -/****************************************************************** - * - * Copyright 2017 Samsung Electronics All Rights Reserved. - * - * Author: Jaroslaw Pelczar - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************/ - -#include "cert_utils.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "logging.h" - -int x509_crt_rewriter::parse(const unsigned char * buffer, size_t length) -{ - BOOST_LOG_FUNCTION(); - return mbedtls_x509_crt_parse(fChain, buffer, length); -} - -/* - * Like memcmp, but case-insensitive and always returns -1 if different - */ -static int x509_memcasecmp( const void *s1, const void *s2, size_t len ) -{ - size_t i; - unsigned char diff; - const unsigned char *n1 = (const unsigned char *)s1, *n2 = (const unsigned char *)s2; - - for( i = 0; i < len; i++ ) - { - diff = n1[i] ^ n2[i]; - - if( diff == 0 ) - continue; - - if( diff == 32 && - ( ( n1[i] >= 'a' && n1[i] <= 'z' ) || - ( n1[i] >= 'A' && n1[i] <= 'Z' ) ) ) - { - continue; - } - - return( -1 ); - } - - return( 0 ); -} - -/* - * Compare two X.509 strings, case-insensitive, and allowing for some encoding - * variations (but not all). - * - * Return 0 if equal, -1 otherwise. - */ -static int x509_string_cmp( const mbedtls_x509_buf *a, const mbedtls_x509_buf *b ) -{ - if( a->tag == b->tag && - a->len == b->len && - memcmp( a->p, b->p, b->len ) == 0 ) - { - return( 0 ); - } - - if( ( a->tag == MBEDTLS_ASN1_UTF8_STRING || a->tag == MBEDTLS_ASN1_PRINTABLE_STRING ) && - ( b->tag == MBEDTLS_ASN1_UTF8_STRING || b->tag == MBEDTLS_ASN1_PRINTABLE_STRING ) && - a->len == b->len && - x509_memcasecmp( a->p, b->p, b->len ) == 0 ) - { - return( 0 ); - } - - return( -1 ); -} - -/* - * Compare two X.509 Names (aka rdnSequence). - * - * See RFC 5280 section 7.1, though we don't implement the whole algorithm: - * we sometimes return unequal when the full algorithm would return equal, - * but never the other way. (In particular, we don't do Unicode normalisation - * or space folding.) - * - * Return 0 if equal, -1 otherwise. - */ -static int x509_name_cmp( const mbedtls_x509_name *a, const mbedtls_x509_name *b ) -{ - /* Avoid recursion, it might not be optimised by the compiler */ - while( a != NULL || b != NULL ) - { - if( a == NULL || b == NULL ) - return( -1 ); - - /* type */ - if( a->oid.tag != b->oid.tag || - a->oid.len != b->oid.len || - memcmp( a->oid.p, b->oid.p, b->oid.len ) != 0 ) - { - return( -1 ); - } - - /* value */ - if( x509_string_cmp( &a->val, &b->val ) != 0 ) - return( -1 ); - - /* structure of the list of sets */ - if( a->next_merged != b->next_merged ) - return( -1 ); - - a = a->next; - b = b->next; - } - - /* a == NULL == b */ - return( 0 ); -} - -void x509_crt_rewriter::sort_chain() -{ - BOOST_LOG_FUNCTION(); - - // Only 1 certificate - don't bother - if(!fChain->next) { - fChainSize = fChain->raw.len; - fNumCerts = 1; - return; - } - - std::vector list; - std::multimap subject_of; - std::set visited; - - // Build list of all certificates - for(auto * cert = fChain ; cert ; cert = cert->next) { - list.push_back(cert); - } - - // Create graph vertices to map issuer to subject - for(size_t i = 0 ; i < list.size() ; ++i) { - mbedtls_x509_crt * issuer = nullptr; - // Find issuer - ignore ourselves as we always want root CA issuer to be nullptr - for(size_t j = 0 ; j < list.size() ; ++j) { - if(i != j && x509_name_cmp(&list[i]->issuer, &list[j]->subject) == 0) { - issuer = list[j]; - break; - } - } - - // In case there are multiple subjects for one issuer, the chain - // must be horribly broken - subject_of.emplace(issuer, list[i]); - } - - // BFS algorithm queue - std::list queue; - // Final output chain - std::list final_chain; - - // Find root certificates - they will not have any issuer - auto root_range = subject_of.equal_range(nullptr); - - // Perform BFS for each root - for(auto it = root_range.first ; it != root_range.second ; ++it) { - mbedtls_x509_crt * root_cert = it->second; - - if(visited.find(root_cert) == visited.end()) { - visited.insert(root_cert); - queue.push_back(root_cert); - - while(!queue.empty()) { - auto s = queue.front(); - // Write out chain from root back to leaf - final_chain.push_back(s); - queue.pop_front(); - - auto range = subject_of.equal_range(s); - for(auto it = range.first ; it != range.second ; ++it) { - mbedtls_x509_crt * cert = it->second; - if(visited.find(cert) == visited.end()) { - visited.insert(cert); - queue.push_back(cert); - } - } - } - } - } - - fChain = nullptr; - fChainSize = 0; - fNumCerts = list.size(); - - // Rebuild certificate linked list - for(auto it = final_chain.begin() ; it != final_chain.end() ; ++it) { - auto cert(*it); - cert->next = fChain; - fChain = cert; - fChainSize += cert->raw.len; - } -} - -#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n" -#define PEM_END_CRT "-----END CERTIFICATE-----\n" - -std::string x509_crt_rewriter::emit_pem() -{ - BOOST_LOG_FUNCTION(); - std::string buffer; - - if(fChainSize == 0) - throw std::runtime_error("State failure"); - - // Always rewrite the chain as PEM - - buffer.resize(fChainSize * 4 + fNumCerts * (sizeof(PEM_BEGIN_CRT) + sizeof(PEM_END_CRT))); - - unsigned char * out_buffer = (unsigned char *)buffer.c_str(); - size_t out_capacity = buffer.size(); - size_t total_size = 0; - size_t this_len; - - for(auto cert = fChain ; cert ; cert = cert->next) { - int error = mbedtls_pem_write_buffer(PEM_BEGIN_CRT, - PEM_END_CRT, - cert->raw.p, - cert->raw.len, - out_buffer + total_size, - out_capacity - total_size, - &this_len); - - if(error != 0) { - throw std::runtime_error("Certificate write failure"); - } - - // Account for final 0 byte - total_size += this_len - 1; - } - - buffer.resize(total_size); - buffer.push_back(0); - - return buffer; -} diff --git a/dcm-daemon/cert_utils.h b/dcm-daemon/cert_utils.h deleted file mode 100644 index 7a5a64f..0000000 --- a/dcm-daemon/cert_utils.h +++ /dev/null @@ -1,50 +0,0 @@ -/****************************************************************** - * - * Copyright 2017 Samsung Electronics All Rights Reserved. - * - * Author: Jaroslaw Pelczar - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************/ - -#ifndef DCM_DAEMON_CERT_UTILS_H_ -#define DCM_DAEMON_CERT_UTILS_H_ - -#include -#include - -struct x509_crt_rewriter { -private: - mbedtls_x509_crt * fChain; - size_t fChainSize = 0; - size_t fNumCerts = 0; - -public: - x509_crt_rewriter() : - fChain(new mbedtls_x509_crt()) - { - mbedtls_x509_crt_init(fChain); - } - - ~x509_crt_rewriter() { - mbedtls_x509_crt_free(fChain); - delete fChain; - } - - int parse(const unsigned char * buffer, size_t length); - void sort_chain(); - std::string emit_pem(); -}; - -#endif /* DCM_DAEMON_CERT_UTILS_H_ */ diff --git a/dcm-daemon/dcmsession.cpp b/dcm-daemon/dcmsession.cpp index 5432a84..b175a85 100644 --- a/dcm-daemon/dcmsession.cpp +++ b/dcm-daemon/dcmsession.cpp @@ -1,6 +1,6 @@ /****************************************************************** * - * Copyright 2017 - 2019 Samsung Electronics All Rights Reserved. + * Copyright 2017 - 2020 Samsung Electronics All Rights Reserved. * * Author: Jaroslaw Pelczar * @@ -22,7 +22,6 @@ #include "logging.h" #include "exception_translator.h" #include "dcmserver.h" -#include "cert_utils.h" #include #include @@ -376,7 +375,6 @@ void dcm_session::handle_cert_chain(const RequestCertificateChain& message) } std::string cert_chain; - x509_crt_rewriter parser; int error = 0; bool loaded = fSoResolver->ensure_loaded(); @@ -402,15 +400,7 @@ void dcm_session::handle_cert_chain(const RequestCertificateChain& message) cert_chain.push_back(0); } - if((error = parser.parse((const unsigned char *)cert_chain.c_str(), cert_chain.length())) != 0) { - char buffer[256]; - mbedtls_strerror(error, buffer, sizeof(buffer)); - BOOST_LOG_SEV(dcm_logger::get(), log_severity::error) << "Can't pase certificate : " << std::string(buffer); - throw std::runtime_error("Can't parse x509 certificate"); - } - - parser.sort_chain(); - *certificateResponse->mutable_cert_chain() = parser.emit_pem(); + *certificateResponse->mutable_cert_chain() = cert_chain; certificateResponse->set_result(0); reply(msg); diff --git a/packaging/device-certificate-manager.spec b/packaging/device-certificate-manager.spec index 0b266d6..aabdecc 100644 --- a/packaging/device-certificate-manager.spec +++ b/packaging/device-certificate-manager.spec @@ -133,4 +133,3 @@ fi %{_bindir}/dcm_api_test %{_bindir}/dcm_example_capi %{_bindir}/dcm_example_client -%{_bindir}/dcm_test_cert_rewriter diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 022e861..bae6eb4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,40 +17,12 @@ install(TARGETS dcm_example_client dcm_example_capi RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) IF(Boost_UNIT_TEST_FRAMEWORK_FOUND) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cert_pem.c - COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/test_data/cert.pem ${CMAKE_CURRENT_BINARY_DIR}/cert_pem.c test_data_cert_pem - DEPENDS helper_bin2c ${CMAKE_CURRENT_SOURCE_DIR}/test_data/cert.pem) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cert_pem2.c - COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/test_data/cert2.pem ${CMAKE_CURRENT_BINARY_DIR}/cert_pem2.c test_data_cert_pem2 - DEPENDS helper_bin2c ${CMAKE_CURRENT_SOURCE_DIR}/test_data/cert2.pem) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tizen_org_pem.c - COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/test_data/tizen.org.pem ${CMAKE_CURRENT_BINARY_DIR}/tizen_org_pem.c tizen_org_pem - DEPENDS helper_bin2c ${CMAKE_CURRENT_SOURCE_DIR}/test_data/tizen.org.pem) - - add_executable(dcm_test_cert_rewriter - test_cert_rewriter.cpp - ../dcm-daemon/cert_utils.cpp - ${CMAKE_CURRENT_BINARY_DIR}/cert_pem.c - ${CMAKE_CURRENT_BINARY_DIR}/cert_pem2.c - ${CMAKE_CURRENT_BINARY_DIR}/tizen_org_pem.c) - - target_link_libraries(dcm_test_cert_rewriter - ${Boost_LOG_LIBRARY} - ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES} - ${Boost_SYSTEM_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${MBEDTLS_LIB} - ${MBEDCRYPTO_LIB} - ${MBEDX509_LIB}) - add_executable(dcm_api_test api_test.cpp) target_link_libraries(dcm_api_test device-certificate-manager ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) - install(TARGETS dcm_test_cert_rewriter dcm_api_test + install(TARGETS dcm_api_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ELSE() message(STATUS "Boost::test library not found. Disabling unit test build") diff --git a/tests/mbedtls_wrapper.h b/tests/mbedtls_wrapper.h deleted file mode 100644 index c72fdfc..0000000 --- a/tests/mbedtls_wrapper.h +++ /dev/null @@ -1,109 +0,0 @@ -/****************************************************************** - * - * Copyright 2017 Samsung Electronics All Rights Reserved. - * - * Author: Jaroslaw Pelczar - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************/ - -#ifndef DCM_DAEMON_MBEDTLS_WRAPPER_H_ -#define DCM_DAEMON_MBEDTLS_WRAPPER_H_ - -#include -#include -#include -#include -#include -#include -#include - -struct mbedtls_x509_crt_wrapper : public mbedtls_x509_crt, public boost::noncopyable { - mbedtls_x509_crt_wrapper() { - mbedtls_x509_crt_init(this); - } - - ~mbedtls_x509_crt_wrapper() { - mbedtls_x509_crt_free(this); - } - - int parse(const std::string& pem) { - return mbedtls_x509_crt_parse(this, reinterpret_cast(pem.c_str()), pem.size() + 1); - } - - int parse(const unsigned char * pem, size_t size) { - return mbedtls_x509_crt_parse(this, pem, size); - } -}; - -static inline std::string mbedtls_error_to_string(int error) { - char buffer[256]; - mbedtls_strerror(error, buffer, sizeof(buffer)); - return std::string(buffer); -} - -struct mbedtls_mpi_wrapper : public mbedtls_mpi, public boost::noncopyable { - mbedtls_mpi_wrapper() { - mbedtls_mpi_init(this); - } - - ~mbedtls_mpi_wrapper() { - mbedtls_mpi_free(this); - } - - int read_binary(const void * data, size_t length) { - return mbedtls_mpi_read_binary(this, (const unsigned char *)data, length); - } -}; - -struct mbedtls_entropy_context_wrapper : public mbedtls_entropy_context, public boost::noncopyable -{ - mbedtls_entropy_context_wrapper() { - mbedtls_entropy_init(this); - } - - ~mbedtls_entropy_context_wrapper() { - mbedtls_entropy_free(this); - } -}; - -struct mbedtls_ctr_drbg_context_wrapper : public mbedtls_ctr_drbg_context, public boost::noncopyable -{ - mbedtls_ctr_drbg_context_wrapper() { - mbedtls_ctr_drbg_init(this); - } - - ~mbedtls_ctr_drbg_context_wrapper() { - mbedtls_ctr_drbg_free(this); - } - - int seed(int (*f_entropy)(void *, unsigned char *, size_t), void *p_entropy, - const unsigned char *custom, size_t len) - { - return mbedtls_ctr_drbg_seed(this, f_entropy, p_entropy, custom, len); - } -}; - -struct mbedtls_pk_context_wrapper : public mbedtls_pk_context, public boost::noncopyable -{ - mbedtls_pk_context_wrapper() { - mbedtls_pk_init(this); - } - - ~mbedtls_pk_context_wrapper() { - mbedtls_pk_free(this); - } -}; - -#endif /* DCM_DAEMON_MBEDTLS_WRAPPER_H_ */ diff --git a/tests/test_cert_rewriter.cpp b/tests/test_cert_rewriter.cpp deleted file mode 100644 index 13c815a..0000000 --- a/tests/test_cert_rewriter.cpp +++ /dev/null @@ -1,285 +0,0 @@ -/****************************************************************** - * - * Copyright 2017 - 2019 Samsung Electronics All Rights Reserved. - * - * Author: Jaroslaw Pelczar - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************/ - -#define BOOST_TEST_MODULE Cert Parser -#include -#include "mbedtls_wrapper.h" -#include -#include -#include -#include -#include - -#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n" -#define PEM_END_CRT "-----END CERTIFICATE-----\n" - -namespace bt = boost::unit_test; - -extern "C" { - extern size_t test_data_cert_pem_size; - extern unsigned char test_data_cert_pem[]; - extern size_t test_data_cert_pem2_size; - extern unsigned char test_data_cert_pem2[]; - extern size_t tizen_org_pem_size; - extern unsigned char tizen_org_pem[]; -} - -BOOST_AUTO_TEST_CASE(test_create_destroy) -{ - x509_crt_rewriter test_obj; - std::unique_ptr test_obj2(new x509_crt_rewriter()); -} - -BOOST_AUTO_TEST_CASE(test_parse_invalid_cert) -{ - x509_crt_rewriter test_obj; - - std::string invalid_cert("eir09r0934iut9083ug09854ug98u489ghu3908tguj"); - - int error = test_obj.parse(reinterpret_cast(invalid_cert.c_str()), - invalid_cert.size()); - - BOOST_REQUIRE_NE(error, 0); -} - -BOOST_AUTO_TEST_CASE(test_parse_valid_pem) -{ - x509_crt_rewriter test_obj; - - int error = test_obj.parse(test_data_cert_pem, test_data_cert_pem_size + 1); - BOOST_REQUIRE_EQUAL(error, 0); - error = test_obj.parse(test_data_cert_pem2, test_data_cert_pem2_size + 1); - BOOST_REQUIRE_EQUAL(error, 0); -} - -BOOST_AUTO_TEST_CASE(test_parse_pem_without_null) -{ - x509_crt_rewriter test_obj; - - int error = test_obj.parse(test_data_cert_pem, test_data_cert_pem_size); - - BOOST_REQUIRE_NE(error, 0); -} - -BOOST_AUTO_TEST_CASE(test_parse_write_pem_without_sorting) -{ - x509_crt_rewriter test_obj; - - int error = test_obj.parse(test_data_cert_pem, test_data_cert_pem_size + 1); - BOOST_REQUIRE_EQUAL(error, 0); - - BOOST_REQUIRE_THROW(test_obj.emit_pem(), std::exception); -} - -BOOST_AUTO_TEST_CASE(test_parse_write_1_pem_with_sorting) -{ - x509_crt_rewriter test_obj; - - int error = test_obj.parse(test_data_cert_pem, test_data_cert_pem_size + 1); - BOOST_REQUIRE(error == 0); - - test_obj.sort_chain(); - - std::string output_cert = test_obj.emit_pem(); - - BOOST_REQUIRE(!output_cert.empty()); - BOOST_REQUIRE_EQUAL(output_cert[output_cert.length() - 1], 0); - BOOST_REQUIRE_EQUAL(output_cert.substr(0, sizeof(PEM_BEGIN_CRT) - 1), PEM_BEGIN_CRT); - - std::string cert_end = output_cert.substr(output_cert.length() - sizeof(PEM_END_CRT), sizeof(PEM_END_CRT) - 1); - - BOOST_REQUIRE_EQUAL(cert_end, PEM_END_CRT); - - BOOST_CHECK_EQUAL(output_cert, std::string((const char *)test_data_cert_pem, test_data_cert_pem_size + 1)); -} - -BOOST_AUTO_TEST_CASE(test_parse_same_cert_twice) -{ - x509_crt_rewriter test_obj; - - std::string primary_cert((const char *)test_data_cert_pem, test_data_cert_pem_size); - - std::string to_parse(primary_cert); - to_parse += primary_cert; - - int error = test_obj.parse((const unsigned char *)to_parse.c_str(), to_parse.length() + 1); - BOOST_REQUIRE(error == 0); - - test_obj.sort_chain(); - - BOOST_REQUIRE_THROW(test_obj.emit_pem(), std::exception); -} - -BOOST_AUTO_TEST_CASE(test_parse_same_cert_three_times) -{ - x509_crt_rewriter test_obj; - - std::string primary_cert((const char *)test_data_cert_pem, test_data_cert_pem_size); - - std::string to_parse(primary_cert); - to_parse += primary_cert; - to_parse += primary_cert; - - int error = test_obj.parse((const unsigned char *)to_parse.c_str(), to_parse.length() + 1); - BOOST_REQUIRE(error == 0); - - test_obj.sort_chain(); - - BOOST_REQUIRE_THROW(test_obj.emit_pem(), std::exception); -} - -BOOST_AUTO_TEST_CASE(test_parse_different_certs) -{ - x509_crt_rewriter test_obj; - - std::string cert1((const char *)test_data_cert_pem, test_data_cert_pem_size); - std::string cert2((const char *)test_data_cert_pem2, test_data_cert_pem2_size); - - std::string to_parse(cert1); - to_parse += cert2; - - int error = test_obj.parse((const unsigned char *)to_parse.c_str(), to_parse.length() + 1); - BOOST_REQUIRE_EQUAL(error, 0); - - test_obj.sort_chain(); - - std::string result_pem = test_obj.emit_pem(); - - std::string result_pem_without_zero = result_pem.substr(0, result_pem.length() - 1); - - BOOST_REQUIRE((result_pem_without_zero == cert1 + cert2) || (result_pem_without_zero == cert2 + cert1)); -} - -BOOST_AUTO_TEST_CASE(test_parse_server_pem_tizen_org) -{ - x509_crt_rewriter test_obj; - - int error = test_obj.parse(tizen_org_pem, tizen_org_pem_size + 1); - BOOST_REQUIRE(error == 0); - - test_obj.sort_chain(); - - std::string output_cert = test_obj.emit_pem(); - - BOOST_CHECK_EQUAL(output_cert, std::string((const char *)tizen_org_pem, tizen_org_pem_size + 1)); -} - -static std::string serialize_cert_chain(const std::vector& vec) -{ - std::string buffer; - - size_t all_size = 0; - - for(auto cert : vec) { - all_size += cert->raw.len * 4 + sizeof(PEM_BEGIN_CRT) + sizeof(PEM_END_CRT); - } - - buffer.resize(all_size); - - unsigned char * out_buffer = (unsigned char *)buffer.c_str(); - size_t out_capacity = buffer.size(); - size_t total_size = 0; - size_t this_len; - - for(auto cert : vec) { - int error = mbedtls_pem_write_buffer(PEM_BEGIN_CRT, - PEM_END_CRT, - cert->raw.p, - cert->raw.len, - out_buffer + total_size, - out_capacity - total_size, - &this_len); - - if(error != 0) { - throw std::runtime_error("Certificate write failure"); - } - - // Account for final 0 byte - total_size += this_len - 1; - } - - buffer.resize(total_size); - buffer.push_back(0); - - return buffer; -} - -BOOST_AUTO_TEST_CASE(test_case_shuffle_certificates) -{ - mbedtls_x509_crt_wrapper chain; - - int parse_result = mbedtls_x509_crt_parse(&chain, tizen_org_pem, tizen_org_pem_size + 1); - BOOST_REQUIRE_EQUAL(parse_result, 0); - - std::vector certs; - - for(mbedtls_x509_crt * cert = &chain ; cert ; cert = cert->next) - certs.push_back(cert); - - std::sort(certs.begin(), certs.end()); - - std::string correct_pem(std::string((const char *)tizen_org_pem, tizen_org_pem_size + 1)); - - do { - std::string permuted_chain = serialize_cert_chain(certs); - - x509_crt_rewriter test_obj; - - int error = test_obj.parse((unsigned char *)permuted_chain.c_str(), permuted_chain.length()); - BOOST_REQUIRE(error == 0); - - test_obj.sort_chain(); - - std::string pem = test_obj.emit_pem(); - - BOOST_CHECK_EQUAL(pem, correct_pem); - } while(std::next_permutation(certs.begin(), certs.end())); -} - -BOOST_AUTO_TEST_CASE(test_case_incomplete_chain) -{ - mbedtls_x509_crt_wrapper chain; - - int parse_result = mbedtls_x509_crt_parse(&chain, tizen_org_pem, tizen_org_pem_size + 1); - BOOST_REQUIRE_EQUAL(parse_result, 0); - - std::vector certs; - - for(mbedtls_x509_crt * cert = &chain ; cert ; cert = cert->next) - certs.push_back(cert); - - // Remove one from chain - certs.erase(certs.begin() + 1); - - std::string correct_pem(std::string((const char *)tizen_org_pem, tizen_org_pem_size + 1)); - - std::string broken_chain = serialize_cert_chain(certs); - - x509_crt_rewriter test_obj; - - int error = test_obj.parse((unsigned char *)broken_chain.c_str(), broken_chain.length()); - BOOST_REQUIRE(error == 0); - - test_obj.sort_chain(); - - std::string pem = test_obj.emit_pem(); - - BOOST_CHECK_NE(pem, correct_pem); -} diff --git a/tests/test_data/cert.pem b/tests/test_data/cert.pem deleted file mode 100644 index cb20658..0000000 --- a/tests/test_data/cert.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC/DCCAeQCCQD0NJTBwmAEfzANBgkqhkiG9w0BAQsFADBAMQswCQYDVQQGEwJG -UjEMMAoGA1UECgwDZm9vMQwwCgYDVQQLDANCYXIxFTATBgNVBAMMDGV4YW1wbGUx -LmNvbTAeFw0xNzEyMTQxMDEwMTFaFw0xODEyMTQxMDEwMTFaMEAxCzAJBgNVBAYT -AkZSMQwwCgYDVQQKDANmb28xDDAKBgNVBAsMA0JhcjEVMBMGA1UEAwwMZXhhbXBs -ZTEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1DQ1DoZ2useB -jW8gDSRhmMsK9QLRHOmrQNNjnYFv8yC+Q9juzc5UBdXxb0+e6fb7O2NQC4oV5M4W -1aJ6iRsiQu/Z/UkLJFvO6+ftMTZ6CivZbO/5v43tt6grZeXQKiJNm9T4eUF1uEPx -fN8E4LGA/Tc0oPt7Om6MUsIQjOOUhMkCCfKnb9b10yK/i8Fwf0lFdIwQLZC/67e6 -dGKsQKUOzUizsPdPc8tYvL27n4CHGeAm88KqGi7+ayoKsLNNVo6c4xaKEOzFqNNf -Z9L8hAvwkKQNqe5WiqSbsX+/DUVP3h9ReneAJrCbA25FFpxtsyV5/Pqv5QbSNis8 -wzPGUaETjwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCUktsuWOe/mPY6eMfk7aHC -rMQwozyjqAY8zXrJWjTS8UTRal4fBwzsk6qOkPf5ftdNOOlIf8IABYFOEUrqAVRM -YBhgkocFjJ1Xp5NwlQP5BE3mcoE3+v/KzDnls6naFzcJORZMF9dsHy9fa5MQcBFm -mIHN89y6RcjMJi3DCENfYtfbmc7o/0tLj5GBBLuloHoXh99+Kf1M63w5YcBzYv9Y -mKrOuB/A3C6i7Q43m6ouxJq66Dwcd5rrWbEi2P7ei2magnqdH5zf8y7vSuBYlHn8 -J1Vuwy3vOFM5l0uOEwy1wuX/jKRWauFlYiVBsA2dpYNK/yItoIPBZR+nxyNOE4DE ------END CERTIFICATE----- diff --git a/tests/test_data/cert2.pem b/tests/test_data/cert2.pem deleted file mode 100644 index 54af3f5..0000000 --- a/tests/test_data/cert2.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC/DCCAeQCCQCzOfilAMPqATANBgkqhkiG9w0BAQsFADBAMQswCQYDVQQGEwJG -UjEMMAoGA1UECgwDZm9vMQwwCgYDVQQLDANCYXIxFTATBgNVBAMMDGV4YW1wbGUy -LmNvbTAeFw0xNzEyMTQxMDEwMTFaFw0xODEyMTQxMDEwMTFaMEAxCzAJBgNVBAYT -AkZSMQwwCgYDVQQKDANmb28xDDAKBgNVBAsMA0JhcjEVMBMGA1UEAwwMZXhhbXBs -ZTIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1DQ1DoZ2useB -jW8gDSRhmMsK9QLRHOmrQNNjnYFv8yC+Q9juzc5UBdXxb0+e6fb7O2NQC4oV5M4W -1aJ6iRsiQu/Z/UkLJFvO6+ftMTZ6CivZbO/5v43tt6grZeXQKiJNm9T4eUF1uEPx -fN8E4LGA/Tc0oPt7Om6MUsIQjOOUhMkCCfKnb9b10yK/i8Fwf0lFdIwQLZC/67e6 -dGKsQKUOzUizsPdPc8tYvL27n4CHGeAm88KqGi7+ayoKsLNNVo6c4xaKEOzFqNNf -Z9L8hAvwkKQNqe5WiqSbsX+/DUVP3h9ReneAJrCbA25FFpxtsyV5/Pqv5QbSNis8 -wzPGUaETjwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQC+YpsMfU7PnAW28KXjlEnk -m1Z7NJ+tan64Xmdr8kNZEFqfpO5xTQimgvThe/eRvWEt9oG9cdcLXkSOM3mDbRPa -TdF4GED8SZFTcoymibfZAIcslkW9//P0x4U6TMOHdYYmhvs+8G2hfR3r3ufjtONo -RfhypkfPAmdU3mQk/ibJXnZaBR+RHoFp6JaSna3l64CO3e8xjsHQZuNpm6RuBYIj -8bQTcmwLQ+ijOCLYG8GDH9VdOr8DIe1x1Cw8KmvE/g1EXQyhj35SyA3l5fY5AfkL -h07BpDZZsNJ5OFk9oQ+rOzoN8f18ZrbsSyuqfXacn+Aey3RdOPDCCrOCPgF8gI1t ------END CERTIFICATE----- diff --git a/tests/test_data/create_data.sh b/tests/test_data/create_data.sh deleted file mode 100755 index 1fcb242..0000000 --- a/tests/test_data/create_data.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -openssl genrsa -des3 -passout pass:x -out server.pass.key -openssl rsa -passin pass:x -in server.pass.key -out server.key -openssl req -new -key server.key -out server.csr -subj "/C=FR/O=foo/OU=Bar/CN=example1.com" -openssl x509 -req -days 365 -in server.csr -signkey server.key -out cert.pem -openssl req -new -key server.key -out server2.csr -subj "/C=FR/O=foo/OU=Bar/CN=example2.com" -openssl x509 -req -days 365 -in server2.csr -signkey server.key -out cert2.pem diff --git a/tests/test_data/server.csr b/tests/test_data/server.csr deleted file mode 100644 index b58b889..0000000 --- a/tests/test_data/server.csr +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIChTCCAW0CAQAwQDELMAkGA1UEBhMCRlIxDDAKBgNVBAoMA2ZvbzEMMAoGA1UE -CwwDQmFyMRUwEwYDVQQDDAxleGFtcGxlMS5jb20wggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQDUNDUOhna6x4GNbyANJGGYywr1AtEc6atA02OdgW/zIL5D -2O7NzlQF1fFvT57p9vs7Y1ALihXkzhbVonqJGyJC79n9SQskW87r5+0xNnoKK9ls -7/m/je23qCtl5dAqIk2b1Ph5QXW4Q/F83wTgsYD9NzSg+3s6boxSwhCM45SEyQIJ -8qdv1vXTIr+LwXB/SUV0jBAtkL/rt7p0YqxApQ7NSLOw909zy1i8vbufgIcZ4Cbz -wqoaLv5rKgqws01WjpzjFooQ7MWo019n0vyEC/CQpA2p7laKpJuxf78NRU/eH1F6 -d4AmsJsDbkUWnG2zJXn8+q/lBtI2KzzDM8ZRoROPAgMBAAGgADANBgkqhkiG9w0B -AQsFAAOCAQEAvlGH6Xq0/2DKpkqUaslehAnGIPAPMDufz1r5zlO7vsikiuURrcgx -kwXvUuOsgt6pdImtfqhhGgUeJw9HgJcHPsoQJob4AnpD2FjaJbffQHJmoOJeWtjg -vmaLDzHL0R7IMPLwuWXUB8h8Z0bayK2cQRpREGdFl7fA53ShbyVX+Bx4ul0q0uF9 -Ns5UHQPQd5rs8nuLryJ8l/SrHI+9zSBH/NMJ69suwkxoyUN6tW72ZbGE7XTIsJ1C -kpVt4FehB6a5V0WblROzH9NIruncPBON+C+MEasku8o9FFh2B4p6RNuR4ZuD8VIk -e7vmifHoo76/yay6Pa4KwoOL1vTxK7jvQw== ------END CERTIFICATE REQUEST----- diff --git a/tests/test_data/server.key b/tests/test_data/server.key deleted file mode 100644 index 56de1d1..0000000 --- a/tests/test_data/server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA1DQ1DoZ2useBjW8gDSRhmMsK9QLRHOmrQNNjnYFv8yC+Q9ju -zc5UBdXxb0+e6fb7O2NQC4oV5M4W1aJ6iRsiQu/Z/UkLJFvO6+ftMTZ6CivZbO/5 -v43tt6grZeXQKiJNm9T4eUF1uEPxfN8E4LGA/Tc0oPt7Om6MUsIQjOOUhMkCCfKn -b9b10yK/i8Fwf0lFdIwQLZC/67e6dGKsQKUOzUizsPdPc8tYvL27n4CHGeAm88Kq -Gi7+ayoKsLNNVo6c4xaKEOzFqNNfZ9L8hAvwkKQNqe5WiqSbsX+/DUVP3h9ReneA -JrCbA25FFpxtsyV5/Pqv5QbSNis8wzPGUaETjwIDAQABAoIBAQDHW+zkoor02u3p -dBcGgcF3DHpUyLqwkQ6krnQNy0bjgUV+9FUV4NurR921F3ZSlAhfOORAkxASj1OA -jU7VdDpx7Gg9vtvK4r25f4ClFWr+F0gDQki+H5bPThzHdGpmyydiWWi+cjMoVByR -lew9NEXcnnrBKsIQmT8XmN53nm8vdvk0lhiE8CMBvefHNZhnGNVceLdmj4eySNTF -ywDrDf+pvXQz90W2m9F7H8PIIAP/LWe9yAPrGIl/vEr+h2aNrI4n5RrvGivQizh8 -mw0/7mpgX5dp0quHa4Nm4CPfbA+DMY13QGI/Y03UEdS/gq7d07+57DEoCrSKa/Gq -t2aamq6RAoGBAPxJTpLPe+FgzRs8og1hDgFQhSKv24RLcfrIADj0FXGphGphk8Ix -Sq3hKbziPCBspnlPTzanTapojZ0Ov6+xfylyvcRzyCAcoUUKNYkIhqc/g8Q+Jq6W -Pr5QUTsfmvWHM+xrbSqtSFNb2L4PB4W1m9chjRtlGxuuemS2ec1dK1PlAoGBANdT -23vWR9ZlJFkfMXvc4726YBKseMbECUfVKndD80zHCqeFgod9ONPPDsgQVX1KXsvB -znnuLx6Sd0MegMvARe2UG4Xn9qxnt/UHW5lwlBqQAoaRrsUPNBmXnlE8yjtGaIka -qHfRtsrDXk68HEKJ0DJyRH7vnkqDIbrPD5G3CvpjAoGAYVu82cT+LoSXwnoMo5Mf -v3weVLt+wDgJPVkvVMtE9z8O3arYRamWAzIQVFcOEwk62Te0/wdjXm7Ir6KAcMHT -q+AewZBY26OQzL7a2A4VQLevFu1RKjDK99Cw+FsDBtttO0BduYlzjs+z/ex4362s -/UFyXe8PngggLXuJ16mrzc0CgYEAorqFDLmL4MLfDVs9klYE5sWLBZHCVLSiLt8y -EKARptxleOS1GJ/R6oB4s0lk0iL6MRJucEdI5Nnbt6W9wD22my1q/2+mQ/S+WTcO -So+B3fEnd3txkQtEXHLw+oPucY1sQvEakDK06ddr1iTjVoXACd/BVAzSm40uWHdT -VNP4P/ECgYEA78ANRGKUAfgq+plyx8PVxbjC3XwgcD0yx3MLpiDsZFGsfHiw0Ma4 -bKhesp16FV9r3I12poDgInVNk+yoJjSrJeEcRz7gTJnJLNTjYmYycwjlqtDS99L2 -iC2e0ljyUiX8liVxgSq9gXPJrD8vV2+MVyTL6BKOF5OIMeqRZ7PNMIE= ------END RSA PRIVATE KEY----- diff --git a/tests/test_data/server.pass.key b/tests/test_data/server.pass.key deleted file mode 100644 index 79dcb19..0000000 --- a/tests/test_data/server.pass.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,FEF8E8441D7B11E2 - -AhioldkpxwjW0fh4KtrLuQOmNONGeufvAbWD8RYUuHflWENgCj/GXuw4wIRL0K2x -aippkr0nvOLNpdsko/RcUS9D5CMO2AxNHoJqD1MppgJ3pygwrY6PbQXruRz1/H2R -lDq1ibqtSjllQxycs+0g4J93j9x6dMpkcw54/854H4zTF6NtPROVOWWrVwRAeFXR -V6tZXTPOM4+iRGv5Dx6gO+HAR05CDjqGBVq0QUOuKFUcceJuGYRLETM3JzvcRkl1 -Uk1mZgXmhkeU/B6ouMQm7jqkE1tjHdcW83odYW82JyBYu+TqAAfHTvxvcblJGUNE -+duUiuU7uFPyYaV03vjLznB1l4/eKcJr9ln9HSf2kVw5KgIeR5+SyBwH/58meYQW -8+pQYuvE8N97nlNVm8KgNUsTqXR+9EEWvvo3mbfOO5iziWM8fuJurja4QJIHRcNV -uHOCECH+qyeUZmrtIrTAvWNwlMjCbfMVkq/laa0vp87T6yEvOpF5H+JMxIhensLj -LcfsIqIqg0M/wp/YJX9KRE5wdyQIH+PdrLH6pHbBRergmvsgAUdAqua+ODma0Va1 -xGdMdU0E3l+EF/Z5oNfwmYSp+JW9lpfAcjunwsY+DNSJ8USBw9EJXP9sDkkSskN1 -JS2iG0ynLtwyPe2lFgRraHAI6BXARfCIv+WX0INqivk0g6CrInnNxmQYIldJAKik -B0sqV0TYN2O9DaCszPcEM48m0qp2sxyP7ar9WS5fY5F2X7W2XB1+tVSgqdXboYEh -Gq38vDJRWmD6hTyNarYV9ENXspaNdOrPXm1evIAXUwL33xLe85JvugrrA4o8Fxfw -i5pQJ4UkEAYFoEhDyl9rj3JjK23G55eYIpBjpR8PUfeMji4HYVEG4mMtDr0YWHCH -Ey+1YaRDc4BnJnj2Hus0phpfPnn4fc90Y2Y2JocDDcPu+geaWn67WQm/urk4REHM -snwbuqJPTy2xMcdq5qSjd634MbxF++nqhc1DZFvTTujnw8JB8GDdpdRCfjr7JYr3 -n5HHpaRFLCQU1v4eURxNdfyLrHueHs5yS/I/ivV/Q/c+rnVSWrKyBgCC8xQlmuIX -R8yjv+xDvBOOJdSwXYj/OIpW97RG5pf2SS90tthfen4jQ5tsCX6MMXersN2av3h1 -AhzmJSgli/gHkrsDEh/vUnFASTbmDVCeufpSKG2DdnQw0gQOC6I/GlyvaKJi/ZTy -2TAOnegMbphnhkx7izP/hhGxrJmjQhU+H+OWKPA8jj25fonkwF4MiLuh8LeRQsnw -0fvdVTMRfN7xaQmLD7haAshw2SHE/ZPde+2AqiO6TA2RaT6ekU9IJKyuK4FLpb1X -zwy0TQsq6h1rmU3RZ7CME/0ay6c83XhntDys+aqkSx0IyDmXnYaMWm2kxNurqYDo -oV+MEbcQJ7WSdhOikeC4auWk8j3p+XZzvI4pbrRAlRKY5D3jL+HH7K7J9+XC9HEL -vIJWlYQaHhBsjozPE/KXp4iO5n9jm8WesGX5LZuQ5vBCV3Z6VNR3dqIPDyGz+Gd3 -i4UkeZQSbuuWFL98Wp/cxdgU1/5UdbTum6Gc+Lnbnvjhg+8SAlj4GuSRBV4AsjZC ------END RSA PRIVATE KEY----- diff --git a/tests/test_data/server2.csr b/tests/test_data/server2.csr deleted file mode 100644 index 1ad8626..0000000 --- a/tests/test_data/server2.csr +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIChTCCAW0CAQAwQDELMAkGA1UEBhMCRlIxDDAKBgNVBAoMA2ZvbzEMMAoGA1UE -CwwDQmFyMRUwEwYDVQQDDAxleGFtcGxlMi5jb20wggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQDUNDUOhna6x4GNbyANJGGYywr1AtEc6atA02OdgW/zIL5D -2O7NzlQF1fFvT57p9vs7Y1ALihXkzhbVonqJGyJC79n9SQskW87r5+0xNnoKK9ls -7/m/je23qCtl5dAqIk2b1Ph5QXW4Q/F83wTgsYD9NzSg+3s6boxSwhCM45SEyQIJ -8qdv1vXTIr+LwXB/SUV0jBAtkL/rt7p0YqxApQ7NSLOw909zy1i8vbufgIcZ4Cbz -wqoaLv5rKgqws01WjpzjFooQ7MWo019n0vyEC/CQpA2p7laKpJuxf78NRU/eH1F6 -d4AmsJsDbkUWnG2zJXn8+q/lBtI2KzzDM8ZRoROPAgMBAAGgADANBgkqhkiG9w0B -AQsFAAOCAQEAGARVyLpEtRh8h+JKF1UMqSgNl63p/eC7i0MOhA4N+sap4Bs54X23 -VVRHysVGTY3eLEh5qFaMs0k2zYCl/YYZ8LAY8OLIcvVWbOzX9AIFuCBTsxV+Bbu1 -kY+aqRJiiemGHDIqfPgL4C1FIOY9RtZ/Pe9H2Z5lFL/i5JP2H6kP2jCGTDUPqcsC -DcCKouVF88tWLl7Vl8Ix39b79lETDyyku4CPXsT9GVfXLQRTdt/T80xp98VR4Fqy -xP7bH1UxOvrvm8SF3C7RQc1f1So3/N9DDrOo5MqPs3RpzY6yVrv9mh6hu0MgPz73 -Lr7NKH6bQ3xG3SgMWswc8ag71lCmFFBtFQ== ------END CERTIFICATE REQUEST----- diff --git a/tests/test_data/tizen.org.pem b/tests/test_data/tizen.org.pem deleted file mode 100644 index 9ff89a2..0000000 --- a/tests/test_data/tizen.org.pem +++ /dev/null @@ -1,103 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIESjCCAzKgAwIBAgIQB05X0Drmfzqaz/KXYK8KozANBgkqhkiG9w0BAQsFADBG -MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRUwEwYDVQQLEwxTZXJ2ZXIg -Q0EgMUIxDzANBgNVBAMTBkFtYXpvbjAeFw0xNzA1MTgwMDAwMDBaFw0xODA2MTgx -MjAwMDBaMBYxFDASBgNVBAMMCyoudGl6ZW4ub3JnMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEArgawWTsdalcH6TC7U/lWYagGsBxHYSyplt5qRKB8g6ac -86P7MlMXrg8SDOcwdj5EUoaFmOIABhBamXtyM5CRtRJ68XqAiFCfKbx2wTN9XtI6 -AhknlOHvRa4ZWkXpyL87Uye6YNMqx868GDlVXF1He4ijk+foJi+/u29dfxIlFkpd -JXUu104AqaVCCMnszsAcm0baLBc1sUzO0+XSq/RKwiPSh7RFkGUOC7jwhLffMhwj -FoFMIQXOYaJZMrbczkWR7M0vuopQUjTY+Te7a3wvxD4+ttceoTfoiJwyqG8bJmnH -u3I3iM2KJAnPZP12LW0fdMMP4DFJ2yIHFkQrj84IcwIDAQABo4IBYjCCAV4wHwYD -VR0jBBgwFoAUWaRmBlKge5WSPKOUByeWdFv5PdAwHQYDVR0OBBYEFF6fs6+80KAV -OI3Zg87EBRvRbYmPMBYGA1UdEQQPMA2CCyoudGl6ZW4ub3JnMA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwOwYDVR0fBDQwMjAw -oC6gLIYqaHR0cDovL2NybC5zY2ExYi5hbWF6b250cnVzdC5jb20vc2NhMWIuY3Js -MBMGA1UdIAQMMAowCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAtBggrBgEFBQcw -AYYhaHR0cDovL29jc3Auc2NhMWIuYW1hem9udHJ1c3QuY29tMDYGCCsGAQUFBzAC -hipodHRwOi8vY3J0LnNjYTFiLmFtYXpvbnRydXN0LmNvbS9zY2ExYi5jcnQwDAYD -VR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAPKDqqxsCFFKFA1aqTwo09sOJ -rMt0Ohq3TbX/zivY7f+HjLGbA4FsIOh3hkP8TfwKyaDeg3cGTH+gKDWYU9m40f0N -L+V632ieNXbVwL+9OkSMhurOvlzg4uQ3uYI2xGlmVrUT2iZFuJ5bhRQOGwjuU0qw -zDg5lRhuHnqoG8XN440t0S6QsCfj4QyrL7qqsC8U/fXWEyGSoU6q6gbzyuIBob5p -TCLujK3R/rIRrjX3doz0/WITpMcuiBCPBZv6tNdcN40GRoN03CVI66ujCDYGh6lY -h67OqAWbvUsa0/WmGZts0DD3//lD/2qs8v+6MJ6nQKd5XoCvmsbN+UYo5Xr4Fg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIESTCCAzGgAwIBAgITBn+UV4WH6Kx33rJTMlu8mYtWDTANBgkqhkiG9w0BAQsF -ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6 -b24gUm9vdCBDQSAxMB4XDTE1MTAyMjAwMDAwMFoXDTI1MTAxOTAwMDAwMFowRjEL -MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEVMBMGA1UECxMMU2VydmVyIENB -IDFCMQ8wDQYDVQQDEwZBbWF6b24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDCThZn3c68asg3Wuw6MLAd5tES6BIoSMzoKcG5blPVo+sDORrMd4f2AbnZ -cMzPa43j4wNxhplty6aUKk4T1qe9BOwKFjwK6zmxxLVYo7bHViXsPlJ6qOMpFge5 -blDP+18x+B26A0piiQOuPkfyDyeR4xQghfj66Yo19V+emU3nazfvpFA+ROz6WoVm -B5x+F2pV8xeKNR7u6azDdU5YVX1TawprmxRC1+WsAYmz6qP+z8ArDITC2FMVy2fw -0IjKOtEXc/VfmtTFch5+AfGYMGMqqvJ6LcXiAhqG5TI+Dr0RtM88k+8XUBCeQ8IG -KuANaL7TiItKZYxK1MMuTJtV9IblAgMBAAGjggE7MIIBNzASBgNVHRMBAf8ECDAG -AQH/AgEAMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUWaRmBlKge5WSPKOUByeW -dFv5PdAwHwYDVR0jBBgwFoAUhBjMhTTsvAyUlC4IWZzHshBOCggwewYIKwYBBQUH -AQEEbzBtMC8GCCsGAQUFBzABhiNodHRwOi8vb2NzcC5yb290Y2ExLmFtYXpvbnRy -dXN0LmNvbTA6BggrBgEFBQcwAoYuaHR0cDovL2NydC5yb290Y2ExLmFtYXpvbnRy -dXN0LmNvbS9yb290Y2ExLmNlcjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3Js -LnJvb3RjYTEuYW1hem9udHJ1c3QuY29tL3Jvb3RjYTEuY3JsMBMGA1UdIAQMMAow -CAYGZ4EMAQIBMA0GCSqGSIb3DQEBCwUAA4IBAQCFkr41u3nPo4FCHOTjY3NTOVI1 -59Gt/a6ZiqyJEi+752+a1U5y6iAwYfmXss2lJwJFqMp2PphKg5625kXg8kP2CN5t -6G7bMQcT8C8xDZNtYTd7WPD8UZiRKAJPBXa30/AbwuZe0GaFEQ8ugcYQgSn+IGBI -8/LwhBNTZTUVEWuCUUBVV18YtbAiPq3yXqMB48Oz+ctBWuZSkbvkNodPLamkB2g1 -upRyzQ7qDn1X8nn8N8V7YJ6y68AtkHcNSRAnpTitxBKjtKPISLMVCx7i4hncxHZS -yLyKQXhw2W2Xs0qLeC1etA+jTGDK4UfLeC0SF7FSi8o5LL21L8IzApar2pR/ ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF -ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj -b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x -OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1 -dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL -MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv -b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj -ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM -9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw -IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6 -VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L -93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm -jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ -BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW -gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH -MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH -MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy -MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0 -LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF -AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW -MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma -eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK -bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN -0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U -akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEdTCCA12gAwIBAgIJAKcOSkw0grd/MA0GCSqGSIb3DQEBCwUAMGgxCzAJBgNV -BAYTAlVTMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTIw -MAYDVQQLEylTdGFyZmllbGQgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 -eTAeFw0wOTA5MDIwMDAwMDBaFw0zNDA2MjgxNzM5MTZaMIGYMQswCQYDVQQGEwJV -UzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UE -ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE7MDkGA1UEAxMyU3RhcmZp -ZWxkIFNlcnZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVDDrEKvlO4vW+GZdfjohTsR8/ -y8+fIBNtKTrID30892t2OGPZNmCom15cAICyL1l/9of5JUOG52kbUpqQ4XHj2C0N -Tm/2yEnZtvMaVq4rtnQU68/7JuMauh2WLmo7WJSJR1b/JaCTcFOD2oR0FMNnngRo -Ot+OQFodSk7PQ5E751bWAHDLUu57fa4657wx+UX2wmDPE1kCK4DMNEffud6QZW0C -zyyRpqbn3oUYSXxmTqM6bam17jQuug0DuDPfR+uxa40l2ZvOgdFFRjKWcIfeAg5J -Q4W2bHO7ZOphQazJ1FTfhy/HIrImzJ9ZVGif/L4qL8RVHHVAYBeFAlU5i38FAgMB -AAGjgfAwge0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0O -BBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMB8GA1UdIwQYMBaAFL9ft9HO3R+G9FtV -rNzXEMIOqYjnME8GCCsGAQUFBwEBBEMwQTAcBggrBgEFBQcwAYYQaHR0cDovL28u -c3MyLnVzLzAhBggrBgEFBQcwAoYVaHR0cDovL3guc3MyLnVzL3guY2VyMCYGA1Ud -HwQfMB0wG6AZoBeGFWh0dHA6Ly9zLnNzMi51cy9yLmNybDARBgNVHSAECjAIMAYG -BFUdIAAwDQYJKoZIhvcNAQELBQADggEBACMd44pXyn3pF3lM8R5V/cxTbj5HD9/G -VfKyBDbtgB9TxF00KGu+x1X8Z+rLP3+QsjPNG1gQggL4+C/1E2DUBc7xgQjB3ad1 -l08YuW3e95ORCLp+QCztweq7dp4zBncdDQh/U90bZKuCJ/Fp1U1ervShw3WnWEQt -8jxwmKy6abaVd38PMV4s/KCHOkdp8Hlf9BRUpJVeEXgSYCfOn8J3/yNTd126/+pZ -59vPr5KW7ySaNRB6nJHGDn2Z9j8Z3/VyVOEVqQdZe4O/Ui5GjLIAZHYcSNPYeehu -VsyuLAOQ1xk4meTKCRlb/weWsKh/NEnfVqn3sF/tM+2MR7cwA130A4w= ------END CERTIFICATE----- diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt deleted file mode 100644 index 37f3bad..0000000 --- a/tools/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_executable(helper_bin2c - bin2c.c) diff --git a/tools/bin2c.c b/tools/bin2c.c deleted file mode 100644 index d99764a..0000000 --- a/tools/bin2c.c +++ /dev/null @@ -1,84 +0,0 @@ -/****************************************************************** - * - * Copyright 2017 - 2018 Samsung Electronics All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************/ - -#include -#include - -int main(int argc, char** argv) -{ - int ret = 0; - size_t size; - char *buffer = NULL; - - if(argc != 4) - return -1; - - FILE *infile = fopen(argv[1], "rb"); - FILE *outfile = fopen(argv[2], "wb"); - if(!infile || !outfile) { - perror("fopen() failed"); - ret = -1; - goto exit; - } - - if(fseek(infile, 0L, SEEK_END) < 0) { - perror("fseek() failed"); - ret = -1; - goto exit; - } - if((size = ftell(infile)) <= 0) { - perror("ftell() failed"); - ret = -1; - goto exit; - } - if(fseek(infile, 0L, SEEK_SET) < 0) { - perror("fseek() failed"); - ret = -1; - goto exit; - } - - buffer = (char *)malloc(size); - if(!buffer) { - perror("malloc() failed"); - ret = -1; - goto exit; - } - - if(fread(buffer, 1, size, infile) <= 0) { - perror("fread() failed"); - ret = -1; - goto exit; - } - - fprintf(outfile, "#include \nsize_t %s_size = %zd;\nunsigned char %s[]= {\n", - argv[3], size, argv[3]); - - for(size_t i = 0 ; i < size ; ++i) { - if(!(i % 64)) { - fprintf(outfile, "\n"); - } - fprintf(outfile, "0x%02X,", (unsigned char)buffer[i]); - } - fprintf(outfile, "0\n};\n"); - -exit: - if(infile) fclose(infile); - if(outfile) fclose(outfile); - free(buffer); - return ret; -} -- 2.7.4