Fix from 1.0.0-stable.

[oweals/openssl.git] / crypto / x509v3 / v3_asid.c

diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c
index 3f02d8de6c2c6b6f7079385fac5762dd7632e5e4..abd497ed1fd4262e744b53b72169a589c8ff5d30 100644 (file)
--- a/crypto/x509v3/v3_asid.c
+++ b/crypto/x509v3/v3_asid.c
@@ -70,7 +70,7 @@
 #include <openssl/x509.h>
 #include <openssl/bn.h>
 
-#ifdef OPENSSL_RFC3779
+#ifndef OPENSSL_NO_RFC3779
 
 /*
  * OpenSSL ASN.1 template translation of RFC 3779 3.2.3.
@@ -466,7 +466,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
        break;
       }
       ASIdOrRange_free(b);
-      sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);
+      (void)sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);
       i--;
       continue;
     }
@@ -608,7 +608,7 @@ static void *v2i_ASIdentifiers(struct v3_ext_method *method,
 /*
  * OpenSSL dispatch.
  */
-X509V3_EXT_METHOD v3_asid = {
+const X509V3_EXT_METHOD v3_asid = {
   NID_sbgp_autonomousSysNum,   /* nid */
   0,                           /* flags */
   ASN1_ITEM_ref(ASIdentifiers),        /* template */
@@ -839,4 +839,4 @@ int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
   return v3_asid_validate_path_internal(NULL, chain, ext);
 }
 
-#endif /* OPENSSL_RFC3779 */
+#endif /* OPENSSL_NO_RFC3779 */