diff options
| author | Ronald Tse <ronald.tse@ribose.com> | 2017-10-30 10:59:00 +0100 |
|---|---|---|
| committer | Ronald Tse <ronald.tse@ribose.com> | 2017-11-06 00:21:15 +0100 |
| commit | 67e247fad12308e34817e60c9242113c285fb00c (patch) | |
| tree | b11943e669ecd8482fe95973c2eb407d295d38d7 /crypto/evp | |
| parent | SM3: Add SM3 hash function (diff) | |
| download | openssl-67e247fad12308e34817e60c9242113c285fb00c.tar.xz openssl-67e247fad12308e34817e60c9242113c285fb00c.zip | |
SM3: restructure to EVP internal and update doc to right location
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4616)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/build.info | 2 | ||||
| -rw-r--r-- | crypto/evp/m_sm3.c | 55 |
2 files changed, 1 insertions, 56 deletions
diff --git a/crypto/evp/build.info b/crypto/evp/build.info index 96b44efbfb..0305738011 100644 --- a/crypto/evp/build.info +++ b/crypto/evp/build.info @@ -5,7 +5,7 @@ SOURCE[../../libcrypto]=\ e_rc4.c e_aes.c names.c e_seed.c e_aria.c e_sm4.c \ e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \ m_null.c m_md2.c m_md4.c m_md5.c m_sha1.c m_wp.c \ - m_md5_sha1.c m_mdc2.c m_ripemd.c m_sha3.c m_sm3.c \ + m_md5_sha1.c m_mdc2.c m_ripemd.c m_sha3.c \ p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ c_allc.c c_alld.c evp_lib.c bio_ok.c \ diff --git a/crypto/evp/m_sm3.c b/crypto/evp/m_sm3.c deleted file mode 100644 index 21ee1de136..0000000000 --- a/crypto/evp/m_sm3.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. - * Copyright 2017 Ribose Inc. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#include <stdio.h> -#include "internal/cryptlib.h" - -#ifndef OPENSSL_NO_SM3 - -# include <openssl/evp.h> -# include <openssl/objects.h> -# include <openssl/sm3.h> -# include "internal/evp_int.h" - -static int init(EVP_MD_CTX *ctx) -{ - return SM3_Init(EVP_MD_CTX_md_data(ctx)); -} - -static int update(EVP_MD_CTX *ctx, const void *data, size_t count) -{ - return SM3_Update(EVP_MD_CTX_md_data(ctx), data, count); -} - -static int final(EVP_MD_CTX *ctx, unsigned char *md) -{ - return SM3_Final(md, EVP_MD_CTX_md_data(ctx)); -} - -static const EVP_MD sm3_md = { - NID_sm3, - NID_sm3WithRSAEncryption, - SM3_DIGEST_LENGTH, - 0, - init, - update, - final, - NULL, - NULL, - SM3_CBLOCK, - sizeof(EVP_MD *) + sizeof(SM3_CTX), -}; - -const EVP_MD *EVP_sm3(void) -{ - return &sm3_md; -} -#endif - |