[prev in list] [next in list] [prev in thread] [next in thread]
List: openssl-cvs
Subject: [CVS] OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/crypto/x509v3/ v3_ad...
From: "Dr. Stephen Henson" <steve () openssl ! org>
Date: 2007-12-31 12:56:43
Message-ID: 20071231125643.5F5A31EAE844 () master ! openssl ! org
[Download RAW message or body]
OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________
Server: cvs.openssl.org Name: Dr. Stephen Henson
Root: /v/openssl/cvs Email: steve@openssl.org
Module: openssl Date: 31-Dec-2007 13:56:43
Branch: OpenSSL-fips-0_9_8-stable Handle: 2007123112564200
Modified files: (Branch: OpenSSL-fips-0_9_8-stable)
openssl/crypto/x509v3 v3_addr.c v3_asid.c
openssl/fips Makefile
Log:
Fix warnings. Only use fipscanister.o if fips enabled.
Summary:
Revision Changes Path
1.1.2.5.2.1 +6 -6 openssl/crypto/x509v3/v3_addr.c
1.1.2.3.2.1 +1 -1 openssl/crypto/x509v3/v3_asid.c
1.1.6.5 +1 -1 openssl/fips/Makefile
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openssl/crypto/x509v3/v3_addr.c
============================================================================
$ cvs diff -u -r1.1.2.5 -r1.1.2.5.2.1 v3_addr.c
--- openssl/crypto/x509v3/v3_addr.c 21 Jan 2007 13:16:46 -0000 1.1.2.5
+++ openssl/crypto/x509v3/v3_addr.c 31 Dec 2007 12:56:42 -0000 1.1.2.5.2.1
@@ -594,10 +594,10 @@
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 @@
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 @@
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 @@
}
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 @@
}
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);
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/x509v3/v3_asid.c
============================================================================
$ cvs diff -u -r1.1.2.3 -r1.1.2.3.2.1 v3_asid.c
--- openssl/crypto/x509v3/v3_asid.c 21 Jan 2007 13:16:46 -0000 1.1.2.3
+++ openssl/crypto/x509v3/v3_asid.c 31 Dec 2007 12:56:42 -0000 1.1.2.3.2.1
@@ -466,7 +466,7 @@
break;
}
ASIdOrRange_free(b);
- sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);
+ (void)sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);
i--;
continue;
}
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/Makefile
============================================================================
$ cvs diff -u -r1.1.6.4 -r1.1.6.5 Makefile
--- openssl/fips/Makefile 26 Dec 2007 18:58:10 -0000 1.1.6.4
+++ openssl/fips/Makefile 31 Dec 2007 12:56:42 -0000 1.1.6.5
@@ -139,7 +139,7 @@
# 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
@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@openssl.org
Automated List Manager majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic