summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib/krb5/pkinit.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-05-08 23:30:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:45 -0500
commitbfff6b0e640b3b3456ec1d9d26da0bd80a08585f (patch)
tree5c4b3154252464e0dc12f8cda6f109b98493724f /source4/heimdal/lib/krb5/pkinit.c
parentd4b8cb0bb502f6daf0ddf93837779e0a805af7d7 (diff)
downloadsamba-bfff6b0e640b3b3456ec1d9d26da0bd80a08585f.tar.gz
samba-bfff6b0e640b3b3456ec1d9d26da0bd80a08585f.tar.bz2
samba-bfff6b0e640b3b3456ec1d9d26da0bd80a08585f.zip
r15515: Syncronsise with current lorikeet-heimdal.
Andrew Bartlett (This used to be commit 0132312124260f74001546a34ff96db89d72b7f6)
Diffstat (limited to 'source4/heimdal/lib/krb5/pkinit.c')
-rwxr-xr-xsource4/heimdal/lib/krb5/pkinit.c32
1 files changed, 5 insertions, 27 deletions
diff --git a/source4/heimdal/lib/krb5/pkinit.c b/source4/heimdal/lib/krb5/pkinit.c
index 7e91946095..00f7b4ebd9 100755
--- a/source4/heimdal/lib/krb5/pkinit.c
+++ b/source4/heimdal/lib/krb5/pkinit.c
@@ -33,7 +33,7 @@
#include "krb5_locl.h"
-RCSID("$Id: pkinit.c,v 1.98 2006/05/06 13:24:54 lha Exp $");
+RCSID("$Id: pkinit.c,v 1.99 2006/05/07 12:32:38 lha Exp $");
struct krb5_dh_moduli {
char *name;
@@ -682,32 +682,10 @@ _krb5_pk_verify_sign(krb5_context context,
goto out;
}
- /* XXX */
- {
- hx509_cursor cursor;
-
- ret = hx509_certs_start_seq(id->hx509ctx,
- signer_certs,
- &cursor);
- if (ret) {
- krb5_clear_error_string(context);
- goto out;
- }
- ret = hx509_certs_next_cert(id->hx509ctx,
- signer_certs,
- cursor,
- &(*signer)->cert);
- if (ret) {
- krb5_clear_error_string(context);
- goto out;
- }
- ret = hx509_certs_end_seq(id->hx509ctx,
- signer_certs,
- cursor);
- if (ret) {
- krb5_clear_error_string(context);
- goto out;
- }
+ ret = hx509_get_one_cert(id->hx509ctx, signer_certs, &(*signer)->cert);
+ if (ret) {
+ krb5_clear_error_string(context);
+ goto out;
}
out: