Take out __bounded__ in the include files we use it in when not on OpenBSD.

while we can take it out in portable at compile time, it is still a problem
when we install this header file on a system that doesn't support __bounded__
if this is unguarded.
ok miod@ bcook@

diff --git a/lib/libcrypto/bio/bio.h b/lib/libcrypto/bio/bio.h
index cc5ef61..59f916f 100644 (file)
--- a/lib/libcrypto/bio/bio.h
+++ b/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.24 2014/06/22 14:41:10 jsing Exp $ */
+/* $OpenBSD: bio.h,v 1.25 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,7 +58,9 @@
 
 #ifndef HEADER_BIO_H
 #define HEADER_BIO_H
-
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 #include <openssl/opensslconf.h>
 
 # include <stdio.h>

diff --git a/lib/libcrypto/buffer/buffer.h b/lib/libcrypto/buffer/buffer.h
index c3d140b..00759cf 100644 (file)
--- a/lib/libcrypto/buffer/buffer.h
+++ b/lib/libcrypto/buffer/buffer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.h,v 1.11 2014/06/24 19:37:58 miod Exp $ */
+/* $OpenBSD: buffer.h,v 1.12 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,6 +58,9 @@
 
 #ifndef HEADER_BUFFER_H
 #define HEADER_BUFFER_H
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 
 #include <openssl/ossl_typ.h>
 

diff --git a/lib/libcrypto/md5/md5.h b/lib/libcrypto/md5/md5.h
index 98bdbc7..6f50e7f 100644 (file)
--- a/lib/libcrypto/md5/md5.h
+++ b/lib/libcrypto/md5/md5.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5.h,v 1.17 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: md5.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,6 +60,9 @@
 
 #ifndef HEADER_MD5_H
 #define HEADER_MD5_H
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 
 #include <openssl/opensslconf.h>
 

diff --git a/lib/libcrypto/sha/sha.h b/lib/libcrypto/sha/sha.h
index c2e303f..d227ae4 100644 (file)
--- a/lib/libcrypto/sha/sha.h
+++ b/lib/libcrypto/sha/sha.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha.h,v 1.17 2014/07/10 22:45:58 jsing Exp $ */
+/* $OpenBSD: sha.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,6 +60,9 @@
 
 #ifndef HEADER_SHA_H
 #define HEADER_SHA_H
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 
 #include <openssl/opensslconf.h>
 

diff --git a/lib/libssl/src/crypto/bio/bio.h b/lib/libssl/src/crypto/bio/bio.h
index cc5ef61..59f916f 100644 (file)
--- a/lib/libssl/src/crypto/bio/bio.h
+++ b/lib/libssl/src/crypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.24 2014/06/22 14:41:10 jsing Exp $ */
+/* $OpenBSD: bio.h,v 1.25 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,7 +58,9 @@
 
 #ifndef HEADER_BIO_H
 #define HEADER_BIO_H
-
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 #include <openssl/opensslconf.h>
 
 # include <stdio.h>

diff --git a/lib/libssl/src/crypto/buffer/buffer.h b/lib/libssl/src/crypto/buffer/buffer.h
index c3d140b..00759cf 100644 (file)
--- a/lib/libssl/src/crypto/buffer/buffer.h
+++ b/lib/libssl/src/crypto/buffer/buffer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.h,v 1.11 2014/06/24 19:37:58 miod Exp $ */
+/* $OpenBSD: buffer.h,v 1.12 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,6 +58,9 @@
 
 #ifndef HEADER_BUFFER_H
 #define HEADER_BUFFER_H
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 
 #include <openssl/ossl_typ.h>
 

diff --git a/lib/libssl/src/crypto/md5/md5.h b/lib/libssl/src/crypto/md5/md5.h
index 98bdbc7..6f50e7f 100644 (file)
--- a/lib/libssl/src/crypto/md5/md5.h
+++ b/lib/libssl/src/crypto/md5/md5.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5.h,v 1.17 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: md5.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,6 +60,9 @@
 
 #ifndef HEADER_MD5_H
 #define HEADER_MD5_H
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 
 #include <openssl/opensslconf.h>
 

diff --git a/lib/libssl/src/crypto/sha/sha.h b/lib/libssl/src/crypto/sha/sha.h
index c2e303f..d227ae4 100644 (file)
--- a/lib/libssl/src/crypto/sha/sha.h
+++ b/lib/libssl/src/crypto/sha/sha.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha.h,v 1.17 2014/07/10 22:45:58 jsing Exp $ */
+/* $OpenBSD: sha.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,6 +60,9 @@
 
 #ifndef HEADER_SHA_H
 #define HEADER_SHA_H
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__)
+#define __bounded__(x, y, z)
+#endif
 
 #include <openssl/opensslconf.h>