From 7e4d5d73cf1fdcbee10a06a307529955ad17919e Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 11 Mar 2016 19:24:00 -0500 Subject: First round of debugging based on RPC pkey tests: mostly ASN.1 silliness, with a bit of PKCS #1.5 padding silliness for desert. --- asn1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'asn1.c') diff --git a/asn1.c b/asn1.c index c50a7b4..2206ec3 100644 --- a/asn1.c +++ b/asn1.c @@ -161,7 +161,8 @@ hal_error_t hal_asn1_encode_spki(const uint8_t * const alg_oid, const size_t a const uint8_t * const pubkey, const size_t pubkey_len, uint8_t *der, size_t *der_len, const size_t der_max) { - if (alg_oid == NULL || alg_oid_len == 0 || pubkey == NULL || pubkey_len == 0 || (curve_oid == NULL && curve_oid_len != 0)) + if (alg_oid == NULL || alg_oid_len == 0 || pubkey_len == 0 || + (der != NULL && pubkey == NULL) || (curve_oid == NULL && curve_oid_len != 0)) return HAL_ERROR_BAD_ARGUMENTS; const uint8_t curve_oid_tag = curve_oid == NULL ? ASN1_NULL : ASN1_OBJECT_IDENTIFIER; -- cgit v1.2.3