Fix warnings and errors of amalgam build

sjaeckel · sjaeckel · commit 9817c6b77e17 · 2025-09-08T15:20:07.000+02:00
Yeah, those functions should be in a header file, but we had problems with
some platforms which don't properly support inline functions, so we'll
keep it as is for now.

Signed-off-by: Steffen Jaeckel &lt;s@jaeckel.eu&gt;
diff --git a/src/pk/asn1/x509/x509_extensions.c b/src/pk/asn1/x509/x509_extensions.c
@@ -55,6 +55,8 @@ LTC_INLINE static int s_get_element_(const st_oid_detail* details, unsigned long
 #define s_get_element(arr, arc, oid, res) s_get_element_(arr, LTC_ARRAY_SIZE(arr), arc, sizeof(arc) - 1, oid, res)
 
 
+#ifndef S_IS_CONTEXT_SPECIFIC
+#define S_IS_CONTEXT_SPECIFIC
 LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)
 {
    if (seq->type != LTC_ASN1_CUSTOM_TYPE)
@@ -63,7 +65,10 @@ LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)
       return 0;
    return 1;
 }
+#endif
 
+#ifndef S_IS_CONTEXT_SPECIFIC_PRIMITIVE
+#define S_IS_CONTEXT_SPECIFIC_PRIMITIVE
 LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)
 {
    if (!s_is_context_specific(seq))
@@ -72,6 +77,7 @@ LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)
       return 0;
    return 1;
 }
+#endif
 
 LTC_INLINE static int s_looks_like_general_name(const ltc_asn1_list *name)
 {
@@ -504,14 +510,19 @@ static int s_get_ce_value(const ltc_asn1_list *os, st_ce_value *ce)
    return err;
 }
 
+#ifndef S_FREE
+#define S_FREE
 LTC_INLINE static void s_free(const void* p)
 {
    if (p == NULL) {
       return;
    }
    XFREE((void*)p);
 }
+#endif
 
+#ifndef S_FREE_X509_STRING_ARRAY
+#define S_FREE_X509_STRING_ARRAY
 LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings, unsigned long num)
 {
    unsigned long n;
@@ -520,6 +531,7 @@ LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings,
    }
    s_free(strings);
 }
+#endif
 
 LTC_INLINE static void s_free_extension(const ltc_x509_extension *ext)
 {
diff --git a/src/pk/asn1/x509/x509_get.c b/src/pk/asn1/x509/x509_get.c
@@ -12,7 +12,7 @@
 static LTC_INLINE int s_x509_get_oid(const ltc_asn1_list *pub, enum ltc_oid_id *oid_id)
 {
    der_flexi_check flexi_should[3];
-   ltc_asn1_list *seqid, *id;
+   ltc_asn1_list *seqid, *id = NULL;
    int err;
    unsigned long n = 0;
    LTC_SET_DER_FLEXI_CHECK(flexi_should, n++, LTC_ASN1_SEQUENCE, &seqid);
diff --git a/src/pk/asn1/x509/x509_import.c b/src/pk/asn1/x509/x509_import.c
@@ -21,6 +21,8 @@
 #define OID_DETAIL_ELEMENT(detail, oid, types, ub) { detail, oid, types, ub, NULL }
 #define OID_DETAIL_ELEMENT_5(detail, arc, oid, types, ub) { detail, arc "." # oid, types, ub, NULL }
 
+#define st_oid_detail st_x509_import_oid_detail
+
 typedef struct st_oid_detail {
    ltc_x509_details detail;
    const char *oid;
@@ -162,6 +164,7 @@ LTC_INLINE static int s_x509_get_name_process(const ltc_asn1_list *set, st_oid_d
    return CRYPT_OK;
 }
 
+#ifndef S_FREE
 #define S_FREE
 LTC_INLINE static void s_free(const void* p)
 {
@@ -170,7 +173,10 @@ LTC_INLINE static void s_free(const void* p)
    }
    XFREE((void*)p);
 }
+#endif
 
+#ifndef S_FREE_X509_STRING_ARRAY
+#define S_FREE_X509_STRING_ARRAY
 LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings, unsigned long num)
 {
    unsigned long n;
@@ -179,6 +185,7 @@ LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings,
    }
    s_free(strings);
 }
+#endif
 
 #define SETBIT(v, n)    (v=((unsigned char)(v) | (1U << (unsigned char)(n))))
 #define CLRBIT(v, n)    (v=((unsigned char)(v) & ~(1U << (unsigned char)(n))))
@@ -431,6 +438,8 @@ static int s_x509_check_spki(const ltc_asn1_list *seq, const ltc_pka_key *spki)
    return CRYPT_PK_INVALID_TYPE;
 }
 
+#ifndef S_IS_CONTEXT_SPECIFIC
+#define S_IS_CONTEXT_SPECIFIC
 LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)
 {
    if (seq->type != LTC_ASN1_CUSTOM_TYPE)
@@ -439,7 +448,10 @@ LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)
       return 0;
    return 1;
 }
+#endif
 
+#ifndef S_IS_CONTEXT_SPECIFIC_PRIMITIVE
+#define S_IS_CONTEXT_SPECIFIC_PRIMITIVE
 LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)
 {
    if (!s_is_context_specific(seq))
@@ -448,6 +460,7 @@ LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)
       return 0;
    return 1;
 }
+#endif
 
 LTC_INLINE static int s_is_context_specific_constructed(const ltc_asn1_list *seq)
 {
@@ -650,4 +663,6 @@ void x509_free(const ltc_x509_certificate **cert)
    *cert = NULL;
 }
 
+#undef st_oid_detail
+
 #endif /* LTC_DER */
diff --git a/src/pk/rsa/rsa_import.c b/src/pk/rsa/rsa_import.c
@@ -9,6 +9,8 @@
 
 #ifdef LTC_MRSA
 
+#ifndef S_RSA_DECODE
+#define S_RSA_DECODE
 static int s_rsa_decode(const unsigned char *in, unsigned long inlen, rsa_key *key)
 {
    /* now it should be SEQUENCE { INTEGER, INTEGER } */
@@ -17,6 +19,7 @@ static int s_rsa_decode(const unsigned char *in, unsigned long inlen, rsa_key *k
                                         LTC_ASN1_INTEGER, 1UL, key->e,
                                         LTC_ASN1_EOL,     0UL, NULL);
 }
+#endif
 
 
 /**
diff --git a/src/pk/rsa/rsa_import_x509.c b/src/pk/rsa/rsa_import_x509.c
@@ -9,6 +9,8 @@
 
 #ifdef LTC_MRSA
 
+#ifndef S_RSA_DECODE
+#define S_RSA_DECODE
 static int s_rsa_decode(const unsigned char *in, unsigned long inlen, rsa_key *key)
 {
    /* now it should be SEQUENCE { INTEGER, INTEGER } */
@@ -17,6 +19,7 @@ static int s_rsa_decode(const unsigned char *in, unsigned long inlen, rsa_key *k
                                         LTC_ASN1_INTEGER, 1UL, key->e,
                                         LTC_ASN1_EOL,     0UL, NULL);
 }
+#endif
 
 typedef struct rsa_pss_parameters_data {
    ltc_asn1_list params[4], inner[4], hash_alg[1], mgf[2], mgf_hash_alg[1];

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ LTC_INLINE static int s_get_element_(const st_oid_detail* details, unsigned long`
`55`	`55`	`#define s_get_element(arr, arc, oid, res) s_get_element_(arr, LTC_ARRAY_SIZE(arr), arc, sizeof(arc) - 1, oid, res)`
`56`	`56`
`57`	`57`
	`58`	`+#ifndef S_IS_CONTEXT_SPECIFIC`
	`59`	`+#define S_IS_CONTEXT_SPECIFIC`
`58`	`60`	`LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)`
`59`	`61`	`{`
`60`	`62`	`if (seq->type != LTC_ASN1_CUSTOM_TYPE)`
`@@ -63,7 +65,10 @@ LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)`
`63`	`65`	`return 0;`
`64`	`66`	`return 1;`
`65`	`67`	`}`
	`68`	`+#endif`
`66`	`69`
	`70`	`+#ifndef S_IS_CONTEXT_SPECIFIC_PRIMITIVE`
	`71`	`+#define S_IS_CONTEXT_SPECIFIC_PRIMITIVE`
`67`	`72`	`LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)`
`68`	`73`	`{`
`69`	`74`	`if (!s_is_context_specific(seq))`
`@@ -72,6 +77,7 @@ LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)`
`72`	`77`	`return 0;`
`73`	`78`	`return 1;`
`74`	`79`	`}`
	`80`	`+#endif`
`75`	`81`
`76`	`82`	`LTC_INLINE static int s_looks_like_general_name(const ltc_asn1_list *name)`
`77`	`83`	`{`
`@@ -504,14 +510,19 @@ static int s_get_ce_value(const ltc_asn1_list os, st_ce_value ce)`
`504`	`510`	`return err;`
`505`	`511`	`}`
`506`	`512`
	`513`	`+#ifndef S_FREE`
	`514`	`+#define S_FREE`
`507`	`515`	`LTC_INLINE static void s_free(const void* p)`
`508`	`516`	`{`
`509`	`517`	`if (p == NULL) {`
`510`	`518`	`return;`
`511`	`519`	`}`
`512`	`520`	`XFREE((void*)p);`
`513`	`521`	`}`
	`522`	`+#endif`
`514`	`523`
	`524`	`+#ifndef S_FREE_X509_STRING_ARRAY`
	`525`	`+#define S_FREE_X509_STRING_ARRAY`
`515`	`526`	`LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings, unsigned long num)`
`516`	`527`	`{`
`517`	`528`	`unsigned long n;`
`@@ -520,6 +531,7 @@ LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings,`
`520`	`531`	`}`
`521`	`532`	`s_free(strings);`
`522`	`533`	`}`
	`534`	`+#endif`
`523`	`535`
`524`	`536`	`LTC_INLINE static void s_free_extension(const ltc_x509_extension *ext)`
`525`	`537`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`static LTC_INLINE int s_x509_get_oid(const ltc_asn1_list pub, enum ltc_oid_id oid_id)`
`13`	`13`	`{`
`14`	`14`	`der_flexi_check flexi_should[3];`
`15`		`- ltc_asn1_list seqid, id;`
	`15`	`+ ltc_asn1_list seqid, id = NULL;`
`16`	`16`	`int err;`
`17`	`17`	`unsigned long n = 0;`
`18`	`18`	`LTC_SET_DER_FLEXI_CHECK(flexi_should, n++, LTC_ASN1_SEQUENCE, &seqid);`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`#define OID_DETAIL_ELEMENT(detail, oid, types, ub) { detail, oid, types, ub, NULL }`
`22`	`22`	`#define OID_DETAIL_ELEMENT_5(detail, arc, oid, types, ub) { detail, arc "." # oid, types, ub, NULL }`
`23`	`23`
	`24`	`+#define st_oid_detail st_x509_import_oid_detail`
	`25`	`+`
`24`	`26`	`typedef struct st_oid_detail {`
`25`	`27`	`ltc_x509_details detail;`
`26`	`28`	`const char *oid;`
`@@ -162,6 +164,7 @@ LTC_INLINE static int s_x509_get_name_process(const ltc_asn1_list *set, st_oid_d`
`162`	`164`	`return CRYPT_OK;`
`163`	`165`	`}`
`164`	`166`
	`167`	`+#ifndef S_FREE`
`165`	`168`	`#define S_FREE`
`166`	`169`	`LTC_INLINE static void s_free(const void* p)`
`167`	`170`	`{`
`@@ -170,7 +173,10 @@ LTC_INLINE static void s_free(const void* p)`
`170`	`173`	`}`
`171`	`174`	`XFREE((void*)p);`
`172`	`175`	`}`
	`176`	`+#endif`
`173`	`177`
	`178`	`+#ifndef S_FREE_X509_STRING_ARRAY`
	`179`	`+#define S_FREE_X509_STRING_ARRAY`
`174`	`180`	`LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings, unsigned long num)`
`175`	`181`	`{`
`176`	`182`	`unsigned long n;`
`@@ -179,6 +185,7 @@ LTC_INLINE static void s_free_x509_string_array(const ltc_x509_string *strings,`
`179`	`185`	`}`
`180`	`186`	`s_free(strings);`
`181`	`187`	`}`
	`188`	`+#endif`
`182`	`189`
`183`	`190`	`#define SETBIT(v, n) (v=((unsigned char)(v) \| (1U << (unsigned char)(n))))`
`184`	`191`	`#define CLRBIT(v, n) (v=((unsigned char)(v) & ~(1U << (unsigned char)(n))))`
`@@ -431,6 +438,8 @@ static int s_x509_check_spki(const ltc_asn1_list seq, const ltc_pka_key spki)`
`431`	`438`	`return CRYPT_PK_INVALID_TYPE;`
`432`	`439`	`}`
`433`	`440`
	`441`	`+#ifndef S_IS_CONTEXT_SPECIFIC`
	`442`	`+#define S_IS_CONTEXT_SPECIFIC`
`434`	`443`	`LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)`
`435`	`444`	`{`
`436`	`445`	`if (seq->type != LTC_ASN1_CUSTOM_TYPE)`
`@@ -439,7 +448,10 @@ LTC_INLINE static int s_is_context_specific(const ltc_asn1_list *seq)`
`439`	`448`	`return 0;`
`440`	`449`	`return 1;`
`441`	`450`	`}`
	`451`	`+#endif`
`442`	`452`
	`453`	`+#ifndef S_IS_CONTEXT_SPECIFIC_PRIMITIVE`
	`454`	`+#define S_IS_CONTEXT_SPECIFIC_PRIMITIVE`
`443`	`455`	`LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)`
`444`	`456`	`{`
`445`	`457`	`if (!s_is_context_specific(seq))`
`@@ -448,6 +460,7 @@ LTC_INLINE static int s_is_context_specific_primitive(const ltc_asn1_list *seq)`
`448`	`460`	`return 0;`
`449`	`461`	`return 1;`
`450`	`462`	`}`
	`463`	`+#endif`
`451`	`464`
`452`	`465`	`LTC_INLINE static int s_is_context_specific_constructed(const ltc_asn1_list *seq)`
`453`	`466`	`{`
`@@ -650,4 +663,6 @@ void x509_free(const ltc_x509_certificate **cert)`
`650`	`663`	`*cert = NULL;`
`651`	`664`	`}`
`652`	`665`
	`666`	`+#undef st_oid_detail`
	`667`	`+`
`653`	`668`	`#endif /* LTC_DER */`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`
`10`	`10`	`#ifdef LTC_MRSA`
`11`	`11`
	`12`	`+#ifndef S_RSA_DECODE`
	`13`	`+#define S_RSA_DECODE`
`12`	`14`	`static int s_rsa_decode(const unsigned char in, unsigned long inlen, rsa_key key)`
`13`	`15`	`{`
`14`	`16`	`/* now it should be SEQUENCE { INTEGER, INTEGER } */`
`@@ -17,6 +19,7 @@ static int s_rsa_decode(const unsigned char in, unsigned long inlen, rsa_key k`
`17`	`19`	`LTC_ASN1_INTEGER, 1UL, key->e,`
`18`	`20`	`LTC_ASN1_EOL, 0UL, NULL);`
`19`	`21`	`}`
	`22`	`+#endif`
`20`	`23`
`21`	`24`
`22`	`25`	`/**`