aboutsummaryrefslogtreecommitdiff
path: root/openssl/trunk/crypto/x509v3/v3_addr.c
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2006-08-16 04:28:00 +0000
committerRob Austein <sra@hactrn.net>2006-08-16 04:28:00 +0000
commit3b0de4f4e2037f15b435bdfafe06abccd20389c6 (patch)
tree09cd6c19d323f1bb77cc5cedb82511feb29ff606 /openssl/trunk/crypto/x509v3/v3_addr.c
parentd181d180d712917504cd219aac2f7c1c44f41727 (diff)
Clean up compiler warnings
svn path=/openssl/trunk/crypto/x509v3/v3_addr.c; revision=158
Diffstat (limited to 'openssl/trunk/crypto/x509v3/v3_addr.c')
-rw-r--r--openssl/trunk/crypto/x509v3/v3_addr.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/openssl/trunk/crypto/x509v3/v3_addr.c b/openssl/trunk/crypto/x509v3/v3_addr.c
index 0355dda2..dfd77608 100644
--- a/openssl/trunk/crypto/x509v3/v3_addr.c
+++ b/openssl/trunk/crypto/x509v3/v3_addr.c
@@ -23,8 +23,13 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
+
+/* All of this just to pull in inet_ntop() and inet_pton(). Ick. */
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include "cryptlib.h"
#include <openssl/conf.h>
#include <openssl/asn1.h>
@@ -356,7 +361,7 @@ static int range_should_be_prefix(const unsigned char *min,
case 0x7F: j = 1; break;
default: return -1;
}
- if (min[i] & mask != 0 || max[i] & mask != mask)
+ if ((min[i] & mask) != 0 || (max[i] & mask) != mask)
return -1;
else
return i * 8 + j;