Commit 2a7de0fd authored by Jeffrey Walton's avatar Jeffrey Walton Committed by Matt Caswell
Browse files

Fixes to get -ansi working 



Various fixes to get the following to compile:

./config no-asm -ansi -D_DEFAULT_SOURCE

RT4479
RT4480

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent e417070c

crypto/async/arch/async_posix.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ typedef struct async_fibre_st { 
    int env_init;

} async_fibre;



static inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, int r)

static ossl_inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, int r)

{

    o->env_init = 1;

engines/afalg/e_afalg.c

+8 −8
Original line number Diff line number Diff line
@@ -94,27 +94,27 @@ static int afalg_cipher_nids[] = { 


static EVP_CIPHER *_hidden_aes_128_cbc = NULL;



static inline int io_setup(unsigned n, aio_context_t *ctx)

static ossl_inline int io_setup(unsigned n, aio_context_t *ctx)

{

    return syscall(__NR_io_setup, n, ctx);

}



static inline int eventfd(int n)

static ossl_inline int eventfd(int n)

{

    return syscall(__NR_eventfd, n);

}



static inline int io_destroy(aio_context_t ctx)

static ossl_inline int io_destroy(aio_context_t ctx)

{

    return syscall(__NR_io_destroy, ctx);

}



static inline int io_read(aio_context_t ctx, long n, struct iocb **iocb)

static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb)

{

    return syscall(__NR_io_submit, ctx, n, iocb);

}



static inline int io_getevents(aio_context_t ctx, long min, long max,

static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,

                               struct io_event *events,

                               struct timespec *timeout)

{
@@ -230,7 +230,7 @@ int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf, 
    memset(cb, '\0', sizeof(*cb));

    cb->aio_fildes = sfd;

    cb->aio_lio_opcode = IOCB_CMD_PREAD;

    cb->aio_buf = (unsigned long)buf;

    cb->aio_buf = (uint64_t)buf;

    cb->aio_offset = 0;

    cb->aio_data = 0;

    cb->aio_nbytes = len;
@@ -310,7 +310,7 @@ int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf, 
    return 1;

}



static inline void afalg_set_op_sk(struct cmsghdr *cmsg,

static ossl_inline void afalg_set_op_sk(struct cmsghdr *cmsg,

                                   const unsigned int op)

{

    cmsg->cmsg_level = SOL_ALG;
@@ -332,7 +332,7 @@ static void afalg_set_iv_sk(struct cmsghdr *cmsg, const unsigned char *iv, 
    memcpy(aiv->iv, iv, len);

}



static inline int afalg_set_key(afalg_ctx *actx, const unsigned char *key,

static ossl_inline int afalg_set_key(afalg_ctx *actx, const unsigned char *key,

                                const int klen)

{

    int ret;

include/openssl/e_os2.h

+5 −1
Original line number Diff line number Diff line
@@ -219,7 +219,11 @@ extern "C" { 


# ifndef ossl_ssize_t

#  define ossl_ssize_t ssize_t

#  if defined(SSIZE_MAX)

#   define OSSL_SSIZE_MAX SSIZE_MAX

#  elif defined(_POSIX_SSIZE_MAX)

#   define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX

#  endif

# endif



# ifdef DEBUG_UNUSED

test/ssltest_old.c

+6 −2
Original line number Diff line number Diff line
@@ -40,8 +40,12 @@ 
 */



/* Or gethostname won't be declared properly on Linux and GNU platforms. */

#ifndef _BSD_SOURCE

# define _BSD_SOURCE 1

#endif

#ifndef _DEFAULT_SOURCE

# define _DEFAULT_SOURCE 1

#endif



#include <assert.h>

#include <errno.h>