Browse Source

[Minor] Fix confusing with variable type and re-use

tags/3.3
Vsevolod Stakhov 1 year ago
parent
commit
cd615af744
No account linked to committer's email address
1 changed files with 16 additions and 6 deletions
  1. 16
    6
      src/libserver/dkim.c

+ 16
- 6
src/libserver/dkim.c View File

GError **err) GError **err)
{ {
const gchar *p, *c, *tag = NULL, *end; const gchar *p, *c, *tag = NULL, *end;
gsize taglen;
gint taglen;
gint param = DKIM_PARAM_UNKNOWN; gint param = DKIM_PARAM_UNKNOWN;
const EVP_MD *md_alg; const EVP_MD *md_alg;
time_t now; time_t now;
switch (state) { switch (state) {
case DKIM_STATE_TAG: case DKIM_STATE_TAG:
if (g_ascii_isspace (*p)) { if (g_ascii_isspace (*p)) {
taglen = p - c;
taglen = (int)(p - c);
while (*p && g_ascii_isspace (*p)) { while (*p && g_ascii_isspace (*p)) {
/* Skip spaces before '=' sign */ /* Skip spaces before '=' sign */
p++; p++;
} }
else { else {
taglen++; taglen++;
p++;

if (taglen > G_MAXINT8) {
g_set_error (err,
DKIM_ERROR,
DKIM_SIGERROR_UNKNOWN,
"too long dkim tag");
state = DKIM_STATE_ERROR;
}
else {
p++;
}
} }
break; break;
case DKIM_STATE_AFTER_TAG: case DKIM_STATE_AFTER_TAG:
} }


/* Now create dns key to request further */ /* Now create dns key to request further */
taglen = strlen (ctx->domain) + strlen (ctx->selector) +
gsize dnslen = strlen (ctx->domain) + strlen (ctx->selector) +
sizeof (DKIM_DNSKEYNAME) + 2; sizeof (DKIM_DNSKEYNAME) + 2;
ctx->dns_key = rspamd_mempool_alloc (ctx->pool, taglen);
ctx->dns_key = rspamd_mempool_alloc (ctx->pool, dnslen);
rspamd_snprintf (ctx->dns_key, rspamd_snprintf (ctx->dns_key,
taglen,
dnslen,
"%s.%s.%s", "%s.%s.%s",
ctx->selector, ctx->selector,
DKIM_DNSKEYNAME, DKIM_DNSKEYNAME,

Loading…
Cancel
Save