Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
0a3094b6
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0a3094b6
编写于
8月 17, 2001
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reorder MD5/crypt so MD5 comes first in the code.
上级
2637f887
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
45 addition
and
45 deletion
+45
-45
src/backend/libpq/auth.c
src/backend/libpq/auth.c
+7
-7
src/backend/libpq/crypt.c
src/backend/libpq/crypt.c
+8
-8
src/interfaces/libpq/fe-auth.c
src/interfaces/libpq/fe-auth.c
+30
-30
未找到文件。
src/backend/libpq/auth.c
浏览文件 @
0a3094b6
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.6
0 2001/08/17 02:59:19
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.6
1 2001/08/17 15:40:07
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -420,8 +420,8 @@ auth_failed(Port *port)
authmethod
=
"IDENT"
;
break
;
case
uaPassword
:
case
uaCrypt
:
case
uaMD5
:
case
uaCrypt
:
authmethod
=
"Password"
;
break
;
}
...
...
@@ -501,13 +501,13 @@ ClientAuthentication(Port *port)
status
=
recv_and_check_password_packet
(
port
);
break
;
case
ua
Crypt
:
sendAuthRequest
(
port
,
AUTH_REQ_
CRYPT
);
case
ua
MD5
:
sendAuthRequest
(
port
,
AUTH_REQ_
MD5
);
status
=
recv_and_check_password_packet
(
port
);
break
;
case
ua
MD5
:
sendAuthRequest
(
port
,
AUTH_REQ_
MD5
);
case
ua
Crypt
:
sendAuthRequest
(
port
,
AUTH_REQ_
CRYPT
);
status
=
recv_and_check_password_packet
(
port
);
break
;
...
...
@@ -643,8 +643,8 @@ map_old_to_new(Port *port, UserAuth old, int status)
{
switch
(
port
->
auth_method
)
{
case
uaCrypt
:
case
uaMD5
:
case
uaCrypt
:
case
uaReject
:
status
=
STATUS_ERROR
;
break
;
...
...
src/backend/libpq/crypt.c
浏览文件 @
0a3094b6
...
...
@@ -9,7 +9,7 @@
* Dec 17, 1997 - Todd A. Brandys
* Orignal Version Completed.
*
* $Id: crypt.c,v 1.3
6 2001/08/17 03:09:31
momjian Exp $
* $Id: crypt.c,v 1.3
7 2001/08/17 15:40:07
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -294,13 +294,6 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
*/
switch
(
port
->
auth_method
)
{
case
uaCrypt
:
{
char
salt
[
3
];
StrNCpy
(
salt
,
port
->
cryptSalt
,
3
);
crypt_pwd
=
crypt
(
passwd
,
salt
);
break
;
}
case
uaMD5
:
crypt_pwd
=
palloc
(
MD5_PASSWD_LEN
+
1
);
if
(
isMD5
(
passwd
))
...
...
@@ -334,6 +327,13 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
pfree
(
crypt_pwd2
);
}
break
;
case
uaCrypt
:
{
char
salt
[
3
];
StrNCpy
(
salt
,
port
->
cryptSalt
,
3
);
crypt_pwd
=
crypt
(
passwd
,
salt
);
break
;
}
default:
crypt_pwd
=
passwd
;
break
;
...
...
src/interfaces/libpq/fe-auth.c
浏览文件 @
0a3094b6
...
...
@@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.5
4 2001/08/17 15:11:15
momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.5
5 2001/08/17 15:40:07
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -438,6 +438,33 @@ pg_password_sendauth(PGconn *conn, const char *password, AuthRequest areq)
switch
(
areq
)
{
case
AUTH_REQ_MD5
:
{
char
*
crypt_pwd2
;
if
(
!
(
crypt_pwd
=
malloc
(
MD5_PASSWD_LEN
+
1
))
||
!
(
crypt_pwd2
=
malloc
(
MD5_PASSWD_LEN
+
1
)))
{
perror
(
"malloc"
);
return
STATUS_ERROR
;
}
if
(
!
EncryptMD5
(
password
,
conn
->
pguser
,
strlen
(
conn
->
pguser
),
crypt_pwd2
))
{
free
(
crypt_pwd
);
free
(
crypt_pwd2
);
return
STATUS_ERROR
;
}
if
(
!
EncryptMD5
(
crypt_pwd2
+
strlen
(
"md5"
),
conn
->
md5Salt
,
sizeof
(
conn
->
md5Salt
),
crypt_pwd
))
{
free
(
crypt_pwd
);
free
(
crypt_pwd2
);
return
STATUS_ERROR
;
}
free
(
crypt_pwd2
);
break
;
}
case
AUTH_REQ_CRYPT
:
{
char
salt
[
3
];
...
...
@@ -446,33 +473,6 @@ pg_password_sendauth(PGconn *conn, const char *password, AuthRequest areq)
crypt_pwd
=
crypt
(
password
,
salt
);
break
;
}
case
AUTH_REQ_MD5
:
{
char
*
crypt_pwd2
;
if
(
!
(
crypt_pwd
=
malloc
(
MD5_PASSWD_LEN
+
1
))
||
!
(
crypt_pwd2
=
malloc
(
MD5_PASSWD_LEN
+
1
)))
{
perror
(
"malloc"
);
return
STATUS_ERROR
;
}
if
(
!
EncryptMD5
(
password
,
conn
->
pguser
,
strlen
(
conn
->
pguser
),
crypt_pwd2
))
{
free
(
crypt_pwd
);
free
(
crypt_pwd2
);
return
STATUS_ERROR
;
}
if
(
!
EncryptMD5
(
crypt_pwd2
+
strlen
(
"md5"
),
conn
->
md5Salt
,
sizeof
(
conn
->
md5Salt
),
crypt_pwd
))
{
free
(
crypt_pwd
);
free
(
crypt_pwd2
);
return
STATUS_ERROR
;
}
free
(
crypt_pwd2
);
break
;
}
default:
/* discard const so we can assign it */
crypt_pwd
=
(
char
*
)
password
;
...
...
@@ -535,9 +535,9 @@ fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
return
STATUS_ERROR
;
#endif
case
AUTH_REQ_PASSWORD
:
case
AUTH_REQ_CRYPT
:
case
AUTH_REQ_MD5
:
case
AUTH_REQ_CRYPT
:
case
AUTH_REQ_PASSWORD
:
if
(
password
==
NULL
||
*
password
==
'\0'
)
{
(
void
)
sprintf
(
PQerrormsg
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录