Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
625a9baf
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
625a9baf
编写于
1月 28, 2015
作者:
R
Rich Salz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Finish removal of DSS
Reviewed-by:
N
Matt Caswell
<
matt@openssl.org
>
上级
55467a16
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
120 deletion
+7
-120
crypto/evp/Makefile
crypto/evp/Makefile
+2
-12
crypto/evp/m_dss.c
crypto/evp/m_dss.c
+0
-102
doc/crypto/EVP_DigestInit.pod
doc/crypto/EVP_DigestInit.pod
+5
-6
未找到文件。
crypto/evp/Makefile
浏览文件 @
625a9baf
...
...
@@ -23,7 +23,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \
e_rc4.c e_aes.c names.c e_seed.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_dss
.c m_dss
1.c m_mdc2.c m_ripemd.c m_ecdsa.c
\
m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.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_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c
\
...
...
@@ -36,7 +36,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \
e_rc4.o e_aes.o names.o e_seed.o
\
e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o
\
m_null.o m_md2.o m_md4.o m_md5.o m_sha1.o m_wp.o
\
m_dss
.o m_dss
1.o m_mdc2.o m_ripemd.o m_ecdsa.o
\
m_dss1.o m_mdc2.o m_ripemd.o m_ecdsa.o
\
p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o
\
bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o
\
c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o
\
...
...
@@ -464,16 +464,6 @@ evp_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
evp_pkey.o
:
../../include/openssl/stack.h ../../include/openssl/symhacks.h
evp_pkey.o
:
../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
evp_pkey.o
:
../asn1/asn1_locl.h ../cryptlib.h evp_pkey.c
m_dss.o
:
../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
m_dss.o
:
../../include/openssl/buffer.h ../../include/openssl/crypto.h
m_dss.o
:
../../include/openssl/dsa.h ../../include/openssl/e_os2.h
m_dss.o
:
../../include/openssl/err.h ../../include/openssl/evp.h
m_dss.o
:
../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
m_dss.o
:
../../include/openssl/objects.h ../../include/openssl/opensslconf.h
m_dss.o
:
../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
m_dss.o
:
../../include/openssl/safestack.h ../../include/openssl/sha.h
m_dss.o
:
../../include/openssl/stack.h ../../include/openssl/symhacks.h
m_dss.o
:
../cryptlib.h m_dss.c
m_dss1.o
:
../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
m_dss1.o
:
../../include/openssl/buffer.h ../../include/openssl/crypto.h
m_dss1.o
:
../../include/openssl/dsa.h ../../include/openssl/e_os2.h
...
...
crypto/evp/m_dss.c
已删除
100644 → 0
浏览文件 @
55467a16
/* crypto/evp/m_dss.c */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
*
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* "This product includes cryptographic software written by
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
*
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/sha.h>
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
static
int
init
(
EVP_MD_CTX
*
ctx
)
{
return
SHA1_Init
(
ctx
->
md_data
);
}
static
int
update
(
EVP_MD_CTX
*
ctx
,
const
void
*
data
,
size_t
count
)
{
return
SHA1_Update
(
ctx
->
md_data
,
data
,
count
);
}
static
int
final
(
EVP_MD_CTX
*
ctx
,
unsigned
char
*
md
)
{
return
SHA1_Final
(
md
,
ctx
->
md_data
);
}
static
const
EVP_MD
dsa_md
=
{
NID_dsaWithSHA
,
NID_dsaWithSHA
,
SHA_DIGEST_LENGTH
,
EVP_MD_FLAG_PKEY_METHOD_SIGNATURE
|
EVP_MD_FLAG_PKEY_DIGEST
,
init
,
update
,
final
,
NULL
,
NULL
,
EVP_PKEY_NULL_method
,
SHA_CBLOCK
,
sizeof
(
EVP_MD
*
)
+
sizeof
(
SHA_CTX
),
};
const
EVP_MD
*
EVP_dss
(
void
)
{
return
(
&
dsa_md
);
}
doc/crypto/EVP_DigestInit.pod
浏览文件 @
625a9baf
...
...
@@ -7,7 +7,7 @@ EVP_DigestFinal_ex, EVP_MD_CTX_cleanup, EVP_MD_CTX_destroy, EVP_MAX_MD_SIZE,
EVP_MD_CTX_copy_ex, EVP_DigestInit, EVP_DigestFinal, EVP_MD_CTX_copy, EVP_MD_type,
EVP_MD_pkey_type, EVP_MD_size, EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size,
EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, EVP_sha1,
EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss
, EVP_dss
1, EVP_mdc2,
EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss1, EVP_mdc2,
EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, EVP_get_digestbyobj -
EVP digest routines
...
...
@@ -50,7 +50,6 @@ EVP digest routines
const EVP_MD *EVP_md2(void);
const EVP_MD *EVP_md5(void);
const EVP_MD *EVP_sha1(void);
const EVP_MD *EVP_dss(void);
const EVP_MD *EVP_dss1(void);
const EVP_MD *EVP_mdc2(void);
const EVP_MD *EVP_ripemd160(void);
...
...
@@ -138,8 +137,8 @@ EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160() return B<EVP_MD>
structures for the MD2, MD5, SHA1, SHA224, SHA256, SHA384, SHA512, MDC2
and RIPEMD160 digest algorithms respectively.
EVP_dss
() and EVP_dss1() return B<EVP_MD> structures for SHA and
SHA1 digest
algorithm
s
but using DSS (DSA) for the signature algorithm. Note: there is
EVP_dss
1() returns B<EVP_MD> an structure the
SHA1 digest
algorithm but using DSS (DSA) for the signature algorithm. Note: there is
no need to use these pseudo-digests in OpenSSL 1.0.0 and later, they are
however retained for compatibility.
...
...
@@ -164,7 +163,7 @@ corresponding OBJECT IDENTIFIER or NID_undef if none exists.
EVP_MD_size(), EVP_MD_block_size(), EVP_MD_CTX_size() and
EVP_MD_CTX_block_size() return the digest or block size in bytes.
EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha1(),
EVP_dss(),
EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha1(),
EVP_dss1(), EVP_mdc2() and EVP_ripemd160() return pointers to the
corresponding EVP_MD structures.
...
...
@@ -269,7 +268,7 @@ EVP_MD_CTX_cleanup(), EVP_MD_CTX_destroy(), EVP_DigestInit_ex()
and EVP_DigestFinal_ex() were added in OpenSSL 0.9.7.
EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha1(),
EVP_dss
(), EVP_dss
1(), EVP_mdc2() and EVP_ripemd160() were
EVP_dss1(), EVP_mdc2() and EVP_ripemd160() were
changed to return truly const EVP_MD * in OpenSSL 0.9.7.
The link between digests and signing algorithms was fixed in OpenSSL 1.0 and
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录