Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
70d71f61
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,发现更多精彩内容 >>
提交
70d71f61
编写于
11月 02, 2008
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix warnings: printf format mismatches on 64 bit platforms.
Change assert to OPENSSL_assert(). Fix e_padlock prototype.
上级
5ee92a5e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
20 deletion
+23
-20
apps/s_cb.c
apps/s_cb.c
+4
-4
crypto/bio/bio_cb.c
crypto/bio/bio_cb.c
+14
-10
crypto/evp/evp_test.c
crypto/evp/evp_test.c
+2
-2
crypto/jpake/jpake.c
crypto/jpake/jpake.c
+2
-3
engines/e_padlock.c
engines/e_padlock.c
+1
-1
未找到文件。
apps/s_cb.c
浏览文件 @
70d71f61
...
...
@@ -269,15 +269,15 @@ long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
if
(
cmd
==
(
BIO_CB_READ
|
BIO_CB_RETURN
))
{
BIO_printf
(
out
,
"read from %p [%p] (%
d
bytes => %ld (0x%lX))
\n
"
,
(
void
*
)
bio
,
argp
,
argi
,
ret
,
ret
);
BIO_printf
(
out
,
"read from %p [%p] (%
lu
bytes => %ld (0x%lX))
\n
"
,
(
void
*
)
bio
,
argp
,
(
unsigned
long
)
argi
,
ret
,
ret
);
BIO_dump
(
out
,
argp
,(
int
)
ret
);
return
(
ret
);
}
else
if
(
cmd
==
(
BIO_CB_WRITE
|
BIO_CB_RETURN
))
{
BIO_printf
(
out
,
"write to %p [%p] (%
d
bytes => %ld (0x%lX))
\n
"
,
(
void
*
)
bio
,
argp
,
argi
,
ret
,
ret
);
BIO_printf
(
out
,
"write to %p [%p] (%
lu
bytes => %ld (0x%lX))
\n
"
,
(
void
*
)
bio
,
argp
,
(
unsigned
long
)
argi
,
ret
,
ret
);
BIO_dump
(
out
,
argp
,(
int
)
ret
);
}
return
(
ret
);
...
...
crypto/bio/bio_cb.c
浏览文件 @
70d71f61
...
...
@@ -85,28 +85,32 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
break
;
case
BIO_CB_READ
:
if
(
bio
->
method
->
type
&
BIO_TYPE_DESCRIPTOR
)
BIO_snprintf
(
p
,
p_maxlen
,
"read(%d,%d) - %s fd=%d
\n
"
,
bio
->
num
,
argi
,
bio
->
method
->
name
,
bio
->
num
);
BIO_snprintf
(
p
,
p_maxlen
,
"read(%d,%lu) - %s fd=%d
\n
"
,
bio
->
num
,(
unsigned
long
)
argi
,
bio
->
method
->
name
,
bio
->
num
);
else
BIO_snprintf
(
p
,
p_maxlen
,
"read(%d,%d) - %s
\n
"
,
bio
->
num
,
argi
,
bio
->
method
->
name
);
BIO_snprintf
(
p
,
p_maxlen
,
"read(%d,%lu) - %s
\n
"
,
bio
->
num
,(
unsigned
long
)
argi
,
bio
->
method
->
name
);
break
;
case
BIO_CB_WRITE
:
if
(
bio
->
method
->
type
&
BIO_TYPE_DESCRIPTOR
)
BIO_snprintf
(
p
,
p_maxlen
,
"write(%d,%d) - %s fd=%d
\n
"
,
bio
->
num
,
argi
,
bio
->
method
->
name
,
bio
->
num
);
BIO_snprintf
(
p
,
p_maxlen
,
"write(%d,%lu) - %s fd=%d
\n
"
,
bio
->
num
,(
unsigned
long
)
argi
,
bio
->
method
->
name
,
bio
->
num
);
else
BIO_snprintf
(
p
,
p_maxlen
,
"write(%d,%d) - %s
\n
"
,
bio
->
num
,
argi
,
bio
->
method
->
name
);
BIO_snprintf
(
p
,
p_maxlen
,
"write(%d,%lu) - %s
\n
"
,
bio
->
num
,(
unsigned
long
)
argi
,
bio
->
method
->
name
);
break
;
case
BIO_CB_PUTS
:
BIO_snprintf
(
p
,
p_maxlen
,
"puts() - %s
\n
"
,
bio
->
method
->
name
);
break
;
case
BIO_CB_GETS
:
BIO_snprintf
(
p
,
p_maxlen
,
"gets(%
d) - %s
\n
"
,
argi
,
bio
->
method
->
name
);
BIO_snprintf
(
p
,
p_maxlen
,
"gets(%
lu) - %s
\n
"
,(
unsigned
long
)
argi
,
bio
->
method
->
name
);
break
;
case
BIO_CB_CTRL
:
BIO_snprintf
(
p
,
p_maxlen
,
"ctrl(%
d) - %s
\n
"
,
argi
,
bio
->
method
->
name
);
BIO_snprintf
(
p
,
p_maxlen
,
"ctrl(%
lu) - %s
\n
"
,(
unsigned
long
)
argi
,
bio
->
method
->
name
);
break
;
case
BIO_CB_RETURN
|
BIO_CB_READ
:
BIO_snprintf
(
p
,
p_maxlen
,
"read return %ld
\n
"
,
ret
);
...
...
crypto/evp/evp_test.c
浏览文件 @
70d71f61
...
...
@@ -153,8 +153,8 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
if
(
kn
!=
c
->
key_len
)
{
fprintf
(
stderr
,
"Key length doesn't match, got %d expected %
d
\n
"
,
kn
,
c
->
key_len
);
fprintf
(
stderr
,
"Key length doesn't match, got %d expected %
lu
\n
"
,
kn
,
(
unsigned
long
)
c
->
key_len
);
test1_exit
(
5
);
}
EVP_CIPHER_CTX_init
(
&
ctx
);
...
...
crypto/jpake/jpake.c
浏览文件 @
70d71f61
...
...
@@ -4,7 +4,6 @@
#include <openssl/sha.h>
#include <openssl/err.h>
#include <memory.h>
#include <assert.h>
/*
* In the definition, (xa, xb, xc, xd) are Alice's (x1, x2, x3, x4) or
...
...
@@ -134,7 +133,7 @@ static void hashlength(SHA_CTX *sha, size_t l)
{
unsigned
char
b
[
2
];
assert
(
l
<=
0xffff
);
OPENSSL_
assert
(
l
<=
0xffff
);
b
[
0
]
=
l
>>
8
;
b
[
1
]
=
l
&
0xff
;
SHA1_Update
(
sha
,
b
,
2
);
...
...
@@ -172,7 +171,7 @@ static void zkp_hash(BIGNUM *h, const BIGNUM *zkpg, const JPAKE_STEP_PART *p,
*/
SHA1_Init
(
&
sha
);
hashbn
(
&
sha
,
zkpg
);
assert
(
!
BN_is_zero
(
p
->
zkpx
.
gr
));
OPENSSL_
assert
(
!
BN_is_zero
(
p
->
zkpx
.
gr
));
hashbn
(
&
sha
,
p
->
zkpx
.
gr
);
hashbn
(
&
sha
,
p
->
gx
);
hashstring
(
&
sha
,
proof_name
);
...
...
engines/e_padlock.c
浏览文件 @
70d71f61
...
...
@@ -1169,7 +1169,7 @@ padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
/* Wrapper that provides an interface between the API and
the raw PadLock RNG */
static
int
padlock_rand_bytes
(
unsigned
char
*
output
,
in
t
count
)
padlock_rand_bytes
(
unsigned
char
*
output
,
size_
t
count
)
{
unsigned
int
eax
,
buf
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录