SQ-and-clang-fixes

Author: lws-team

include/libwebsockets/lws-genec.h

@@ -114,6 +114,11 @@ struct lws_ec_curves {
  *		       .name = NULL, of curves you want to allow
  *
  * Initializes a genecdh
+ *
+ * \p ctx must be zeroed (eg, using memset) before it is passed to create
+ * apis the first time; if the ctx is still live from an earlier create, the
+ * call fails and returns nonzero.  After lws_genec_destroy() the same ctx
+ * can be passed to the create apis again.
  */
 LWS_VISIBLE LWS_EXTERN int
 lws_genecdh_create(struct lws_genec_ctx *ctx, struct lws_context *context,
@@ -159,7 +164,9 @@ lws_genecdh_compute_shared_secret(struct lws_genec_ctx *ctx, uint8_t *ss,
  *		       struct lws_ec_curves array, terminated by an entry with
  *		       .name = NULL, of curves you want to allow
  *
- * Initializes a genecdh
+ * Initializes a genecdsa.  \p ctx follows the same lifetime rules as for
+ * lws_genecdh_create(): zeroed before first use, and create over a ctx that
+ * is still live fails until lws_genec_destroy() is called on it.
  */
 LWS_VISIBLE LWS_EXTERN int
 lws_genecdsa_create(struct lws_genec_ctx *ctx, struct lws_context *context,
@@ -248,7 +255,9 @@ lws_genecdsa_hash_sign_jws(struct lws_genec_ctx *ctx, const uint8_t *in,
  *		       struct lws_ec_curves array, terminated by an entry with
  *		       .name = NULL, of curves you want to allow
  *
- * Initializes a geneddsa
+ * Initializes a geneddsa.  \p ctx follows the same lifetime rules as for
+ * lws_genecdh_create(): zeroed before first use, and create over a ctx that
+ * is still live fails until lws_genec_destroy() is called on it.
  */
 LWS_VISIBLE LWS_EXTERN int
 lws_geneddsa_create(struct lws_genec_ctx *ctx, struct lws_context *context,

include/libwebsockets/lws-genrsa.h

@@ -104,6 +104,11 @@ struct lws_genrsa_ctx {
  * Creates an RSA context with a public key associated with it, formed from
  * the key elements in \p el.
  *
+ * \p ctx must be zeroed (eg, using memset) before it is passed to create
+ * apis the first time; if the ctx is still live from an earlier create, the
+ * call fails and returns nonzero.  After lws_genrsa_destroy() the same ctx
+ * can be passed to the create apis again.
+ *
  * Mode LGRSAM_PKCS1_1_5 is in widespread use but has weaknesses.  It's
  * recommended to use LGRSAM_PKCS1_OAEP_PSS for new implementations.
  *
@@ -142,6 +147,10 @@ lws_genrsa_destroy_elements(struct lws_gencrypto_keyelem *el);
  * Creates a new RSA context and generates a new keypair into it, with \p bits
  * bits.
  *
+ * \p ctx follows the same lifetime rules as for lws_genrsa_create(): it must
+ * be zeroed before first use and must not still be live from an earlier
+ * create or new_keypair, the call fails otherwise.
+ *
  * Returns 0 for OK or nonzero for error.
  *
  * Mode LGRSAM_PKCS1_1_5 is in widespread use but has weaknesses.  It's

lib/cose/cose_key.c

@@ -929,6 +929,8 @@ lws_cose_key_generate(struct lws_context *context, cose_param_t cose_kty,
 	{
 		struct lws_genec_ctx ctx;
 
+		memset(&ctx, 0, sizeof(ctx));
+
 		if (cose_kty == LWSCOSE_WKKTV_OKP)
 			ck->gencrypto_kty = LWS_GENCRYPTO_KTY_OKP;
 		else

lib/jose/jwe/jwe-ecdh-es-aeskw.c

@@ -206,6 +206,8 @@ lws_jwe_encrypt_ecdh(struct lws_jwe *jwe, char *temp, int *temp_len,
 	struct lws_genec_ctx ecctx;
 	struct lws_jwk *ephem = &jwe->jose.recipient[jwe->recip].jwk_ephemeral;
 
+	memset(&ecctx, 0, sizeof(ecctx));
+
 	if (jwe->jws.jwk->kty != LWS_GENCRYPTO_KTY_EC) {
 		lwsl_err("%s: unexpected kty %d\n", __func__, jwe->jws.jwk->kty);
 

lib/jose/jwe/jwe-rsa-aescbc.c

@@ -51,6 +51,8 @@ lws_jwe_encrypt_rsa_aes_cbc_hs(struct lws_jwe *jwe,
 	char ekey[LWS_GENHASH_LARGEST];
 	struct lws_genrsa_ctx rsactx;
 
+	memset(&rsactx, 0, sizeof(rsactx));
+
 	if (jwe->jws.jwk->kty != LWS_GENCRYPTO_KTY_RSA) {
 		lwsl_err("%s: unexpected kty %d\n", __func__, jwe->jws.jwk->kty);
 
@@ -144,6 +146,8 @@ lws_jwe_auth_and_decrypt_rsa_aes_cbc_hs(struct lws_jwe *jwe)
 {
 	int n;
 	struct lws_genrsa_ctx rsactx;
+
+	memset(&rsactx, 0, sizeof(rsactx));
 	uint8_t enc_cek[512];
 
 	if (jwe->jws.jwk->kty != LWS_GENCRYPTO_KTY_RSA) {

lib/jose/jwe/jwe-rsa-aesgcm.c

@@ -33,6 +33,8 @@ lws_jwe_encrypt_rsa_aes_gcm(struct lws_jwe *jwe, char *temp, int *temp_len)
 {
 	int ekbytes = jwe->jose.enc_alg->keybits_fixed / 8;
 	struct lws_genrsa_ctx rsactx;
+
+	memset(&rsactx, 0, sizeof(rsactx));
 	int n, ret = -1, ot = *temp_len;
 
 	if (jwe->jws.jwk->kty != LWS_GENCRYPTO_KTY_RSA) {
@@ -138,6 +140,8 @@ lws_jwe_auth_and_decrypt_rsa_aes_gcm(struct lws_jwe *jwe)
 {
 	int n;
 	struct lws_genrsa_ctx rsactx;
+
+	memset(&rsactx, 0, sizeof(rsactx));
 	uint8_t enc_cek[LWS_JWE_LIMIT_KEY_ELEMENT_BYTES];
 
 	if (jwe->jws.jwk->kty != LWS_GENCRYPTO_KTY_RSA) {

lib/jose/jwk/jwk.c

@@ -201,6 +201,8 @@ lws_jwk_generate(struct lws_context *context, struct lws_jwk *jwk,
 	{
 		struct lws_genrsa_ctx ctx;
 
+		memset(&ctx, 0, sizeof(ctx));
+
 		lwsl_notice("%s: generating %d bit RSA key\n", __func__, bits);
 		n = lws_genrsa_new_keypair(context, &ctx, LGRSAM_PKCS1_1_5,
 					    jwk->e, bits);
@@ -227,6 +229,8 @@ lws_jwk_generate(struct lws_context *context, struct lws_jwk *jwk,
 	{
 		struct lws_genec_ctx ctx;
 
+		memset(&ctx, 0, sizeof(ctx));
+
 		if (!curve) {
 			lwsl_err("%s: must have a named curve\n", __func__);
 
@@ -252,6 +256,8 @@ lws_jwk_generate(struct lws_context *context, struct lws_jwk *jwk,
 	{
 		struct lws_genec_ctx ctx;
 
+		memset(&ctx, 0, sizeof(ctx));
+
 		if (!curve) {
 			lwsl_err("%s: must have a named curve\n", __func__);
 

lib/jose/jws/jws.c

@@ -468,6 +468,9 @@ lws_jws_sig_confirm(struct lws_jws_map *map_b64, struct lws_jws_map *map,
 	struct lws_genec_ctx ecdsactx;
 	struct lws_genrsa_ctx rsactx;
 	struct lws_genhmac_ctx ctx;
+
+	memset(&ecdsactx, 0, sizeof(ecdsactx));
+	memset(&rsactx, 0, sizeof(rsactx));
 	struct lws_jose jose;
 
 	lws_jose_init(&jose);
@@ -817,6 +820,9 @@ lws_jws_sign_from_b64(struct lws_jose *jose, struct lws_jws *jws,
 	struct lws_genhmac_ctx hmac_ctx;
 	struct lws_genec_ctx ecdsactx;
 	struct lws_genrsa_ctx rsactx;
+
+	memset(&ecdsactx, 0, sizeof(ecdsactx));
+	memset(&rsactx, 0, sizeof(rsactx));
 	uint8_t *buf;
 	int n, m;
 

lib/system/async-dns/dnssec.c

@@ -281,6 +281,8 @@ lws_dnssec_dnskey_cb(struct lws *wsi, const char *name, const struct addrinfo *d
 
 					if (alg == LWS_ADNS_DSA_ECDSAP256SHA256 || alg == LWS_ADNS_DSA_ECDSAP384SHA384) {
 						struct lws_genec_ctx ctx;
+
+						memset(&ctx, 0, sizeof(ctx));
 						size_t curvelen = (alg == LWS_ADNS_DSA_ECDSAP256SHA256) ? 32 : 48;
 						enum lws_genhash_types hashtype = (alg == LWS_ADNS_DSA_ECDSAP256SHA256) ? LWS_GENHASH_TYPE_SHA256 : LWS_GENHASH_TYPE_SHA384;
 
@@ -314,6 +316,8 @@ lws_dnssec_dnskey_cb(struct lws *wsi, const char *name, const struct addrinfo *d
 						}
 					} else if (alg == LWS_ADNS_DSA_RSA_SHA256 || alg == LWS_ADNS_DSA_RSA_SHA512) {
 						struct lws_genrsa_ctx ctx;
+
+						memset(&ctx, 0, sizeof(ctx));
 						enum lws_genhash_types hashtype = (alg == LWS_ADNS_DSA_RSA_SHA256) ? LWS_GENHASH_TYPE_SHA256 : LWS_GENHASH_TYPE_SHA512;
 
 						if (key_data_len < 1)

lib/system/auth-dns/sign.c

@@ -1612,6 +1612,7 @@ lws_auth_dns_verify_zone(struct lws_auth_dns_sign_info *info)
 					int raw_l = lws_b64_decode_string(b64, (char *)raw, sizeof(raw));
 					if (raw_l > 0) {
 						struct lws_genec_ctx *target_genec = (flags == 257) ? &genec_ksk : &genec_zsk;
+						lws_genec_destroy(target_genec); /* may already hold an earlier DNSKEY */
 						if (lws_genecdsa_create(target_genec, info->cx, NULL) == 0) {
 							/* We need to re-construct an ephemeral struct lws_jwk's EC elements
 							 * from the RAW ANS.1/DNSKEY export format: [flags][proto][alg][key...]