summaryrefslogtreecommitdiff
path: root/key.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
committerColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
commitdd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch)
treec59b4dbcc610f10700945f885adf3bddc2542c26 /key.c
parent8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff)
parentb9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff)
merge 6.0p1
Diffstat (limited to 'key.c')
-rw-r--r--key.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/key.c b/key.c
index fc65c2948..3a652b9af 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.97 2011/05/17 07:13:31 djm Exp $ */ 1/* $OpenBSD: key.c,v 1.98 2011/10/18 04:58:26 djm Exp $ */
2/* 2/*
3 * read_bignum(): 3 * read_bignum():
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1360,11 +1360,6 @@ cert_parse(Buffer *b, Key *key, const u_char *blob, u_int blen)
1360 goto out; 1360 goto out;
1361 } 1361 }
1362 1362
1363 if (kidlen != strlen(key->cert->key_id)) {
1364 error("%s: key ID contains \\0 character", __func__);
1365 goto out;
1366 }
1367
1368 /* Signature is left in the buffer so we can calculate this length */ 1363 /* Signature is left in the buffer so we can calculate this length */
1369 signed_len = buffer_len(&key->cert->certblob) - buffer_len(b); 1364 signed_len = buffer_len(&key->cert->certblob) - buffer_len(b);
1370 1365