diff options
| -rw-r--r-- | src/core/info.txt | 2 | ||||
| -rw-r--r-- | src/libstate/info.txt | 1 | ||||
| -rw-r--r-- | src/s2k/pbkdf1/info.txt (renamed from src/kdf/pbkdf1/info.txt) | 0 | ||||
| -rw-r--r-- | src/s2k/pbkdf1/pbkdf1.cpp (renamed from src/kdf/pbkdf1/pbkdf1.cpp) | 0 | ||||
| -rw-r--r-- | src/s2k/pbkdf1/pbkdf1.h (renamed from src/kdf/pbkdf1/pbkdf1.h) | 0 | ||||
| -rw-r--r-- | src/s2k/pbkdf2/info.txt (renamed from src/kdf/pbkdf2/info.txt) | 0 | ||||
| -rw-r--r-- | src/s2k/pbkdf2/pbkdf2.cpp (renamed from src/kdf/pbkdf2/pbkdf2.cpp) | 0 | ||||
| -rw-r--r-- | src/s2k/pbkdf2/pbkdf2.h (renamed from src/kdf/pbkdf2/pbkdf2.h) | 0 | ||||
| -rw-r--r-- | src/s2k/pgps2k/info.txt (renamed from src/kdf/pgps2k/info.txt) | 0 | ||||
| -rw-r--r-- | src/s2k/pgps2k/pgp_s2k.cpp (renamed from src/kdf/pgps2k/pgp_s2k.cpp) | 0 | ||||
| -rw-r--r-- | src/s2k/pgps2k/pgp_s2k.h (renamed from src/kdf/pgps2k/pgp_s2k.h) | 0 | ||||
| -rw-r--r-- | src/s2k/s2k.cpp (renamed from src/core/s2k.cpp) | 0 | ||||
| -rw-r--r-- | src/s2k/s2k.h (renamed from src/core/s2k.h) | 0 |
13 files changed, 1 insertions, 2 deletions
diff --git a/src/core/info.txt b/src/core/info.txt index 82376a8b8..6e674fce5 100644 --- a/src/core/info.txt +++ b/src/core/info.txt @@ -34,8 +34,6 @@ mem_pool.h mutex.h rng.cpp rng.h -s2k.cpp -s2k.h secmem.h symkey.cpp symkey.h diff --git a/src/libstate/info.txt b/src/libstate/info.txt index 35ff69249..a5c0a1c8a 100644 --- a/src/libstate/info.txt +++ b/src/libstate/info.txt @@ -6,6 +6,7 @@ define LIBSTATE_MODULE <requires> pk_pad +s2k </requires> <add> diff --git a/src/kdf/pbkdf1/info.txt b/src/s2k/pbkdf1/info.txt index 3c1ae802c..3c1ae802c 100644 --- a/src/kdf/pbkdf1/info.txt +++ b/src/s2k/pbkdf1/info.txt diff --git a/src/kdf/pbkdf1/pbkdf1.cpp b/src/s2k/pbkdf1/pbkdf1.cpp index 00d1ea9ab..00d1ea9ab 100644 --- a/src/kdf/pbkdf1/pbkdf1.cpp +++ b/src/s2k/pbkdf1/pbkdf1.cpp diff --git a/src/kdf/pbkdf1/pbkdf1.h b/src/s2k/pbkdf1/pbkdf1.h index 99d0188db..99d0188db 100644 --- a/src/kdf/pbkdf1/pbkdf1.h +++ b/src/s2k/pbkdf1/pbkdf1.h diff --git a/src/kdf/pbkdf2/info.txt b/src/s2k/pbkdf2/info.txt index e51a331c6..e51a331c6 100644 --- a/src/kdf/pbkdf2/info.txt +++ b/src/s2k/pbkdf2/info.txt diff --git a/src/kdf/pbkdf2/pbkdf2.cpp b/src/s2k/pbkdf2/pbkdf2.cpp index baa227526..baa227526 100644 --- a/src/kdf/pbkdf2/pbkdf2.cpp +++ b/src/s2k/pbkdf2/pbkdf2.cpp diff --git a/src/kdf/pbkdf2/pbkdf2.h b/src/s2k/pbkdf2/pbkdf2.h index 1b27c5acb..1b27c5acb 100644 --- a/src/kdf/pbkdf2/pbkdf2.h +++ b/src/s2k/pbkdf2/pbkdf2.h diff --git a/src/kdf/pgps2k/info.txt b/src/s2k/pgps2k/info.txt index a3d5a146f..a3d5a146f 100644 --- a/src/kdf/pgps2k/info.txt +++ b/src/s2k/pgps2k/info.txt diff --git a/src/kdf/pgps2k/pgp_s2k.cpp b/src/s2k/pgps2k/pgp_s2k.cpp index 66a243e45..66a243e45 100644 --- a/src/kdf/pgps2k/pgp_s2k.cpp +++ b/src/s2k/pgps2k/pgp_s2k.cpp diff --git a/src/kdf/pgps2k/pgp_s2k.h b/src/s2k/pgps2k/pgp_s2k.h index cd263a735..cd263a735 100644 --- a/src/kdf/pgps2k/pgp_s2k.h +++ b/src/s2k/pgps2k/pgp_s2k.h diff --git a/src/core/s2k.cpp b/src/s2k/s2k.cpp index 9c67aef10..9c67aef10 100644 --- a/src/core/s2k.cpp +++ b/src/s2k/s2k.cpp diff --git a/src/core/s2k.h b/src/s2k/s2k.h index 3efcff638..3efcff638 100644 --- a/src/core/s2k.h +++ b/src/s2k/s2k.h |