eCryptfs

Merge lp:~sergio-pena/ecryptfs/922821 into lp:~ecryptfs/ecryptfs/oldtrunk2

  1. 922821
  2. Merge into oldtrunk2
Proposed by Sergio Peña
Status: Merged
Approved by: Dustin Kirkland 
Approved revision: 683
Merge reported by: Dustin Kirkland 
Merged at revision: not available
Proposed branch: lp:~sergio-pena/ecryptfs/922821
Merge into: lp:~ecryptfs/ecryptfs/oldtrunk2
Diff against target: 11 lines (+1/-0)
1 file modified
src/libecryptfs/cipher_list.c (+1/-0)
To merge this branch: bzr merge lp:~sergio-pena/ecryptfs/922821
Reviewer Review Type Date Requested Status
eCryptfs Pending
Review via email: mp+103781@code.launchpad.net

Description of the change

An easy one.

I only added the new kernel name for blowfish (blowfish_generic.ko)

I tested it on Ubuntu precise (3.2 kernel), and Centos 6.2 (2.6.32 kernel). eCryptfs is mounted using blowfish, and /proc/mounts shows blowfish as a cipher name.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/libecryptfs/cipher_list.c'
2--- src/libecryptfs/cipher_list.c 2009-07-21 17:20:19 +0000
3+++ src/libecryptfs/cipher_list.c 2012-04-26 21:25:23 +0000
4@@ -339,6 +339,7 @@
5 {"xeta", "tea.ko", 8, 16, 16, 9, 0},
6 {"xtea", "tea.ko", 8, 16, 16, 8, 0},
7 {"blowfish", "blowfish.ko", 16, 16, 56, 2, 1},
8+ {"blowfish", "blowfish_generic.ko", 16, 16, 56, 2, 1},
9 {"twofish", "twofish.ko", 16, 16, 32, 4, 1},
10 {"khazad", "khazad.ko", 8, 16, 16, 11, 0},
11 {"cast5", "cast5.ko", 8, 5, 16, 14, 1},

Subscribers

People subscribed via source and target branches