summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2006-09-18 09:15:12 +0000
committerSimon Josefsson <simon@josefsson.org>2006-09-18 09:15:12 +0000
commit7a59114d5867b0d3a5a132206be33364a9d41251 (patch)
tree2c85b4446ae38a2029ab7b76cd01c2feeb3e33c4
parentbd6092b9b7c993ae29a85196d3588b532707fe8a (diff)
downloadgnutls-7a59114d5867b0d3a5a132206be33364a9d41251.tar.gz
(keydb_idx_search): Don't return CDK_EOF if key is found at offset 0.
Suggested by "Adam Langley" <alangley@gmail.com>.
-rw-r--r--libextra/opencdk/keydb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libextra/opencdk/keydb.c b/libextra/opencdk/keydb.c
index 010c7d77c0..a11543c4b4 100644
--- a/libextra/opencdk/keydb.c
+++ b/libextra/opencdk/keydb.c
@@ -1,5 +1,6 @@
/* -*- Mode: C; c-file-style: "bsd" -*-
* keydb.c - Key database routines
+ * Copyright (C) 2006 Free Software Foundation, Inc.
* Copyright (C) 2002, 2003 Timo Schulz
*
* This file is part of OpenCDK.
@@ -206,7 +207,7 @@ keydb_idx_search( cdk_stream_t inp, u32 * keyid,
if( (keyid && fpr) || (!keyid && !fpr) )
return CDK_Inv_Mode;
- *r_off = 0;
+ *r_off = 0xFFFFFFFF;
cdk_stream_seek( inp, 0 );
while( keydb_idx_parse( inp, &idx ) != CDK_EOF ) {
if( keyid && KEYID_CMP( keyid, idx->keyid ) ) {
@@ -221,7 +222,7 @@ keydb_idx_search( cdk_stream_t inp, u32 * keyid,
idx = NULL;
}
cdk_free( idx );
- return *r_off? 0 : CDK_EOF;
+ return *r_off != 0xFFFFFFFF ? 0 : CDK_EOF;
}