merge 6.0p1

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 @@
-/* $OpenBSD: key.c,v 1.97 2011/05/17 07:13:31 djm Exp $ */
+/* $OpenBSD: key.c,v 1.98 2011/10/18 04:58:26 djm Exp $ */
 /*
  * read_bignum():
  * 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)
                 goto out;
         }
 
-        if (kidlen != strlen(key->cert->key_id)) {
-                error("%s: key ID contains \\0 character", __func__);
-                goto out;
-        }
-
         /* Signature is left in the buffer so we can calculate this length */
         signed_len = buffer_len(&key->cert->certblob) - buffer_len(b);