Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1624498
| Path | csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Karim Eshapa <karim.eshapa@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/2] staging:skein: skein_base.h, skein_block.h: move macros into appropriate header files |
| Date | Mon, 17 Apr 2017 03:40:02 +0200 |
| Message-ID | <tx3O2-2Cp-7@gated-at.bofh.it> (permalink) |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=IuFcIEHpzEXIP5ReiuatDI9hrgs0AnRZFs7OcydL/p0=; b=BNrZu8MhPysPYnR2VrZll2ZxgMEG7eHmFSuL/ZIkUiuWyGWbcidxhxlEom8S8oAGez aBIVJ/YU/Gwl9k7tc6VDzbszT99eiBrRYOiVFIuBwntSRiCZonLI94WQ5zl2QY+7YGFs DY/tsd7KGktuSeMn6lxyyUJTk2vTM76pv6UqOGT3qSXXUonAdRkoXhQfefh2K2Vfg485 0hCA3SwcP/FEo9kiTTOKIq33uKrb/aGIefsIgpKqRhIp2FS5M2OpUPjg55NIy+7LB4FX p79y93T22W5lrWT9PNsxvfr76AuC7xFEkFw4nyJwhmLpga5A3GU0Z7p9D8VmGgr2r2Uz mP1w== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IuFcIEHpzEXIP5ReiuatDI9hrgs0AnRZFs7OcydL/p0=; b=tdLVMA+m/TmFbwhd9wsuJgWSl6Ard00Ex9kcduQAX/z/gXjRusman8Gbrpx1+nzo2T avIj1n+OeSGqVnpTKLQjKWznKj1vFoCeE+mHqr5OmAYd3Du8ZNfShbHT2Bcek48vhgNz r9TUs+Nv6mCV+P0Bn7hyanIBqqzIlbPd1B/F8ff9Sfz04yX1mmTxGhe4nlJ2rdf084Da 7iKGtYVWIY0StuNx/CRKPsec7Ru2iSwJKXqsLrFW8TdysniP6rKEEzmVxXisqRzMlUsT xoT7cLqb3j6NfaZNdvaZB30Hx36X4+IjrSyDr78G9UIwuC4PAcdnwJhKqcgISj6PHAGK OUgw== |
| X-Gm-Message-State | AN3rC/6374xFe4WYGxsFArR+3dVUnrmF6aj9GhdCiTsfEpOrtGLOiD4s RFb+pTpnNFTGVA== |
| X-Received | by 10.223.172.165 with SMTP id o34mr7421910wrc.4.1492393022834; Sun, 16 Apr 2017 18:37:02 -0700 (PDT) |
| X-Mailer | git-send-email 2.7.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 88 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Karim Eshapa <karim.eshapa@gmail.com> |
| X-Original-Date | Mon, 17 Apr 2017 03:36:54 +0200 |
| X-Original-Message-ID | <1492393014-17598-1-git-send-email-karim.eshapa@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1624498 |
Show key headers only | View raw
Macros more related to BLK operations. Signed-off-by: Karim Eshapa <karim.eshapa@gmail.com> --- drivers/staging/skein/skein_base.h | 28 ---------------------------- drivers/staging/skein/skein_block.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/staging/skein/skein_base.h b/drivers/staging/skein/skein_base.h index cd794c1..a159a32 100644 --- a/drivers/staging/skein/skein_base.h +++ b/drivers/staging/skein/skein_base.h @@ -169,34 +169,6 @@ int skein_1024_output(struct skein_1024_ctx *ctx, u8 *hash_val); #define SKEIN_T1_TREE_LVL_MASK (((u64)0x7F) << SKEIN_T1_POS_TREE_LVL) #define SKEIN_T1_TREE_LEVEL(n) (((u64)(n)) << SKEIN_T1_POS_TREE_LVL) -/* tweak word tweak[1]: block type field */ -#define SKEIN_BLK_TYPE_KEY (0) /* key, for MAC and KDF */ -#define SKEIN_BLK_TYPE_CFG (4) /* configuration block */ -#define SKEIN_BLK_TYPE_PERS (8) /* personalization string */ -#define SKEIN_BLK_TYPE_PK (12) /* pubkey (for digital sigs) */ -#define SKEIN_BLK_TYPE_KDF (16) /* key identifier for KDF */ -#define SKEIN_BLK_TYPE_NONCE (20) /* nonce for PRNG */ -#define SKEIN_BLK_TYPE_MSG (48) /* message processing */ -#define SKEIN_BLK_TYPE_OUT (63) /* output stage */ -#define SKEIN_BLK_TYPE_MASK (63) /* bit field mask */ - -#define SKEIN_T1_BLK_TYPE(T) (((u64)(SKEIN_BLK_TYPE_##T)) << \ - SKEIN_T1_POS_BLK_TYPE) -#define SKEIN_T1_BLK_TYPE_KEY SKEIN_T1_BLK_TYPE(KEY) /* for MAC and KDF */ -#define SKEIN_T1_BLK_TYPE_CFG SKEIN_T1_BLK_TYPE(CFG) /* config block */ -#define SKEIN_T1_BLK_TYPE_PERS SKEIN_T1_BLK_TYPE(PERS) /* personalization */ -#define SKEIN_T1_BLK_TYPE_PK SKEIN_T1_BLK_TYPE(PK) /* pubkey (for sigs) */ -#define SKEIN_T1_BLK_TYPE_KDF SKEIN_T1_BLK_TYPE(KDF) /* key ident for KDF */ -#define SKEIN_T1_BLK_TYPE_NONCE SKEIN_T1_BLK_TYPE(NONCE)/* nonce for PRNG */ -#define SKEIN_T1_BLK_TYPE_MSG SKEIN_T1_BLK_TYPE(MSG) /* message processing */ -#define SKEIN_T1_BLK_TYPE_OUT SKEIN_T1_BLK_TYPE(OUT) /* output stage */ -#define SKEIN_T1_BLK_TYPE_MASK SKEIN_T1_BLK_TYPE(MASK) /* field bit mask */ - -#define SKEIN_T1_BLK_TYPE_CFG_FINAL (SKEIN_T1_BLK_TYPE_CFG | \ - SKEIN_T1_FLAG_FINAL) -#define SKEIN_T1_BLK_TYPE_OUT_FINAL (SKEIN_T1_BLK_TYPE_OUT | \ - SKEIN_T1_FLAG_FINAL) - #define SKEIN_VERSION (1) #ifndef SKEIN_ID_STRING_LE /* allow compile-time personalization */ diff --git a/drivers/staging/skein/skein_block.h b/drivers/staging/skein/skein_block.h index ec1baea..0dfceef 100644 --- a/drivers/staging/skein/skein_block.h +++ b/drivers/staging/skein/skein_block.h @@ -14,6 +14,34 @@ #include "skein_base.h" /* get the Skein API definitions */ +/* tweak word tweak[1]: block type field */ +#define SKEIN_BLK_TYPE_KEY (0) /* key, for MAC and KDF */ +#define SKEIN_BLK_TYPE_CFG (4) /* configuration block */ +#define SKEIN_BLK_TYPE_PERS (8) /* personalization string */ +#define SKEIN_BLK_TYPE_PK (12) /* pubkey (for digital sigs) */ +#define SKEIN_BLK_TYPE_KDF (16) /* key identifier for KDF */ +#define SKEIN_BLK_TYPE_NONCE (20) /* nonce for PRNG */ +#define SKEIN_BLK_TYPE_MSG (48) /* message processing */ +#define SKEIN_BLK_TYPE_OUT (63) /* output stage */ +#define SKEIN_BLK_TYPE_MASK (63) /* bit field mask */ + +#define SKEIN_T1_BLK_TYPE(T) (((u64)(SKEIN_BLK_TYPE_##T)) << \ + SKEIN_T1_POS_BLK_TYPE) +#define SKEIN_T1_BLK_TYPE_KEY SKEIN_T1_BLK_TYPE(KEY) /* for MAC and KDF */ +#define SKEIN_T1_BLK_TYPE_CFG SKEIN_T1_BLK_TYPE(CFG) /* config block */ +#define SKEIN_T1_BLK_TYPE_PERS SKEIN_T1_BLK_TYPE(PERS) /* personalization */ +#define SKEIN_T1_BLK_TYPE_PK SKEIN_T1_BLK_TYPE(PK) /* pubkey (for sigs) */ +#define SKEIN_T1_BLK_TYPE_KDF SKEIN_T1_BLK_TYPE(KDF) /* key ident for KDF */ +#define SKEIN_T1_BLK_TYPE_NONCE SKEIN_T1_BLK_TYPE(NONCE)/* nonce for PRNG */ +#define SKEIN_T1_BLK_TYPE_MSG SKEIN_T1_BLK_TYPE(MSG) /* message processing */ +#define SKEIN_T1_BLK_TYPE_OUT SKEIN_T1_BLK_TYPE(OUT) /* output stage */ +#define SKEIN_T1_BLK_TYPE_MASK SKEIN_T1_BLK_TYPE(MASK) /* field bit mask */ + +#define SKEIN_T1_BLK_TYPE_CFG_FINAL (SKEIN_T1_BLK_TYPE_CFG | \ + SKEIN_T1_FLAG_FINAL) +#define SKEIN_T1_BLK_TYPE_OUT_FINAL (SKEIN_T1_BLK_TYPE_OUT | \ + SKEIN_T1_FLAG_FINAL) + void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, size_t blk_cnt, size_t byte_cnt_add); void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr, -- 2.7.4
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH 2/2] staging:skein: skein_base.h, skein_block.h: move macros into appropriate header files Karim Eshapa <karim.eshapa@gmail.com> - 2017-04-17 03:40 +0200
csiph-web