diff --git a/src/tls_trace.c b/src/tls_trace.c index fde98fb0..b30c2953 100644 --- a/src/tls_trace.c +++ b/src/tls_trace.c @@ -533,7 +533,6 @@ int tls_extensions_print(FILE *fp, const uint8_t *exts, size_t extslen, int form int tls_hello_request_print(FILE *fp, const uint8_t *data, size_t datalen, int format, int indent) { format_print(fp, format, indent, "HelloRequest\n"); - indent += 4; if (data || datalen > 0) { error_print(); return -1; diff --git a/src/x509_cer.c b/src/x509_cer.c index a690a4e3..4c350806 100644 --- a/src/x509_cer.c +++ b/src/x509_cer.c @@ -1106,7 +1106,7 @@ int x509_cert_sign_to_der( uint8_t **out, size_t *outlen) { size_t len = 0; - uint8_t *tbs; + uint8_t *tbs = NULL; int sig_alg = OID_sm2sign_with_sm3; uint8_t sig[SM2_MAX_SIGNATURE_SIZE]; size_t siglen = SM2_signature_typical_size; diff --git a/src/x509_crl.c b/src/x509_crl.c index ec6d49ad..f6399bbd 100644 --- a/src/x509_crl.c +++ b/src/x509_crl.c @@ -1426,7 +1426,7 @@ int x509_crl_sign_to_der( uint8_t **out, size_t *outlen) { size_t len = 0; - uint8_t *tbs; + uint8_t *tbs = NULL; uint8_t sig[SM2_MAX_SIGNATURE_SIZE]; size_t siglen = SM2_signature_typical_size; diff --git a/src/x509_req.c b/src/x509_req.c index 58df32ed..8a7a7546 100644 --- a/src/x509_req.c +++ b/src/x509_req.c @@ -166,7 +166,7 @@ int x509_req_sign_to_der( uint8_t **out, size_t *outlen) { size_t len = 0; - uint8_t *tbs; + uint8_t *tbs = NULL; int sig_alg = OID_sm2sign_with_sm3; uint8_t sig[SM2_MAX_SIGNATURE_SIZE]; size_t siglen = SM2_signature_typical_size; diff --git a/src/zuc.c b/src/zuc.c index 7640a64e..cb2188e0 100644 --- a/src/zuc.c +++ b/src/zuc.c @@ -298,7 +298,6 @@ void zuc_encrypt(ZUC_STATE *state, const uint8_t *in, size_t inlen, uint8_t *out // table lookup together makes 10% faster T0 = S0[(U >> 24) ]; - T0 = S0[(U >> 24) ]; T2 = S0[(U >> 8) & 0xFF]; T4 = S0[(V >> 24) ]; T6 = S0[(V >> 8) & 0xFF]; @@ -435,12 +434,12 @@ void zuc_mac_update(ZUC_MAC_CTX *ctx, const uint8_t *data, size_t len) void zuc_mac_finish(ZUC_MAC_CTX *ctx, const uint8_t *data, size_t nbits, uint8_t mac[4]) { - ZUC_UINT32 T = ctx->T; - ZUC_UINT32 K0 = ctx->K0; + ZUC_UINT32 T; + ZUC_UINT32 K0; ZUC_UINT32 K1, M; ZUC_UINT31 *LFSR = ctx->LFSR; - ZUC_UINT32 R1 = ctx->R1; - ZUC_UINT32 R2 = ctx->R2; + ZUC_UINT32 R1; + ZUC_UINT32 R2; ZUC_UINT32 X0, X1, X2, X3; ZUC_UINT32 W1, W2, U, V; size_t i; @@ -456,11 +455,9 @@ void zuc_mac_finish(ZUC_MAC_CTX *ctx, const uint8_t *data, size_t nbits, uint8_t T = ctx->T; K0 = ctx->K0; - LFSR = ctx->LFSR; R1 = ctx->R1; R2 = ctx->R2; - if (nbits) ctx->buf[ctx->buflen] = *data; diff --git a/src/zuc_modes.c b/src/zuc_modes.c index 75f89b73..afb4f946 100644 --- a/src/zuc_modes.c +++ b/src/zuc_modes.c @@ -119,7 +119,6 @@ int zuc_encrypt_update(ZUC_CTX *ctx, const uint8_t *in, size_t inlen, uint8_t *o zuc_encrypt(&ctx->zuc_state, in, len, out); in += len; inlen -= len; - out += len; *outlen += len; } if (inlen) {