Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
70531c14
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
70531c14
编写于
12月 20, 2008
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make no-engine work again.
上级
75bbf6e1
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
40 addition
and
12 deletion
+40
-12
apps/dsa.c
apps/dsa.c
+0
-2
apps/engine.c
apps/engine.c
+1
-1
apps/genpkey.c
apps/genpkey.c
+2
-0
apps/pkeyparam.c
apps/pkeyparam.c
+3
-1
apps/s_client.c
apps/s_client.c
+2
-1
apps/s_server.c
apps/s_server.c
+0
-2
apps/ts.c
apps/ts.c
+2
-1
crypto/engine/enginetest.c
crypto/engine/enginetest.c
+1
-1
crypto/ts/ts_conf.c
crypto/ts/ts_conf.c
+6
-0
ssl/ssl_ciph.c
ssl/ssl_ciph.c
+23
-3
未找到文件。
apps/dsa.c
浏览文件 @
70531c14
...
...
@@ -96,9 +96,7 @@ int MAIN(int, char **);
int
MAIN
(
int
argc
,
char
**
argv
)
{
#ifndef OPENSSL_NO_ENGINE
ENGINE
*
e
=
NULL
;
#endif
int
ret
=
1
;
DSA
*
dsa
=
NULL
;
int
i
,
badops
=
0
;
...
...
apps/engine.c
浏览文件 @
70531c14
...
...
@@ -56,7 +56,6 @@
*
*/
#ifndef OPENSSL_NO_ENGINE
#include <stdio.h>
#include <stdlib.h>
...
...
@@ -66,6 +65,7 @@
#endif
#include "apps.h"
#include <openssl/err.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#include <openssl/ssl.h>
...
...
apps/genpkey.c
浏览文件 @
70531c14
...
...
@@ -376,8 +376,10 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
ameth
=
EVP_PKEY_asn1_find_str
(
&
tmpeng
,
algname
,
-
1
);
#ifndef OPENSSL_NO_ENGINE
if
(
!
ameth
&&
e
)
ameth
=
ENGINE_get_pkey_asn1_meth_str
(
e
,
algname
,
-
1
);
#endif
if
(
!
ameth
)
{
...
...
apps/pkeyparam.c
浏览文件 @
70531c14
...
...
@@ -68,13 +68,13 @@ int MAIN(int, char **);
int
MAIN
(
int
argc
,
char
**
argv
)
{
ENGINE
*
e
=
NULL
;
char
**
args
,
*
infile
=
NULL
,
*
outfile
=
NULL
;
BIO
*
in
=
NULL
,
*
out
=
NULL
;
int
text
=
0
,
noout
=
0
;
EVP_PKEY
*
pkey
=
NULL
;
int
badarg
=
0
;
#ifndef OPENSSL_NO_ENGINE
ENGINE
*
e
=
NULL
;
char
*
engine
=
NULL
;
#endif
int
ret
=
1
;
...
...
@@ -125,7 +125,9 @@ int MAIN(int argc, char **argv)
if
(
badarg
)
{
#ifndef OPENSSL_NO_ENGINE
bad:
#endif
BIO_printf
(
bio_err
,
"Usage pkeyparam [options]
\n
"
);
BIO_printf
(
bio_err
,
"where options are
\n
"
);
BIO_printf
(
bio_err
,
"-in file input file
\n
"
);
...
...
apps/s_client.c
浏览文件 @
70531c14
...
...
@@ -413,8 +413,9 @@ int MAIN(int argc, char **argv)
#ifndef OPENSSL_NO_ENGINE
char
*
engine_id
=
NULL
;
char
*
ssl_client_engine_id
=
NULL
;
ENGINE
*
e
=
NULL
,
*
ssl_client_engine
=
NULL
;
ENGINE
*
ssl_client_engine
=
NULL
;
#endif
ENGINE
*
e
=
NULL
;
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
struct
timeval
tv
;
#if defined(OPENSSL_SYS_BEOS_R5)
...
...
apps/s_server.c
浏览文件 @
70531c14
...
...
@@ -849,9 +849,7 @@ int MAIN(int argc, char *argv[])
int
state
=
0
;
const
SSL_METHOD
*
meth
=
NULL
;
int
socket_type
=
SOCK_STREAM
;
#ifndef OPENSSL_NO_ENGINE
ENGINE
*
e
=
NULL
;
#endif
char
*
inrand
=
NULL
;
int
s_cert_format
=
FORMAT_PEM
,
s_key_format
=
FORMAT_PEM
;
char
*
passarg
=
NULL
,
*
pass
=
NULL
;
...
...
apps/ts.c
浏览文件 @
70531c14
...
...
@@ -813,9 +813,10 @@ static TS_RESP *create_response(CONF *conf, const char *section, char *engine,
/* Setting serial number provider callback. */
if
(
!
TS_CONF_set_serial
(
conf
,
section
,
serial_cb
,
resp_ctx
))
goto
end
;
#ifndef OPENSSL_NO_ENGINE
/* Setting default OpenSSL engine. */
if
(
!
TS_CONF_set_crypto_device
(
conf
,
section
,
engine
))
goto
end
;
#endif
/* Setting TSA signer certificate. */
if
(
!
TS_CONF_set_signer_cert
(
conf
,
section
,
signer
,
resp_ctx
))
goto
end
;
...
...
crypto/engine/enginetest.c
浏览文件 @
70531c14
...
...
@@ -58,6 +58,7 @@
#include <stdio.h>
#include <string.h>
#include <openssl/e_os2.h>
#ifdef OPENSSL_NO_ENGINE
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -66,7 +67,6 @@ int main(int argc, char *argv[])
return
(
0
);
}
#else
#include <openssl/e_os2.h>
#include <openssl/buffer.h>
#include <openssl/crypto.h>
#include <openssl/engine.h>
...
...
crypto/ts/ts_conf.c
浏览文件 @
70531c14
...
...
@@ -61,7 +61,9 @@
#include <openssl/crypto.h>
#include "cryptlib.h"
#include <openssl/pem.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
#include <openssl/ts.h>
/* Macro definitions for the configuration file. */
...
...
@@ -185,6 +187,8 @@ int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
return
ret
;
}
#ifndef OPENSSL_NO_ENGINE
int
TS_CONF_set_crypto_device
(
CONF
*
conf
,
const
char
*
section
,
const
char
*
device
)
{
...
...
@@ -230,6 +234,8 @@ int TS_CONF_set_default_engine(const char *name)
return
ret
;
}
#endif
int
TS_CONF_set_signer_cert
(
CONF
*
conf
,
const
char
*
section
,
const
char
*
cert
,
TS_RESP_CTX
*
ctx
)
{
...
...
ssl/ssl_ciph.c
浏览文件 @
70531c14
...
...
@@ -143,7 +143,9 @@
#include <stdio.h>
#include <openssl/objects.h>
#include <openssl/comp.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
#include "ssl_locl.h"
#define SSL_ENC_DES_IDX 0
...
...
@@ -314,20 +316,38 @@ static const SSL_CIPHER cipher_aliases[]={
/* Search for public key algorithm with given name and
* return its pkey_id if it is available. Otherwise return 0
*/
#ifdef OPENSSL_NO_ENGINE
static
int
get_optional_pkey_id
(
const
char
*
pkey_name
)
{
const
EVP_PKEY_ASN1_METHOD
*
ameth
;
ENGINE
*
tmpeng
=
NULL
;
int
pkey_id
=
0
;
ameth
=
EVP_PKEY_asn1_find_str
(
&
tmpeng
,
pkey_name
,
-
1
);
ameth
=
EVP_PKEY_asn1_find_str
(
NULL
,
pkey_name
,
-
1
);
if
(
ameth
)
{
EVP_PKEY_asn1_get0_info
(
&
pkey_id
,
NULL
,
NULL
,
NULL
,
NULL
,
ameth
);
}
if
(
tmpeng
)
ENGINE_finish
(
tmpeng
);
return
pkey_id
;
}
#else
static
int
get_optional_pkey_id
(
const
char
*
pkey_name
)
{
const
EVP_PKEY_ASN1_METHOD
*
ameth
;
ENGINE
*
tmpeng
=
NULL
;
int
pkey_id
=
0
;
ameth
=
EVP_PKEY_asn1_find_str
(
&
tmpeng
,
pkey_name
,
-
1
);
if
(
ameth
)
{
EVP_PKEY_asn1_get0_info
(
&
pkey_id
,
NULL
,
NULL
,
NULL
,
NULL
,
ameth
);
}
if
(
tmpeng
)
ENGINE_finish
(
tmpeng
);
return
pkey_id
;
}
#endif
void
ssl_load_ciphers
(
void
)
{
ssl_cipher_methods
[
SSL_ENC_DES_IDX
]
=
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录