diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-12-12 18:13:35 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-12-12 18:13:35 +0000 |
| commit | 574e283890a6ca92325a06dafa76ff307a8019a2 (patch) | |
| tree | 055e44e24a55fb4863e5d9cdc04e320cde52ffe9 /crypt | |
| parent | a162e5955f7e324be82d9318bbcbe869c66ffb86 (diff) | |
Updated to fedora-glibc-20071212T1051
Diffstat (limited to 'crypt')
| -rw-r--r-- | crypt/sha256-crypt.c | 5 | ||||
| -rw-r--r-- | crypt/sha256c-test.c | 1 | ||||
| -rw-r--r-- | crypt/sha512-crypt.c | 5 | ||||
| -rw-r--r-- | crypt/sha512c-test.c | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crypt/sha256-crypt.c b/crypt/sha256-crypt.c index 0db13e4664..dbd29e0efd 100644 --- a/crypt/sha256-crypt.c +++ b/crypt/sha256-crypt.c @@ -129,9 +129,8 @@ __sha256_crypt_r (key, salt, buffer, buflen) /* Add the key string. */ __sha256_process_bytes (key, key_len, &ctx); - /* The last part is the salt string. This must be at most 8 - characters and it ends at the first `$' character (for - compatibility with existing implementations). */ + /* The last part is the salt string. This must be at most 16 + characters and it ends at the first `$' character. */ __sha256_process_bytes (salt, salt_len, &ctx); diff --git a/crypt/sha256c-test.c b/crypt/sha256c-test.c index 58aec07dae..357f0d8b7e 100644 --- a/crypt/sha256c-test.c +++ b/crypt/sha256c-test.c @@ -57,5 +57,6 @@ do_test (void) return result; } +#define TIMEOUT 6 #define TEST_FUNCTION do_test () #include "../test-skeleton.c" diff --git a/crypt/sha512-crypt.c b/crypt/sha512-crypt.c index 4b8949f5f1..ea96e525fb 100644 --- a/crypt/sha512-crypt.c +++ b/crypt/sha512-crypt.c @@ -129,9 +129,8 @@ __sha512_crypt_r (key, salt, buffer, buflen) /* Add the key string. */ __sha512_process_bytes (key, key_len, &ctx); - /* The last part is the salt string. This must be at most 8 - characters and it ends at the first `$' character (for - compatibility with existing implementations). */ + /* The last part is the salt string. This must be at most 16 + characters and it ends at the first `$' character. */ __sha512_process_bytes (salt, salt_len, &ctx); diff --git a/crypt/sha512c-test.c b/crypt/sha512c-test.c index 4c888feb41..c829242e2a 100644 --- a/crypt/sha512c-test.c +++ b/crypt/sha512c-test.c @@ -58,5 +58,6 @@ do_test (void) return result; } +#define TIMEOUT 6 #define TEST_FUNCTION do_test () #include "../test-skeleton.c" |