diff options
| author | Pauli <paul.dale@oracle.com> | 2019-04-30 12:36:16 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-05-01 00:37:11 +0200 |
| commit | 39147079fc41b1af9a4e2974e89de20668e02aea (patch) | |
| tree | 3d37a1466917d0ee1a4bf41b38180fee72863f49 /providers | |
| parent | Replumbing: give the possibility for the provider to create a context (diff) | |
| download | openssl-39147079fc41b1af9a4e2974e89de20668e02aea.tar.xz openssl-39147079fc41b1af9a4e2974e89de20668e02aea.zip | |
Structure alignment macro.
Introduce a macro that allows all structure alignment tricks to be rolled up
into a single place.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8845)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/common/ciphers/ciphers_locl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/providers/common/ciphers/ciphers_locl.h b/providers/common/ciphers/ciphers_locl.h index a874bbf110..49248f099c 100644 --- a/providers/common/ciphers/ciphers_locl.h +++ b/providers/common/ciphers/ciphers_locl.h @@ -1,3 +1,4 @@ + /* * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,12 +10,13 @@ #include <openssl/aes.h> #include <openssl/modes.h> +#include "internal/cryptlib.h" typedef struct prov_aes_cipher_st PROV_AES_CIPHER; typedef struct prov_aes_key_st { union { - double align; + OSSL_UNION_ALIGN; AES_KEY ks; } ks; block128_f block; @@ -29,7 +31,7 @@ typedef struct prov_aes_key_st { #if defined(OPENSSL_CPUID_OBJ) && defined(__s390__) struct { union { - double align; + OSSL_UNION_ALIGN; /*- * KM-AES parameter block - begin * (see z/Architecture Principles of Operation >= SA22-7832-06) |