Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 75888
b: refs/heads/master
c: 16d004a
h: refs/heads/master
v: v3
  • Loading branch information
Evgeniy Polyakov authored and Herbert Xu committed Jan 10, 2008
1 parent 27ac0ec commit a725b2a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7d0561ea1dadec5462846520b1f4fb304294fd5
refs/heads/master: 16d004a2eda7be2c6a2de63eca2ad3c6b57307b3
8 changes: 1 addition & 7 deletions trunk/crypto/des_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@
#include <linux/crypto.h>
#include <linux/types.h>

#define DES_KEY_SIZE 8
#define DES_EXPKEY_WORDS 32
#define DES_BLOCK_SIZE 8

#define DES3_EDE_KEY_SIZE (3 * DES_KEY_SIZE)
#define DES3_EDE_EXPKEY_WORDS (3 * DES_EXPKEY_WORDS)
#define DES3_EDE_BLOCK_SIZE DES_BLOCK_SIZE
#include <crypto/des.h>

#define ROL(x, r) ((x) = rol32((x), (r)))
#define ROR(x, r) ((x) = ror32((x), (r)))
Expand Down
19 changes: 19 additions & 0 deletions trunk/include/crypto/des.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* DES & Triple DES EDE Cipher Algorithms.
*/

#ifndef __CRYPTO_DES_H
#define __CRYPTO_DES_H

#define DES_KEY_SIZE 8
#define DES_EXPKEY_WORDS 32
#define DES_BLOCK_SIZE 8

#define DES3_EDE_KEY_SIZE (3 * DES_KEY_SIZE)
#define DES3_EDE_EXPKEY_WORDS (3 * DES_EXPKEY_WORDS)
#define DES3_EDE_BLOCK_SIZE DES_BLOCK_SIZE


extern unsigned long des_ekey(u32 *pe, const u8 *k);

#endif /* __CRYPTO_DES_H */

0 comments on commit a725b2a

Please sign in to comment.