Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic support for numeric keys #456

Merged
merged 11 commits into from
Jan 11, 2024
+1,457 −803
Merged

Basic support for numeric keys #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6f61edf
Add PDO_VERBOSE_BUILD flag to cmake project variables
cmickeyb Dec 18, 2023
66c79bf
Small improvement to the internal logging function
cmickeyb Dec 21, 2023
b78ea58
Implement a method for creating an ECDSA key from a byte array
cmickeyb Nov 13, 2023
be5f10e
Move all crypto memory typedefs into shared header file
cmickeyb Dec 19, 2023
22a681e
General cleanup of error handling and organization of signature classes
cmickeyb Dec 19, 2023
976cb1c
Add the rest of the numeric key functions for signature keys
cmickeyb Dec 22, 2023
485ad23
Update the crypto tests for all of the changes to signature classes
cmickeyb Dec 22, 2023
8466d3a
Update common/crypto/sig_private_key.cpp
cmickeyb Dec 29, 2023
b45c7b8
Update common/crypto/sig_private_key.cpp
cmickeyb Dec 29, 2023
7dd35f5
Update for PR feedback
cmickeyb Dec 29, 2023
7e5d646
Remove an extra log message
cmickeyb Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion build/cmake/ProjectVariables.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
################################################################################

# These options apply to all PDO projects
ADD_COMPILE_OPTIONS(-m64 -fvisibility=hidden -fpie -fPIC -fstack-protector -Wall)
ADD_COMPILE_OPTIONS(-m64 -fvisibility=hidden -fpie -fPIC -fstack-protector)
ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)

OPTION(PDO_DEBUG_BUILD "Build with debugging turned on" FALSE)
Expand All @@ -35,3 +35,23 @@ ELSE()
ADD_COMPILE_DEFINITIONS(PDO_DEBUG_BUILD=0)
MESSAGE(STATUS "Compiling with optimizations (-O2). To use debug flags, set the DEBUG environment variable.")
ENDIF()

# The verbose build flag allows warning messages
# to be turned off. This removes a lot of the verbosity
# of the OpenSSL/SGXSSL deprecation warnings. In general
# we do not want to ignore those messages to verbose is
# set to true by default.
OPTION(PDO_VERBOSE_BUILD "Build with all warnings turned on" TRUE)

IF (DEFINED ENV{PDO_VERBOSE_BUILD})
SET(PDO_VERBOSE_BUILD $ENV{PDO_VERBOSE_BUILD})
ENDIF()

IF (${PDO_VERBOSE_BUILD})
ADD_COMPILE_OPTIONS(-Wall)
ELSE()
# this should not be necessary (no -Wall), but make
# sure we don't pick up the OpenSSL/SGXSSL deprecation warnings
ADD_COMPILE_OPTIONS(-Wno-deprecated)
ADD_COMPILE_OPTIONS(-Wno-deprecated-declarations)
ENDIF()
24 changes: 24 additions & 0 deletions common/crypto/crypto_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
*/

#pragma once

#include <memory>
#include <openssl/bio.h>
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/ec.h>
#include <openssl/rsa.h>

namespace pdo
{
namespace crypto
Expand All @@ -23,5 +31,21 @@ namespace crypto
// OpenSSL Error string buffer size
const int ERR_BUF_LEN = 130;
}

// Typedefs for memory management
// Specify type and destroy function type for unique_ptrs
typedef std::unique_ptr<BIGNUM, void (*)(BIGNUM*)> BIGNUM_ptr;
typedef std::unique_ptr<BN_CTX, void (*)(BN_CTX*)> BN_CTX_ptr;

typedef std::unique_ptr<BIO, void (*)(BIO*)> BIO_ptr;

typedef std::unique_ptr<EVP_CIPHER_CTX, void (*)(EVP_CIPHER_CTX*)> CTX_ptr;

typedef std::unique_ptr<EC_GROUP, void (*)(EC_GROUP*)> EC_GROUP_ptr;
typedef std::unique_ptr<EC_KEY, void (*)(EC_KEY*)> EC_KEY_ptr;
typedef std::unique_ptr<EC_POINT, void (*)(EC_POINT*)> EC_POINT_ptr;
typedef std::unique_ptr<ECDSA_SIG, void (*)(ECDSA_SIG*)> ECDSA_SIG_ptr;

typedef std::unique_ptr<RSA, void (*)(RSA*)> RSA_ptr;
}
}
18 changes: 5 additions & 13 deletions common/crypto/pkenc_private_key.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@
namespace pcrypto = pdo::crypto;
namespace constants = pdo::crypto::constants;

// Typedefs for memory management
// Specify type and destroy function type for unique_ptrs
typedef std::unique_ptr<BIO, void (*)(BIO*)> BIO_ptr;
typedef std::unique_ptr<EVP_CIPHER_CTX, void (*)(EVP_CIPHER_CTX*)> CTX_ptr;
typedef std::unique_ptr<BN_CTX, void (*)(BN_CTX*)> BN_CTX_ptr;
typedef std::unique_ptr<BIGNUM, void (*)(BIGNUM*)> BIGNUM_ptr;
typedef std::unique_ptr<RSA, void (*)(RSA*)> RSA_ptr;

// Error handling
namespace Error = pdo::error;

Expand All @@ -54,7 +46,7 @@ namespace Error = pdo::error;
// throws RuntimeError, ValueError
RSA* deserializeRSAPrivateKey(const std::string& encoded)
{
BIO_ptr bio(BIO_new_mem_buf(encoded.c_str(), -1), BIO_free_all);
pdo::crypto::BIO_ptr bio(BIO_new_mem_buf(encoded.c_str(), -1), BIO_free_all);
if (!bio)
{
std::string msg("Crypto Error (deserializeRSAPrivateKey): Could not create BIO");
Expand Down Expand Up @@ -151,9 +143,9 @@ void pcrypto::pkenc::PrivateKey::Generate()
{
if (private_key_)
RSA_free(private_key_);

unsigned long e = RSA_F4;
BIGNUM_ptr exp(BN_new(), BN_free);
pdo::crypto::BIGNUM_ptr exp(BN_new(), BN_free);
private_key_ = nullptr;

if (!exp)
Expand All @@ -170,7 +162,7 @@ void pcrypto::pkenc::PrivateKey::Generate()
throw Error::RuntimeError(msg);
}

RSA_ptr private_key(RSA_new(), RSA_free);
pdo::crypto::RSA_ptr private_key(RSA_new(), RSA_free);
if (!private_key)
{
std::string msg("Crypto Error (pkenc::PrivateKey()): Could not create new RSA key");
Expand Down Expand Up @@ -199,7 +191,7 @@ std::string pcrypto::pkenc::PrivateKey::Serialize() const
std::string msg("Crypto Error (Serialize): PrivateKey is not initialized");
throw Error::RuntimeError(msg);
}
BIO_ptr bio(BIO_new(BIO_s_mem()), BIO_free_all);
pdo::crypto::BIO_ptr bio(BIO_new(BIO_s_mem()), BIO_free_all);
if (!bio)
{
std::string msg("Crypto Error (Serialize): Could not create BIO\n");
Expand Down
12 changes: 2 additions & 10 deletions common/crypto/pkenc_public_key.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@
namespace pcrypto = pdo::crypto;
namespace constants = pdo::crypto::constants;

// Typedefs for memory management
// Specify type and destroy function type for unique_ptrs
typedef std::unique_ptr<BIO, void (*)(BIO*)> BIO_ptr;
typedef std::unique_ptr<EVP_CIPHER_CTX, void (*)(EVP_CIPHER_CTX*)> CTX_ptr;
typedef std::unique_ptr<BN_CTX, void (*)(BN_CTX*)> BN_CTX_ptr;
typedef std::unique_ptr<BIGNUM, void (*)(BIGNUM*)> BIGNUM_ptr;
typedef std::unique_ptr<RSA, void (*)(RSA*)> RSA_ptr;

// Error handling
namespace Error = pdo::error;

Expand All @@ -54,7 +46,7 @@ namespace Error = pdo::error;
// throws RuntimeError, ValueError
RSA* deserializeRSAPublicKey(const std::string& encoded)
{
BIO_ptr bio(BIO_new_mem_buf(encoded.c_str(), -1), BIO_free_all);
pdo::crypto::BIO_ptr bio(BIO_new_mem_buf(encoded.c_str(), -1), BIO_free_all);
if (!bio)
{
std::string msg("Crypto Error (deserializeRSAPublicKey): Could not create BIO");
Expand Down Expand Up @@ -174,7 +166,7 @@ std::string pcrypto::pkenc::PublicKey::Serialize() const
throw Error::RuntimeError(msg);
}

BIO_ptr bio(BIO_new(BIO_s_mem()), BIO_free_all);
pdo::crypto::BIO_ptr bio(BIO_new(BIO_s_mem()), BIO_free_all);
if (!bio)
{
std::string msg("Crypto Error (Serialize): Could not create BIO");
Expand Down
15 changes: 5 additions & 10 deletions common/crypto/sig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,13 @@ unsigned int pcsig::Key::MaxSigSize() const
void pcsig::Key::SetSigDetailsFromDeserializedKey()
{
int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(key_));
if(nid == NID_undef)
{
std::string msg("Crypto Error (sig::PrivateKey(const std::string& encoded): undefined nid");
throw Error::RuntimeError(msg);
}
Error::ThrowIf<Error::RuntimeError>(
nid == NID_undef, "Crypto Error (sig::PrivateKey(const std::string& encoded): undefined nid");

auto mSigCurve = NidToSigCurveMap.find(nid);
if(mSigCurve == NidToSigCurveMap.end())
{
std::string msg("Crypto Error (sig::PrivateKey(const std::string& encoded):unsupported nid: " + nid);
throw Error::RuntimeError(msg);
}
Error::ThrowIf<Error::RuntimeError>(
mSigCurve == NidToSigCurveMap.end(),
"Crypto Error (sig::PrivateKey(const std::string& encoded):unsupported nid: " + nid);

sigDetails_ = pcsig::SigDetails[static_cast<int>(mSigCurve->second)];
}
6 changes: 6 additions & 0 deletions common/crypto/sig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@

#include "types.h"

// Generally, this should be set in the makefile and provides
// the default curve when no curve is explicitly set
#ifndef PDO_DEFAULT_SIGCURVE
#define PDO_DEFAULT_SIGCURVE SECP384R1
g2flyer marked this conversation as resolved.
Show resolved Hide resolved
#endif

namespace pdo
{
namespace crypto
Expand Down
Loading
Loading