diff options
| author | lloyd <[email protected]> | 2008-10-26 02:30:08 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-10-26 02:30:08 +0000 |
| commit | b1344477a80c7410da9ce05dd3343c04d24f8095 (patch) | |
| tree | d80ee5b56b8803359a22bdb66cb7b4c630baa5de | |
| parent | ec95d5187cc714448f29c4c90cce6bc9fcc9ea21 (diff) | |
Move kdf/kdf_base to kdf
| -rw-r--r-- | src/core/info.txt | 1 | ||||
| -rw-r--r-- | src/kdf/info.txt (renamed from src/kdf/kdf_base/info.txt) | 0 | ||||
| -rw-r--r-- | src/kdf/kdf.cpp (renamed from src/kdf/kdf_base/kdf.cpp) | 0 | ||||
| -rw-r--r-- | src/kdf/kdf.h (renamed from src/kdf/kdf_base/kdf.h) | 0 | ||||
| -rw-r--r-- | src/kdf/kdf1/info.txt | 2 | ||||
| -rw-r--r-- | src/kdf/kdf2/info.txt | 2 | ||||
| -rw-r--r-- | src/kdf/mgf1/info.txt | 2 | ||||
| -rw-r--r-- | src/kdf/ssl_prf/info.txt | 2 | ||||
| -rw-r--r-- | src/kdf/tls_prf/info.txt | 2 | ||||
| -rw-r--r-- | src/kdf/x942_prf/info.txt | 2 |
10 files changed, 6 insertions, 7 deletions
diff --git a/src/core/info.txt b/src/core/info.txt index 6e674fce5..7528abba8 100644 --- a/src/core/info.txt +++ b/src/core/info.txt @@ -13,7 +13,6 @@ filters hex bigint libstate -kdf_base timer_base </requires> diff --git a/src/kdf/kdf_base/info.txt b/src/kdf/info.txt index fa5cca334..fa5cca334 100644 --- a/src/kdf/kdf_base/info.txt +++ b/src/kdf/info.txt diff --git a/src/kdf/kdf_base/kdf.cpp b/src/kdf/kdf.cpp index a96f86e99..a96f86e99 100644 --- a/src/kdf/kdf_base/kdf.cpp +++ b/src/kdf/kdf.cpp diff --git a/src/kdf/kdf_base/kdf.h b/src/kdf/kdf.h index 7d0c1866b..7d0c1866b 100644 --- a/src/kdf/kdf_base/kdf.h +++ b/src/kdf/kdf.h diff --git a/src/kdf/kdf1/info.txt b/src/kdf/kdf1/info.txt index a4d2c36af..04d8db096 100644 --- a/src/kdf/kdf1/info.txt +++ b/src/kdf/kdf1/info.txt @@ -5,7 +5,7 @@ define KDF1 load_on auto <requires> -kdf_base +kdf </requires> <add> diff --git a/src/kdf/kdf2/info.txt b/src/kdf/kdf2/info.txt index 46a88a392..80b562824 100644 --- a/src/kdf/kdf2/info.txt +++ b/src/kdf/kdf2/info.txt @@ -5,7 +5,7 @@ define KDF2 load_on auto <requires> -kdf_base +kdf </requires> <add> diff --git a/src/kdf/mgf1/info.txt b/src/kdf/mgf1/info.txt index 1e91e8a9b..0616f43b7 100644 --- a/src/kdf/mgf1/info.txt +++ b/src/kdf/mgf1/info.txt @@ -5,7 +5,7 @@ define MGF1 load_on dep <requires> -kdf_base +kdf </requires> <add> diff --git a/src/kdf/ssl_prf/info.txt b/src/kdf/ssl_prf/info.txt index 48796afaf..8c85745c2 100644 --- a/src/kdf/ssl_prf/info.txt +++ b/src/kdf/ssl_prf/info.txt @@ -5,7 +5,7 @@ define SSL_V3_PRF load_on auto <requires> -kdf_base +kdf </requires> <add> diff --git a/src/kdf/tls_prf/info.txt b/src/kdf/tls_prf/info.txt index a83b470ba..9ee452783 100644 --- a/src/kdf/tls_prf/info.txt +++ b/src/kdf/tls_prf/info.txt @@ -5,7 +5,7 @@ define TLS_V10_PRF load_on auto <requires> -kdf_base +kdf </requires> <add> diff --git a/src/kdf/x942_prf/info.txt b/src/kdf/x942_prf/info.txt index e29c7bd9b..7c61317b0 100644 --- a/src/kdf/x942_prf/info.txt +++ b/src/kdf/x942_prf/info.txt @@ -6,7 +6,7 @@ load_on auto <requires> core -#kdf_base +#kdf #oid_lookup </requires> |