aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/divert-scd.c14
-rw-r--r--agent/genkey.c6
-rw-r--r--agent/learncard.c6
-rw-r--r--agent/pkdecrypt.c2
-rw-r--r--agent/protect.c90
-rw-r--r--agent/sexp-parse.h4
6 files changed, 61 insertions, 61 deletions
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 30b8770f9..3a0c22e48 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -48,11 +48,11 @@ ask_for_card (CTRL ctrl, const unsigned char *shadow_info, char **r_kid)
*r_kid = NULL;
s = shadow_info;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
want_sn = xtrymalloc (n*2+1);
if (!want_sn)
return out_of_core ();
@@ -68,7 +68,7 @@ ask_for_card (CTRL ctrl, const unsigned char *shadow_info, char **r_kid)
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
want_kid = xtrymalloc (n+1);
if (!want_kid)
{
@@ -261,11 +261,11 @@ divert_pkdecrypt (CTRL ctrl,
s = cipher;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "enc-val"))
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
if (*s != '(')
@@ -273,7 +273,7 @@ divert_pkdecrypt (CTRL ctrl,
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "rsa"))
return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
if (*s != '(')
@@ -281,7 +281,7 @@ divert_pkdecrypt (CTRL ctrl,
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "a"))
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
n = snext (&s);
diff --git a/agent/genkey.c b/agent/genkey.c
index d6db46e05..28d71a677 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -101,7 +101,7 @@ agent_genkey (CTRL ctrl, const char *keyparam, size_t keyparamlen,
if (rc)
{
log_error ("failed to convert keyparam: %s\n", gcry_strerror (rc));
- return gpg_error (GPG_ERR_INVALID_DATA);
+ return gpg_error (GPG_ERR_INV_DATA);
}
/* Get the passphrase now, cause key generation may take a while. */
@@ -147,7 +147,7 @@ agent_genkey (CTRL ctrl, const char *keyparam, size_t keyparamlen,
log_error ("key generation failed: invalid return value\n");
gcry_sexp_release (s_key);
xfree (pi);
- return gpg_error (GPG_ERR_INVALID_DATA);
+ return gpg_error (GPG_ERR_INV_DATA);
}
s_public = gcry_sexp_find_token (s_key, "public-key", 0);
if (!s_public)
@@ -156,7 +156,7 @@ agent_genkey (CTRL ctrl, const char *keyparam, size_t keyparamlen,
gcry_sexp_release (s_private);
gcry_sexp_release (s_key);
xfree (pi);
- return gpg_error (GPG_ERR_INVALID_DATA);
+ return gpg_error (GPG_ERR_INV_DATA);
}
gcry_sexp_release (s_key); s_key = NULL;
diff --git a/agent/learncard.c b/agent/learncard.c
index da4271a67..d5c1aae26 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -110,7 +110,7 @@ kpinfo_cb (void *opaque, const char *line)
}
else if ((p - item->hexgrip) != 40 || !spacep (p))
{ /* not a 20 byte hex keygrip or not followed by a space */
- parm->error = gpg_error (GPG_ERR_INVALID_RESPONSE);
+ parm->error = gpg_error (GPG_ERR_INV_RESPONSE);
xfree (item);
return;
}
@@ -122,7 +122,7 @@ kpinfo_cb (void *opaque, const char *line)
p++;
if (p == item->id)
{ /* invalid ID string */
- parm->error = gpg_error (GPG_ERR_INVALID_RESPONSE);
+ parm->error = gpg_error (GPG_ERR_INV_RESPONSE);
xfree (item);
return;
}
@@ -154,7 +154,7 @@ certinfo_cb (void *opaque, const char *line)
;
if (p == pend || !*p)
{
- parm->error = gpg_error (GPG_ERR_INVALID_RESPONSE);
+ parm->error = gpg_error (GPG_ERR_INV_RESPONSE);
return;
}
*pend = 0; /* ignore trailing stuff */
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index 0bc3580ce..baa886556 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -77,7 +77,7 @@ agent_pkdecrypt (CTRL ctrl, const char *ciphertext, size_t ciphertextlen,
if (!gcry_sexp_canon_len (ciphertext, ciphertextlen, NULL, NULL))
{
- rc = gpg_error (GPG_ERR_INVALID_SEXP);
+ rc = gpg_error (GPG_ERR_INV_SEXP);
goto leave;
}
diff --git a/agent/protect.c b/agent/protect.c
index dba216429..b686f3665 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -68,11 +68,11 @@ calculate_mic (const unsigned char *plainkey, unsigned char *sha1hash)
s = plainkey;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "private-key"))
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
if (*s != '(')
@@ -81,7 +81,7 @@ calculate_mic (const unsigned char *plainkey, unsigned char *sha1hash)
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n; /* skip over the algorithm name */
while (*s == '(')
@@ -89,18 +89,18 @@ calculate_mic (const unsigned char *plainkey, unsigned char *sha1hash)
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n;
if ( *s != ')' )
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s++;
}
if (*s != ')')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s++;
hash_end = s;
@@ -278,12 +278,12 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
s = plainkey;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth++;
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "private-key"))
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
if (*s != '(')
@@ -293,7 +293,7 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
for (infidx=0; protect_info[infidx].algo
&& !smatch (&s, n, protect_info[infidx].algo); infidx++)
@@ -307,28 +307,28 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
if (i == protect_info[infidx].prot_from)
prot_begin = s;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth++;
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (n != 1 || c != *s)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s +=n; /* skip value */
if (*s != ')')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth--;
if (i == protect_info[infidx].prot_to)
prot_end = s;
s++;
}
if (*s != ')' || !prot_begin || !prot_end )
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth--;
hash_end = s;
s++;
@@ -566,7 +566,7 @@ merge_lists (const unsigned char *protectedkey,
invalid_sexp:
xfree (newlist);
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
}
@@ -591,11 +591,11 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
s = protectedkey;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "protected-private-key"))
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
if (*s != '(')
@@ -603,7 +603,7 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
for (infidx=0; protect_info[infidx].algo
&& !smatch (&s, n, protect_info[infidx].algo); infidx++)
@@ -620,12 +620,12 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
for (;;)
{
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
prot_begin = s;
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (smatch (&s, n, "protected"))
break;
s += n;
@@ -637,15 +637,15 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
/* found */
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "openpgp-s2k3-sha1-" PROT_CIPHER_STRING "-cbc"))
return gpg_error (GPG_ERR_UNSUPPORTED_PROTECTION);
if (*s != '(' || s[1] != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += 2;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "sha1"))
return gpg_error (GPG_ERR_UNSUPPORTED_PROTECTION);
n = snext (&s);
@@ -660,7 +660,7 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
here. We might want to check that we only have digits - but this
is nothing we should worry about */
if (s[n] != ')' )
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s2kcount = strtoul (s, NULL, 10);
if (!s2kcount)
return gpg_error (GPG_ERR_CORRUPTED_PROTECTION);
@@ -673,11 +673,11 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
iv = s;
s += n;
if (*s != ')' )
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
rc = do_decryption (s, n,
passphrase, s2ksalt, s2kcount,
@@ -836,15 +836,15 @@ agent_shadow_key (const unsigned char *pubkey,
size_t shadow_info_len = gcry_sexp_canon_len (shadow_info, 0, NULL,NULL);
if (!pubkey_len || !shadow_info_len)
- return gpg_error (GPG_ERR_INVALID_VALUE);
+ return gpg_error (GPG_ERR_INV_VALUE);
s = pubkey;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth++;
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "public-key"))
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
if (*s != '(')
@@ -853,25 +853,25 @@ agent_shadow_key (const unsigned char *pubkey,
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n; /* skip over the algorithm name */
while (*s != ')')
{
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth++;
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s +=n; /* skip value */
if (*s != ')')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth--;
s++;
}
@@ -912,12 +912,12 @@ agent_get_shadow_info (const unsigned char *shadowkey,
s = shadowkey;
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth++;
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (!smatch (&s, n, "shadowed-private-key"))
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
if (*s != '(')
@@ -926,7 +926,7 @@ agent_get_shadow_info (const unsigned char *shadowkey,
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n; /* skip over the algorithm name */
for (;;)
@@ -934,32 +934,32 @@ agent_get_shadow_info (const unsigned char *shadowkey,
if (*s == ')')
return gpg_error (GPG_ERR_UNKNOWN_SEXP);
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth++;
s++;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (smatch (&s, n, "shadowed"))
break;
s += n;
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s +=n; /* skip value */
if (*s != ')')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
depth--;
s++;
}
/* found the shadowed list, s points to the protocol */
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
if (smatch (&s, n, "t1-v1"))
{
if (*s != '(')
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
*shadow_info = s;
}
else
diff --git a/agent/sexp-parse.h b/agent/sexp-parse.h
index 0bbc1d76a..338321f48 100644
--- a/agent/sexp-parse.h
+++ b/agent/sexp-parse.h
@@ -68,10 +68,10 @@ sskip (unsigned char const **buf, int *depth)
else
{
if (!d)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
n = snext (&s);
if (!n)
- return gpg_error (GPG_ERR_INVALID_SEXP);
+ return gpg_error (GPG_ERR_INV_SEXP);
s += n;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 23:42:32 +0000