Moved some variable declarations inside blocks where they are needed

[openssl.git] / crypto / x509v3 / v3_akey.c

diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c
index 7d54d0c235f2c030d7347a4b561d845557321fde..72b023281f3cfd11098a61ea30b17b92727f1c2b 100644 (file)
--- a/crypto/x509v3/v3_akey.c
+++ b/crypto/x509v3/v3_akey.c
@@ -58,22 +58,14 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "conf.h"
-#include "asn1.h"
-#include "asn1_mac.h"
-#include "x509v3.h"
+#include <openssl/conf.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/x509v3.h>
 
-#ifndef NOPROTO
 static STACK *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, AUTHORITY_KEYID *akeyid, STACK *extlist);
 static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *values);
 
-#else
-
-static STACK *i2v_AUTHORITY_KEYID();
-static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID();
-
-#endif
-
 X509V3_EXT_METHOD v3_akey_id = {
 NID_authority_key_identifier, X509V3_EXT_MULTILINE,
 (X509V3_EXT_NEW)AUTHORITY_KEYID_new,
@@ -88,11 +80,6 @@ NULL
 };
 
 
-/*
- * ASN1err(ASN1_F_AUTHORITY_KEYID_NEW,ERR_R_MALLOC_FAILURE);
- * ASN1err(ASN1_F_D2I_AUTHORITY_KEYID,ERR_R_MALLOC_FAILURE);
- */
-
 int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp)
 {
        M_ASN1_I2D_vars(a);
@@ -141,7 +128,7 @@ void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a)
 {
        if (a == NULL) return;
        ASN1_OCTET_STRING_free(a->keyid);
-       sk_pop_free(a->issuer, GENERAL_NAME_free);
+       sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free);
        ASN1_INTEGER_free (a->serial);
        Free ((char *)a);
 }
@@ -182,7 +169,7 @@ int i;
 CONF_VALUE *cnf;
 ASN1_OCTET_STRING *ikeyid = NULL;
 X509_NAME *isname = NULL;
-STACK * gens = NULL;
+STACK_OF(GENERAL_NAME) * gens = NULL;
 GENERAL_NAME *gen = NULL;
 ASN1_INTEGER *serial = NULL;
 X509_EXTENSION *ext;
@@ -216,7 +203,7 @@ cert = ctx->issuer_cert;
 if(keyid) {
        i = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1);
        if((i >= 0)  && (ext = X509_get_ext(cert, i)))
-                       ikeyid = (ASN1_OCTET_STRING *) X509V3_EXT_d2i(ext);
+                                                ikeyid = X509V3_EXT_d2i(ext);
        if(keyid==2 && !ikeyid) {
                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);
                return NULL;
@@ -235,8 +222,8 @@ if((issuer && !ikeyid) || (issuer == 2)) {
 if(!(akeyid = AUTHORITY_KEYID_new())) goto err;
 
 if(isname) {
-       if(!(gens = sk_new(NULL)) || !(gen = GENERAL_NAME_new())
-               || !sk_push(gens, (char *)gen)) {
+       if(!(gens = sk_GENERAL_NAME_new(NULL)) || !(gen = GENERAL_NAME_new())
+               || !sk_GENERAL_NAME_push(gens, gen)) {
                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,ERR_R_MALLOC_FAILURE);
                goto err;
        }