From 33b53c7f5cef4cf19770a38baa4b627f234322cf Mon Sep 17 00:00:00 2001 From: Giovanni Conte Date: Wed, 16 Jan 2019 12:09:43 +0100 Subject: removed longbow dependency Change-Id: I0c224b26261c7b24699410fc5e41ed6f3fab9815 Signed-off-by: Giovanni Conte --- libparc/parc/security/parc_X509Certificate.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'libparc/parc/security/parc_X509Certificate.c') diff --git a/libparc/parc/security/parc_X509Certificate.c b/libparc/parc/security/parc_X509Certificate.c index 67ee6b2b..497cff99 100644 --- a/libparc/parc/security/parc_X509Certificate.c +++ b/libparc/parc/security/parc_X509Certificate.c @@ -79,7 +79,7 @@ _getPublicKeyDigest(void *interfaceContext) { parcSecurity_AssertIsInitialized(); - assertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); + parcAssertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); PARCX509Certificate *certificate = (PARCX509Certificate *) interfaceContext; @@ -103,7 +103,7 @@ _getCertificateDigest(void *interfaceContext) { parcSecurity_AssertIsInitialized(); - assertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); + parcAssertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); PARCX509Certificate *certificate = (PARCX509Certificate *) interfaceContext; @@ -126,7 +126,7 @@ _getDEREncodedCertificate(void *interfaceContext) { parcSecurity_AssertIsInitialized(); - assertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); + parcAssertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); PARCX509Certificate *certificate = (PARCX509Certificate *) interfaceContext; @@ -150,7 +150,7 @@ _getDEREncodedPublicKey(void *interfaceContext) { parcSecurity_AssertIsInitialized(); - assertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); + parcAssertNotNull(interfaceContext, "Parameter must be non-null PARCX509Certificate"); PARCX509Certificate *certificate = (PARCX509Certificate *) interfaceContext; @@ -222,7 +222,7 @@ _createEmptyCertificate() cert->certificateDigest = NULL; cert->derEncodedCertificate = NULL; cert->derEncodedKey = NULL; - assertNotNull(cert, "Failure allocating memory for a new PARCX509Certificate instance"); + parcAssertNotNull(cert, "Failure allocating memory for a new PARCX509Certificate instance"); return cert; } @@ -288,7 +288,7 @@ _addSubjectName(X509 *cert, const char *subjectname) { // Set up the simple subject name and issuer name for the certificate. X509_NAME *name = X509_get_subject_name(cert); - assertNotNull(name, "Got null name from X509_get_subject_name"); + parcAssertNotNull(name, "Got null name from X509_get_subject_name"); if (X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char *) subjectname, -1, -1, 0)) { if (X509_set_issuer_name(cert, name)) { @@ -353,7 +353,7 @@ _parcX509Certificate_CreateFromPEMFile(const char *filename) cert->certificateBIO = BIO_new(BIO_s_file()); size_t result = BIO_read_filename(cert->certificateBIO, filename); - assertTrue(result == 1, "Unable to open the specified file"); + parcAssertTrue(result == 1, "Unable to open the specified file"); cert->certificate = PEM_read_bio_X509(cert->certificateBIO, NULL, 0, NULL); cert->publicKey = X509_get_pubkey(cert->certificate); @@ -404,13 +404,13 @@ PARCX509Certificate * _createSelfSignedCertificate_RSA(PARCBuffer **privateKeyBu parcSecurity_AssertIsInitialized(); RSA *rsa = RSA_new(); - assertNotNull(rsa, "RSA_new failed."); + parcAssertNotNull(rsa, "RSA_new failed."); EVP_PKEY *privateKey = EVP_PKEY_new(); - assertNotNull(privateKey, "EVP_PKEY_new() failed."); + parcAssertNotNull(privateKey, "EVP_PKEY_new() failed."); X509 *cert = X509_new(); - assertNotNull(cert, "X509_new() failed."); + parcAssertNotNull(cert, "X509_new() failed."); int res; BIGNUM *pub_exp; @@ -518,15 +518,15 @@ PARCX509Certificate * _createSelfSignedCertificate_EC(PARCBuffer **privateKeyBuf return NULL; EC_KEY *ec_key = EC_KEY_new_by_curve_name(curve_params); - assertNotNull(ec_key, "EC key creation failed."); + parcAssertNotNull(ec_key, "EC key creation failed."); EC_KEY_set_asn1_flag(ec_key, OPENSSL_EC_NAMED_CURVE); EVP_PKEY *pkey = EVP_PKEY_new(); - assertNotNull(pkey, "EVP_PKEY_new() failed."); + parcAssertNotNull(pkey, "EVP_PKEY_new() failed."); X509 *cert = X509_new(); - assertNotNull(cert, "X509_new() failed."); + parcAssertNotNull(cert, "X509_new() failed."); int res; -- cgit 1.2.3-korg From 82317aed7d4b6acd4fb65441a106f9de4d9c8926 Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Thu, 17 Jan 2019 10:57:04 +0100 Subject: add clang directives to avoid warnings Change-Id: I1ed298176ad1403ed089177a3cce4264f028bbbd Signed-off-by: Angelo Mantellini --- libparc/parc/algol/parc_Object.h | 27 +++++++++++++++++++++++++ libparc/parc/security/parc_CertificateFactory.c | 2 ++ libparc/parc/security/parc_PublicKeySigner.c | 4 +++- libparc/parc/security/parc_X509Certificate.c | 2 ++ 4 files changed, 34 insertions(+), 1 deletion(-) (limited to 'libparc/parc/security/parc_X509Certificate.c') diff --git a/libparc/parc/algol/parc_Object.h b/libparc/parc/algol/parc_Object.h index b1a48558..ac7e9652 100644 --- a/libparc/parc/algol/parc_Object.h +++ b/libparc/parc/algol/parc_Object.h @@ -598,7 +598,33 @@ const PARCObjectDescriptor *parcObject_SetDescriptor(PARCObject *object, const P * The new `PARCObjectDescriptor` uses the existing `PARCObjectDescriptor` as the super-type of the new descriptor. */ +#ifdef __clang__ #define parcObject_Extends(_subtype, _superType, ...) \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Winitializer-overrides\"") \ + parcObjectDescriptor_Declaration(_subtype) = { \ + .super = &parcObject_DescriptorName(_superType), \ + .name = #_subtype, \ + .objectSize = 0, \ + .objectAlignment = 0, \ + .destroy = NULL, \ + .destructor = NULL, \ + .release = NULL, \ + .copy = NULL, \ + .toString = NULL, \ + .equals = NULL, \ + .compare = NULL, \ + .hashCode = NULL, \ + .toJSON = NULL, \ + .display = NULL, \ + .isLockable = true, \ + .typeState = NULL, \ + __VA_ARGS__ \ + }; \ + _Pragma("GCC diagnostic pop") \ + const PARCObjectDescriptor parcObject_DescriptorName(_subtype) +#else + #define parcObject_Extends(_subtype, _superType, ...) \ _Pragma("GCC diagnostic ignored \"-Woverride-init\"") \ parcObjectDescriptor_Declaration(_subtype) = { \ .super = &parcObject_DescriptorName(_superType), \ @@ -621,6 +647,7 @@ const PARCObjectDescriptor *parcObject_SetDescriptor(PARCObject *object, const P }; \ _Pragma("GCC diagnostic warning \"-Woverride-init\"") \ const PARCObjectDescriptor parcObject_DescriptorName(_subtype) +#endif /** * Define a new PARC Object implementation, by composing a new PARC Object Descriptor referencing an old one. diff --git a/libparc/parc/security/parc_CertificateFactory.c b/libparc/parc/security/parc_CertificateFactory.c index 52cef4af..c737e425 100644 --- a/libparc/parc/security/parc_CertificateFactory.c +++ b/libparc/parc/security/parc_CertificateFactory.c @@ -91,6 +91,8 @@ parcCertificateFactory_CreateSelfSignedCertificate(PARCCertificateFactory *facto case PARCSigningAlgorithm_ECDSA: certificate = parcX509Certificate_CreateSelfSignedCertificate(privateKey, subjectName, (int) keyLength, valdityDays, PARCKeyType_EC); break; + default: + break; } // This may fail. diff --git a/libparc/parc/security/parc_PublicKeySigner.c b/libparc/parc/security/parc_PublicKeySigner.c index 0a029cae..1297611e 100644 --- a/libparc/parc/security/parc_PublicKeySigner.c +++ b/libparc/parc/security/parc_PublicKeySigner.c @@ -213,7 +213,7 @@ static inline int _SignDigestECDSA(const PARCCryptoHash *digestToSign, PARCBuffe ec_key); parcAssertTrue(result == 1, "Got error from ECDSA_sign: %d", result); EC_KEY_free(ec_key); - + return result; } static PARCSignature * @@ -307,6 +307,8 @@ _GetSignatureSize(PARCPublicKeySigner *signer) EVP_PKEY_free(privateKey); break; } + default: + break; } parcBuffer_Release(&privateKeyBuffer); diff --git a/libparc/parc/security/parc_X509Certificate.c b/libparc/parc/security/parc_X509Certificate.c index 497cff99..2c964ae7 100644 --- a/libparc/parc/security/parc_X509Certificate.c +++ b/libparc/parc/security/parc_X509Certificate.c @@ -609,6 +609,8 @@ parcX509Certificate_CreateSelfSignedCertificate(PARCBuffer **privateKeyBuffer, c return _createSelfSignedCertificate_RSA(privateKeyBuffer, subjectName, keyLength, validityDays); case PARCKeyType_EC: return _createSelfSignedCertificate_EC(privateKeyBuffer, subjectName, keyLength, validityDays); + default: + break; } return NULL; -- cgit 1.2.3-korg