From c0fcc970206eb1b346c0f3eb1def5f743b2b8977 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mon, 27 Sep 2010 19:21:38 -0400 Subject: [PATCH 005/150] - a couple of ordering tweaks --- src/plugins/preauth/pkinit/pkinit_crypto_nss.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c index c25148b..95e4133 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c @@ -763,23 +763,26 @@ create_issuerAndSerial(krb5_context context, struct issuer_and_serial_number isn; SECItem item; + /* Check if we have selected an identity cert. */ + if (id_cryptoctx->cert == NULL) { + return ENOENT; + } + pool = PORT_NewArena(sizeof(double)); if (pool == NULL) { return ENOMEM; } - if (id_cryptoctx->cert == NULL) { - return ENOENT; - } + /* Encode the issuer/serial. */ isn.issuer = id_cryptoctx->cert->derIssuer; isn.serial = id_cryptoctx->cert->serialNumber; - if (SEC_ASN1EncodeItem(id_cryptoctx->cert->arena, &item, &isn, issuer_and_serial_number_template) != &item) { PORT_FreeArena(pool, PR_TRUE); return ENOMEM; } + /* Export the value. */ if (secitem_to_buf_len(&item, kdcId_buf, kdcId_len) != 0) { PORT_FreeArena(pool, PR_TRUE); return ENOMEM; -- 1.7.6.4