Skip to content

Commit

Permalink
Neuter the bounded attribute as was done elsewhere for portable
Browse files Browse the repository at this point in the history
  • Loading branch information
@botovq
botovq committed Jun 1, 2024
1 parent e5347f4 commit 65010fa
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
6 changes: 5 additions & 1 deletion lib/libcrypto/chacha/chacha-merged.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: chacha-merged.c,v 1.11 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: chacha-merged.c,v 1.12 2024/06/01 17:56:44 tb Exp $ */
/*
chacha-merged.c version 20080118
D. J. Bernstein
Expand All @@ -7,6 +7,10 @@ Public domain.

#include <stdint.h>

#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
#define __bounded__(x, y, z)
#endif

#define CHACHA_MINKEYLEN 16
#define CHACHA_NONCELEN 8
#define CHACHA_CTRLEN 8
Expand Down
6 changes: 5 additions & 1 deletion lib/libcrypto/md4/md4.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: md4.h,v 1.19 2024/06/01 07:44:11 tb Exp $ */
/* $OpenBSD: md4.h,v 1.20 2024/06/01 17:56:44 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
Expand Down Expand Up @@ -61,6 +61,10 @@
#ifndef HEADER_MD4_H
#define HEADER_MD4_H

#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
#define __bounded__(x, y, z)
#endif

#include <openssl/opensslconf.h>

#ifdef __cplusplus
Expand Down
6 changes: 5 additions & 1 deletion lib/libcrypto/ripemd/ripemd.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: ripemd.h,v 1.17 2024/06/01 07:44:11 tb Exp $ */
/* $OpenBSD: ripemd.h,v 1.18 2024/06/01 17:56:44 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
Expand Down Expand Up @@ -61,6 +61,10 @@
#ifndef HEADER_RIPEMD_H
#define HEADER_RIPEMD_H

#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
#define __bounded__(x, y, z)
#endif

#include <openssl/opensslconf.h>

#ifdef __cplusplus
Expand Down
6 changes: 5 additions & 1 deletion lib/libcrypto/whrlpool/whrlpool.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/* $OpenBSD: whrlpool.h,v 1.7 2024/06/01 07:44:11 tb Exp $ */
/* $OpenBSD: whrlpool.h,v 1.8 2024/06/01 17:56:44 tb Exp $ */

#include <stddef.h>

#ifndef HEADER_WHRLPOOL_H
#define HEADER_WHRLPOOL_H

#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
#define __bounded__(x, y, z)
#endif

#include <openssl/opensslconf.h>

#ifdef __cplusplus
Expand Down

0 comments on commit 65010fa

Please sign in to comment.