Minor fixes and tests for BinaryToHex()

lib/base/tlsutility.cpp

@@ -494,7 +494,7 @@
 
 	InitializeOpenSSL();
 
 	RSA *rsa = RSA_new();
 	BIGNUM *e = BN_new();
 
 	if (!rsa || !e) {
@@ -508,7 +508,7 @@
 
 	BN_set_word(e, RSA_F4);
 
 	if (!RSA_generate_key_ex(rsa, 4096, e, nullptr)) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error while creating RSA key: " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -534,7 +534,7 @@
 			<< boost::errinfo_file_name(keyfile));
 	}
 
 	if (!PEM_write_bio_RSAPrivateKey(bio, rsa, nullptr, nullptr, 0, nullptr, nullptr)) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error while writing private RSA key to file '" << keyfile << "': " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -675,7 +675,7 @@
 	SHA_CTX context;
 	unsigned char digest[SHA_DIGEST_LENGTH];
 
 	if (!SHA1_Init(&context)) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error on SHA1 Init: " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -684,7 +684,7 @@
 			<< errinfo_openssl_error(ERR_peek_error()));
 	}
 
 	if (!SHA1_Update(&context, (unsigned char*)id.CStr(), id.GetLength())) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error on SHA1 Update: " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -693,7 +693,7 @@
 			<< errinfo_openssl_error(ERR_peek_error()));
 	}
 
 	if (!SHA1_Final(digest, &context)) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error on SHA1 Final: " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -765,7 +765,7 @@
 		return std::shared_ptr<X509>();
 	}
 
 	rsa = PEM_read_bio_RSAPrivateKey(cakeybio, nullptr, nullptr, nullptr);
 
 	if (!rsa) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
@@ -937,7 +937,7 @@
 	SHA_CTX context;
 	unsigned char digest[SHA_DIGEST_LENGTH];
 
 	if (!SHA1_Init(&context)) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error on SHA Init: " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -946,7 +946,7 @@
 			<< errinfo_openssl_error(ERR_peek_error()));
 	}
 
 	if (!SHA1_Update(&context, (unsigned char*)s.CStr(), s.GetLength())) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error on SHA Update: " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -955,7 +955,7 @@
 			<< errinfo_openssl_error(ERR_peek_error()));
 	}
 
 	if (!SHA1_Final(digest, &context)) {
 		ERR_error_string_n(ERR_peek_error(), errbuf, sizeof errbuf);
 		Log(LogCritical, "SSL")
 			<< "Error on SHA Final: " << ERR_peek_error() << ", \"" << errbuf << "\"";
@@ -1049,7 +1049,7 @@
 	static const char hexdigits[] = "0123456789abcdef";
 
 	String output(2*length, 0);
-	for (int i = 0; i < SHA_DIGEST_LENGTH; i++) {
+	for (size_t i = 0; i < length; i++) {
 		output[2 * i] = hexdigits[data[i] >> 4];
 		output[2 * i + 1] = hexdigits[data[i] & 0xf];
 	}

test/base-tlsutility.cpp

@@ -309,4 +309,26 @@ BOOST_FIXTURE_TEST_CASE(create_verify_leaf_certs, CertificateFixture,
 	ASSERT_SIGNATURE_FAILURE(cacert, StringToCertificate(CertificateToString(newCert)));
 }
 
+BOOST_AUTO_TEST_CASE(binary_to_hex)
+{
+	using namespace std::string_view_literals;
+
+	// Helper to call with string_view and to cast from char to unsigned char.
+	auto f = [](std::string_view s) {
+		return BinaryToHex(reinterpret_cast<const unsigned char*>(s.data()), s.length());
+	};
+
+	// Hint: test data can be generated/verified with commands like this: printf ICINGA | xxd -p -c 0
+	BOOST_CHECK_EQUAL(f(""sv), "");
+	BOOST_CHECK_EQUAL(f("ICINGA"sv), "4943494e4741");
+	BOOST_CHECK_EQUAL(f("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"sv),
+		"6162636465666768696a6b6c6d6e6f707172737475767778797a4142434445464748494a4b4c4d4e4f505152535455565758595a");
+	BOOST_CHECK_EQUAL(f("handles\0correctly"sv), "68616e646c657300636f72726563746c79");
+	BOOST_CHECK_EQUAL(f("\0\0\0\0\0"sv), "0000000000");
+
+	// Long string of 10000 * 'D' (= 0x44) should become 10000 * '44' = 20000 * '4':
+	BOOST_CHECK_EQUAL(f(std::string(10000, 0x44)), std::string(20000, '4'));
+
+}
+
 BOOST_AUTO_TEST_SUITE_END()