Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Brad King
CMake
Commits
92f95aed
Commit
92f95aed
authored
Nov 10, 2016
by
Brad King
Browse files
string: Add support for SHA-3 algorithms
parent
c326209f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Help/command/string.rst
View file @
92f95aed
...
...
@@ -230,6 +230,14 @@ The supported ``<HASH>`` algorithm names are:
US Secure Hash Algorithms, RFC 4634.
``SHA512``
US Secure Hash Algorithms, RFC 4634.
``SHA3_224``
Keccak SHA-3.
``SHA3_256``
Keccak SHA-3.
``SHA3_384``
Keccak SHA-3.
``SHA3_512``
Keccak SHA-3.
Generation
^^^^^^^^^^
...
...
Source/cmStringCommand.cxx
View file @
92f95aed
...
...
@@ -36,7 +36,9 @@ bool cmStringCommand::InitialPass(std::vector<std::string> const& args,
}
if
(
subCommand
==
"MD5"
||
subCommand
==
"SHA1"
||
subCommand
==
"SHA224"
||
subCommand
==
"SHA256"
||
subCommand
==
"SHA384"
||
subCommand
==
"SHA512"
)
{
subCommand
==
"SHA512"
||
subCommand
==
"SHA3_224"
||
subCommand
==
"SHA3_256"
||
subCommand
==
"SHA3_384"
||
subCommand
==
"SHA3_512"
)
{
return
this
->
HandleHashCommand
(
args
);
}
if
(
subCommand
==
"TOLOWER"
)
{
...
...
Tests/CMakeTests/String-SHA3_224-Works.cmake
0 → 100644
View file @
92f95aed
string
(
SHA3_224 sha3_224
"sample input string
\n
"
)
message
(
"
${
sha3_224
}
"
)
Tests/CMakeTests/String-SHA3_256-Works.cmake
0 → 100644
View file @
92f95aed
string
(
SHA3_256 sha3_256
"sample input string
\n
"
)
message
(
"
${
sha3_256
}
"
)
Tests/CMakeTests/String-SHA3_384-Works.cmake
0 → 100644
View file @
92f95aed
string
(
SHA3_384 sha3_384
"sample input string
\n
"
)
message
(
"
${
sha3_384
}
"
)
Tests/CMakeTests/String-SHA3_512-Works.cmake
0 → 100644
View file @
92f95aed
string
(
SHA3_512 sha3_512
"sample input string
\n
"
)
message
(
"
${
sha3_512
}
"
)
Tests/CMakeTests/StringTest.cmake.in
View file @
92f95aed
...
...
@@ -16,6 +16,14 @@ set(SHA384-Works-RESULT 0)
set(SHA384-Works-STDERR "1de9560b4e030e02051ea408200ffc55d70c97ac64ebf822461a5c786f495c36df43259b14483bc8d364f0106f4971ee")
set(SHA512-Works-RESULT 0)
set(SHA512-Works-STDERR "3982a1b4e651768bec70ab1fb97045cb7a659f4ba7203d501c52ab2e803071f9d5fd272022df15f27727fc67f8cd022e710e29010b2a9c0b467c111e2f6abf51")
set(SHA3_224-Works-RESULT 0)
set(SHA3_224-Works-STDERR "4272868085f4f25080681a7712509fd12e16dcda79bd356836dd2100")
set(SHA3_256-Works-RESULT 0)
set(SHA3_256-Works-STDERR "be0df472b6bd474417a166d12f2774f2ef5095e86f0a88ef4c78c703800cfc8a")
set(SHA3_384-Works-RESULT 0)
set(SHA3_384-Works-STDERR "935a17cc708443c1369549483656a4521af03a52e4f3b314566272017ccae03a2c5db838f6d4c156b1dc5c366182481b")
set(SHA3_512-Works-RESULT 0)
set(SHA3_512-Works-STDERR "471a85ed537e8f77f31412a089f22d836054ffa179599f87a5d7568927d8fa236b6793ded8a387d1de92398c967177bcc6361672a722bf736cb0f63a0956d5cf")
set(TIMESTAMP-BadArg1-RESULT 1)
set(TIMESTAMP-BadArg1-STDERR "string sub-command TIMESTAMP requires at least one argument")
set(TIMESTAMP-BadArg2-RESULT 1)
...
...
@@ -52,6 +60,10 @@ check_cmake_test(String
SHA256-Works
SHA384-Works
SHA512-Works
SHA3_224-Works
SHA3_256-Works
SHA3_384-Works
SHA3_512-Works
TIMESTAMP-BadArg1
TIMESTAMP-BadArg2
TIMESTAMP-BadArg3
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment