Skip to content

Commit

Permalink
Structure alignment macro.
Browse files Browse the repository at this point in the history 
Introduce a macro that allows all structure alignment tricks to be rolled up
into a single place.

Reviewed-by: Richard Levitte <[email protected]>
(Merged from openssl#8845)
  • Loading branch information
@paulidale
paulidale committed Apr 30, 2019
1 parent a39eb84 commit 3914707
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 26 deletions.
25 changes: 13 additions & 12 deletions crypto/evp/e_aes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
#include <assert.h>
#include <openssl/aes.h>
#include "internal/evp_int.h"
#include "internal/cryptlib.h"
#include "modes_lcl.h"
#include <openssl/rand.h>
#include <openssl/cmac.h>
#include "evp_locl.h"

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
AES_KEY ks;
} ks;
block128_f block;
Expand All @@ -34,7 +35,7 @@ typedef struct {

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
AES_KEY ks;
} ks; /* AES key schedule to use */
int key_set; /* Set if key initialised */
Expand All @@ -52,7 +53,7 @@ typedef struct {

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
AES_KEY ks;
} ks1, ks2; /* AES key schedules to use */
XTS128_CONTEXT xts;
Expand All @@ -64,7 +65,7 @@ typedef struct {

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
AES_KEY ks;
} ks; /* AES key schedule to use */
int key_set; /* Set if key initialised */
Expand All @@ -80,11 +81,11 @@ typedef struct {
#ifndef OPENSSL_NO_OCB
typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
AES_KEY ks;
} ksenc; /* AES key schedule to use for encryption */
union {
double align;
OSSL_UNION_ALIGN;
AES_KEY ks;
} ksdec; /* AES key schedule to use for decryption */
int key_set; /* Set if key initialised */
Expand Down Expand Up @@ -1008,7 +1009,7 @@ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
/*-
* KM-AES parameter block - begin
* (see z/Architecture Principles of Operation >= SA22-7832-06)
Expand All @@ -1023,7 +1024,7 @@ typedef struct {

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
/*-
* KMO-AES parameter block - begin
* (see z/Architecture Principles of Operation >= SA22-7832-08)
Expand All @@ -1041,7 +1042,7 @@ typedef struct {

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
/*-
* KMF-AES parameter block - begin
* (see z/Architecture Principles of Operation >= SA22-7832-08)
Expand All @@ -1059,7 +1060,7 @@ typedef struct {

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
/*-
* KMA-GCM-AES parameter block - begin
* (see z/Architecture Principles of Operation >= SA22-7832-11)
Expand Down Expand Up @@ -1108,7 +1109,7 @@ typedef struct {

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
/*-
* Padding is chosen so that ccm.kmac_param.k overlaps with key.k and
* ccm.fc with key.k.rounds. Remember that on s390x, an AES_KEY's
Expand Down Expand Up @@ -3853,7 +3854,7 @@ BLOCK_CIPHER_custom(NID_aes, 128, 1, 12, ccm, CCM,

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
AES_KEY ks;
} ks;
/* Indicates if IV has been set */
Expand Down
6 changes: 3 additions & 3 deletions crypto/evp/e_aria.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
Expand Down Expand Up @@ -27,7 +27,7 @@ typedef struct {
/* ARIA GCM context */
typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
ARIA_KEY ks;
} ks; /* ARIA subkey to use */
int key_set; /* Set if key initialised */
Expand All @@ -43,7 +43,7 @@ typedef struct {
/* ARIA CCM context */
typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
ARIA_KEY ks;
} ks; /* ARIA key schedule to use */
int key_set; /* Set if key initialised */
Expand Down
4 changes: 2 additions & 2 deletions crypto/evp/e_chacha20_poly1305.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand All @@ -20,7 +20,7 @@

typedef struct {
union {
double align; /* this ensures even sizeof(EVP_CHACHA_KEY)%8==0 */
OSSL_UNION_ALIGN; /* this ensures even sizeof(EVP_CHACHA_KEY)%8==0 */
unsigned int d[CHACHA_KEY_SIZE / 4];
} key;
unsigned int counter[CHACHA_CTR_SIZE / 4];
Expand Down
4 changes: 2 additions & 2 deletions crypto/evp/e_des.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand All @@ -18,7 +18,7 @@

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
DES_key_schedule ks;
} ks;
union {
Expand Down
4 changes: 2 additions & 2 deletions crypto/evp/e_des3.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand All @@ -19,7 +19,7 @@

typedef struct {
union {
double align;
OSSL_UNION_ALIGN;
DES_key_schedule ks[3];
} ks;
union {
Expand Down
12 changes: 11 additions & 1 deletion include/internal/cryptlib.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down Expand Up @@ -42,6 +42,16 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,

#endif

/*
* Use this inside a union with the field that needs to be aligned to a
* reasonable boundary for the platform. The most pessimistic alignment
* of the listed types will be used by the compiler.
*/
# define OSSL_UNION_ALIGN \
double align; \
ossl_uintmax_t align_int; \
void *align_ptr

typedef struct ex_callback_st EX_CALLBACK;

DEFINE_STACK_OF(EX_CALLBACK)
Expand Down
6 changes: 4 additions & 2 deletions providers/common/ciphers/ciphers_locl.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/*
* Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
*
Expand All @@ -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;
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ssl/s3_cbc.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2012-2019 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down Expand Up @@ -136,7 +136,7 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
size_t mac_secret_length, char is_sslv3)
{
union {
double align;
OSSL_UNION_ALIGN;
unsigned char c[sizeof(LARGEST_DIGEST_CTX)];
} md_state;
void (*md_final_raw) (void *ctx, unsigned char *md_out);
Expand Down

0 comments on commit 3914707

Please sign in to comment.