From 510c2413083e68ca620eafc49ab1141bf09319be Mon Sep 17 00:00:00 2001
From: "papizh.konstantin" <papizh.konstantin@demlabs.net>
Date: Tue, 20 Oct 2020 10:14:15 +0000
Subject: [PATCH] Alignments fixed
---
dap-sdk/crypto/include/dap_sign.h | 8 ++++----
dap-sdk/crypto/src/dap_cert.c | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dap-sdk/crypto/include/dap_sign.h b/dap-sdk/crypto/include/dap_sign.h
index 9aa8084154..9182a7e10b 100755
--- a/dap-sdk/crypto/include/dap_sign.h
+++ b/dap-sdk/crypto/include/dap_sign.h
@@ -43,13 +43,13 @@ typedef enum {
} dap_sign_type_enum_t;
typedef union dap_sign_type {
- dap_sign_type_enum_t type: 16;
- uint16_t raw;
-} dap_sign_type_t;
+ dap_sign_type_enum_t type: 32;
+ uint32_t raw;
+} DAP_ALIGN_PACKED dap_sign_type_t;
typedef struct dap_sign_hdr {
dap_sign_type_t type; /// Signature type
- uint8_t padding[2]; /// Padding for better aligmnent
+ uint16_t padding;
uint32_t sign_size; /// Signature size
uint32_t sign_pkey_size; /// Signature serialized public key size
} DAP_ALIGN_PACKED dap_sign_hdr_t;
diff --git a/dap-sdk/crypto/src/dap_cert.c b/dap-sdk/crypto/src/dap_cert.c
index b9bc426886..f5ac35d17c 100755
--- a/dap-sdk/crypto/src/dap_cert.c
+++ b/dap-sdk/crypto/src/dap_cert.c
@@ -169,8 +169,7 @@ size_t dap_cert_sign_output_size(dap_cert_t * a_cert, size_t a_size_wished)
dap_sign_t * dap_cert_sign(dap_cert_t * a_cert, const void * a_data
, size_t a_data_size, size_t a_output_size_wished )
{
- dap_enc_key_t * l_key = a_cert->enc_key;
- dap_sign_t *l_ret = dap_sign_create(l_key, a_data, a_data_size, a_output_size_wished);
+ dap_sign_t *l_ret = dap_sign_create(a_cert->enc_key, a_data, a_data_size, a_output_size_wished);
return l_ret;
}
--
GitLab