History

Merge git://github.com/herbertx/crypto

* git://github.com/herbertx/crypto: (48 commits) crypto: user - Depend on NET instead of selecting it crypto: user - Add dependency on NET crypto: talitos - handle descriptor not found in error path crypto: user - Initialise match in crypto_alg_match crypto: testmgr - add twofish tests crypto: testmgr - add blowfish test-vectors crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT crypto: twofish-x86_64-3way - fix ctr blocksize to 1 crypto: blowfish-x86_64 - fix ctr blocksize to 1 crypto: whirlpool - count rounds from 0 crypto: Add userspace report for compress type algorithms crypto: Add userspace report for cipher type algorithms crypto: Add userspace report for rng type algorithms crypto: Add userspace report for pcompress type algorithms crypto: Add userspace report for nivaead type algorithms crypto: Add userspace report for aead type algorithms crypto: Add userspace report for givcipher type algorithms crypto: Add userspace report for ablkcipher type algorithms crypto: Add userspace report for blkcipher type algorithms crypto: Add userspace report for ahash type algorithms ...

Linus Torvalds committed 15 years ago

Commit dc47d382 parents f6d90b4 5db017a45 files · +4049 −208Browse files

Showing the changes to include/linux (3 of 45 files). Show all

Unified · Split

3 files
  1. include/linux/crypto.h +5 −0
  2. include/linux/cryptouser.h +102 −0
  3. include/linux/netlink.h +1 −0
include/linux/crypto.h+5−0
@@ -71,6 +71,11 @@ · 70 unmodified lines
7171
7272 #define CRYPTO_ALG_TESTED 0x00000400
7373
74+/*
75+ * Set if the algorithm is an instance that is build from templates.
76+ */
77+#define CRYPTO_ALG_INSTANCE 0x00000800
78+
7479 /*
7580 * Transform masks and values (for crt_flags).
7681 */
include/linux/cryptouser.h+102−0
@@ -0,0 +1,102 @@
1+/*
2+ * Crypto user configuration API.
3+ *
4+ * Copyright (C) 2011 secunet Security Networks AG
5+ * Copyright (C) 2011 Steffen Klassert <steffen.klassert@secunet.com>
6+ *
7+ * This program is free software; you can redistribute it and/or modify it
8+ * under the terms and conditions of the GNU General Public License,
9+ * version 2, as published by the Free Software Foundation.
10+ *
11+ * This program is distributed in the hope it will be useful, but WITHOUT
12+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
14+ * more details.
15+ *
16+ * You should have received a copy of the GNU General Public License along with
17+ * this program; if not, write to the Free Software Foundation, Inc.,
18+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
19+ */
20+
21+/* Netlink configuration messages. */
22+enum {
23+ CRYPTO_MSG_BASE = 0x10,
24+ CRYPTO_MSG_NEWALG = 0x10,
25+ CRYPTO_MSG_DELALG,
26+ CRYPTO_MSG_UPDATEALG,
27+ CRYPTO_MSG_GETALG,
28+ __CRYPTO_MSG_MAX
29+};
30+#define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1)
31+#define CRYPTO_NR_MSGTYPES (CRYPTO_MSG_MAX + 1 - CRYPTO_MSG_BASE)
32+
33+#define CRYPTO_MAX_NAME CRYPTO_MAX_ALG_NAME
34+
35+/* Netlink message attributes. */
36+enum crypto_attr_type_t {
37+ CRYPTOCFGA_UNSPEC,
38+ CRYPTOCFGA_PRIORITY_VAL, /* __u32 */
39+ CRYPTOCFGA_REPORT_LARVAL, /* struct crypto_report_larval */
40+ CRYPTOCFGA_REPORT_HASH, /* struct crypto_report_hash */
41+ CRYPTOCFGA_REPORT_BLKCIPHER, /* struct crypto_report_blkcipher */
42+ CRYPTOCFGA_REPORT_AEAD, /* struct crypto_report_aead */
43+ CRYPTOCFGA_REPORT_COMPRESS, /* struct crypto_report_comp */
44+ CRYPTOCFGA_REPORT_RNG, /* struct crypto_report_rng */
45+ CRYPTOCFGA_REPORT_CIPHER, /* struct crypto_report_cipher */
46+ __CRYPTOCFGA_MAX
47+
48+#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
49+};
50+
51+struct crypto_user_alg {
52+ char cru_name[CRYPTO_MAX_ALG_NAME];
53+ char cru_driver_name[CRYPTO_MAX_ALG_NAME];
54+ char cru_module_name[CRYPTO_MAX_ALG_NAME];
55+ __u32 cru_type;
56+ __u32 cru_mask;
57+ __u32 cru_refcnt;
58+ __u32 cru_flags;
59+};
60+
61+struct crypto_report_larval {
62+ char type[CRYPTO_MAX_NAME];
63+};
64+
65+struct crypto_report_hash {
66+ char type[CRYPTO_MAX_NAME];
67+ unsigned int blocksize;
68+ unsigned int digestsize;
69+};
70+
71+struct crypto_report_cipher {
72+ char type[CRYPTO_MAX_ALG_NAME];
73+ unsigned int blocksize;
74+ unsigned int min_keysize;
75+ unsigned int max_keysize;
76+};
77+
78+struct crypto_report_blkcipher {
79+ char type[CRYPTO_MAX_NAME];
80+ char geniv[CRYPTO_MAX_NAME];
81+ unsigned int blocksize;
82+ unsigned int min_keysize;
83+ unsigned int max_keysize;
84+ unsigned int ivsize;
85+};
86+
87+struct crypto_report_aead {
88+ char type[CRYPTO_MAX_NAME];
89+ char geniv[CRYPTO_MAX_NAME];
90+ unsigned int blocksize;
91+ unsigned int maxauthsize;
92+ unsigned int ivsize;
93+};
94+
95+struct crypto_report_comp {
96+ char type[CRYPTO_MAX_NAME];
97+};
98+
99+struct crypto_report_rng {
100+ char type[CRYPTO_MAX_NAME];
101+ unsigned int seedsize;
102+};
include/linux/netlink.h+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */
2626 #define NETLINK_ECRYPTFS 19
2727 #define NETLINK_RDMA 20
28+#define NETLINK_CRYPTO 21 /* Crypto layer */
2829
2930 #define MAX_LINKS 32
3031

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t