Commit f645290f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix warnings. Only use fipscanister.o if fips enabled.

parent 9b95537a

crypto/x509v3/v3_addr.c

+6 −6
Original line number Diff line number Diff line
@@ -594,10 +594,10 @@ static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr, 
    return NULL;

  switch (afi) {

  case IANA_AFI_IPV4:

    sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp);

    (void)sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp);

    break;

  case IANA_AFI_IPV6:

    sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp);

    (void)sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp);

    break;

  }

  f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges;
@@ -854,7 +854,7 @@ static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors, 
      if (!make_addressRange(&merged, a_min, b_max, length))

	return 0;

      sk_IPAddressOrRange_set(aors, i, merged);

      sk_IPAddressOrRange_delete(aors, i + 1);

      (void)sk_IPAddressOrRange_delete(aors, i + 1);

      IPAddressOrRange_free(a);

      IPAddressOrRange_free(b);

      --i;
@@ -1122,7 +1122,7 @@ int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b) 
    return 1;

  if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b))

    return 0;

  sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp);

  (void)sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp);

  for (i = 0; i < sk_IPAddressFamily_num(a); i++) {

    IPAddressFamily *fa = sk_IPAddressFamily_value(a, i);

    int j = sk_IPAddressFamily_find(b, fa);
@@ -1183,7 +1183,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx, 
  }

  if (!v3_addr_is_canonical(ext))

    validation_err(X509_V_ERR_INVALID_EXTENSION);

  sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp);

  (void)sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp);

  if ((child = sk_IPAddressFamily_dup(ext)) == NULL) {

    X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE);

    ret = 0;
@@ -1209,7 +1209,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx, 
      }

      continue;

    }

    sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp);

    (void)sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp);

    for (j = 0; j < sk_IPAddressFamily_num(child); j++) {

      IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);

      int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);

crypto/x509v3/v3_asid.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

fips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ links: 


# lib: and $(LIB): are splitted to avoid end-less loop

lib:	$(LIB)

	if [ "$(FIPSCANISTERINTERNAL)" = "n" ]; then $(AR) ../$(FIPSCANLIB).a $(FIPSCANLOC); fi

	if [ "$(FIPSCANISTERINTERNAL)" = "n" -a -n "$(FIPSCANLON)"]; then $(AR) ../$(FIPSCANLIB).a $(FIPSCANLOC); fi

	@touch lib



$(LIB):	$(FIPSLIBDIR)fipscanister.o