[openssl-commits] [openssl] master update

Richard Levitte levitte at openssl.org
Sat Dec 8 10:00:23 UTC 2018


The branch master has been updated
       via  97c213814b2b70ea9158b9bb715213a71ab4e659 (commit)
      from  16942e081e8d28fa57d1874abff7fefd53d5e75e (commit)


- Log -----------------------------------------------------------------
commit 97c213814b2b70ea9158b9bb715213a71ab4e659
Author: terry zhao <zhaohaiyang_1988 at 163.com>
Date:   Fri Dec 7 11:13:49 2018 +0800

    Update kmac.c
    
    fix nmake compiler error
    
    ```
    crypto\kmac\kmac.c : warning treated as error - no object file generated
    crypto\kmac\kmac.c : warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss
    ```
    
    CLA: trivial
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7846)

-----------------------------------------------------------------------

Summary of changes:
 crypto/kmac/kmac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/kmac/kmac.c b/crypto/kmac/kmac.c
index 01a4b6a..76e75c1 100644
--- a/crypto/kmac/kmac.c
+++ b/crypto/kmac/kmac.c
@@ -19,28 +19,28 @@
  * KMAC128(K, X, L, S)
  * {
  *     newX = bytepad(encode_string(K), 168) ||  X || right_encode(L).
- *     T = bytepad(encode_string(“KMAC”) || encode_string(S), 168).
+ *     T = bytepad(encode_string("KMAC") || encode_string(S), 168).
  *     return KECCAK[256](T || newX || 00, L).
  * }
  *
  * KMAC256(K, X, L, S)
  * {
  *     newX = bytepad(encode_string(K), 136) ||  X || right_encode(L).
- *     T = bytepad(encode_string(“KMAC”) || encode_string(S), 136).
+ *     T = bytepad(encode_string("KMAC") || encode_string(S), 136).
  *     return KECCAK[512](T || newX || 00, L).
  * }
  *
  * KMAC128XOF(K, X, L, S)
  * {
  *     newX = bytepad(encode_string(K), 168) ||  X || right_encode(0).
- *     T = bytepad(encode_string(“KMAC”) || encode_string(S), 168).
+ *     T = bytepad(encode_string("KMAC") || encode_string(S), 168).
  *     return KECCAK[256](T || newX || 00, L).
  * }
  *
  * KMAC256XOF(K, X, L, S)
  * {
  *     newX = bytepad(encode_string(K), 136) ||  X || right_encode(0).
- *     T = bytepad(encode_string(“KMAC”) || encode_string(S), 136).
+ *     T = bytepad(encode_string("KMAC") || encode_string(S), 136).
  *     return KECCAK[512](T || newX || 00, L).
  * }
  *


More information about the openssl-commits mailing list