summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-09 02:12:56 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-09 02:12:56 +0000
commit099a902cee5aae6c580eca431868d21b5a2efdaa (patch)
tree74f6fd03184135c5e862d138b339e8b4a0d5460b
parent2439e8f755866486c809af0482589d2337018d37 (diff)
use strchr() instead of index()
-rw-r--r--lib/libkeynote/keynote-verify.c4
-rw-r--r--lib/libkeynote/signature.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libkeynote/keynote-verify.c b/lib/libkeynote/keynote-verify.c
index f6a0ce75eca..b1f2d75635d 100644
--- a/lib/libkeynote/keynote-verify.c
+++ b/lib/libkeynote/keynote-verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-verify.c,v 1.10 2001/09/03 20:14:51 deraadt Exp $ */
+/* $OpenBSD: keynote-verify.c,v 1.11 2002/06/09 02:12:55 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -200,7 +200,7 @@ keynote_verify(int argc, char *argv[])
sn = 1;
for (numret = 0;
- (ptr = index(optarg, ',')) != (char *) NULL;
+ (ptr = strchr(optarg, ',')) != (char *) NULL;
numret++)
{
/* Running out of memory */
diff --git a/lib/libkeynote/signature.c b/lib/libkeynote/signature.c
index d3bc73fe8a3..25970520dfb 100644
--- a/lib/libkeynote/signature.c
+++ b/lib/libkeynote/signature.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signature.c,v 1.12 2002/05/27 06:29:14 deraadt Exp $ */
+/* $OpenBSD: signature.c,v 1.13 2002/06/09 02:12:55 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -447,7 +447,7 @@ kn_decode_key(struct keynote_deckey *dc, char *key, int keytype)
return 0;
}
- key = index(key, ':'); /* Move forward, to the Encoding. We're guaranteed
+ key = strchr(key, ':'); /* Move forward, to the Encoding. We're guaranteed
* to have a ':' character, since this is a key */
key++;
@@ -775,7 +775,7 @@ keynote_sigverify_assertion(struct assertion *as)
(as->as_signeralgorithm == KEYNOTE_ALGORITHM_RSA)))
return SIGRESULT_FALSE;
- sig = index(as->as_signature, ':'); /* Move forward to the Encoding. We
+ sig = strchr(as->as_signature, ':'); /* Move forward to the Encoding. We
* are guaranteed to have a ':'
* character, since this is a valid
* signature */
@@ -960,7 +960,7 @@ keynote_sign_assertion(struct assertion *as, char *sigalg, void *key,
return (char *) NULL;
}
- sig = index(sigalg, ':');
+ sig = strchr(sigalg, ':');
if (sig == (unsigned char *) NULL)
{
keynote_errno = ERROR_SYNTAX;