Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
OpenLDAP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
James Lowden
OpenLDAP
Commits
66f9f50d
Commit
66f9f50d
authored
14 years ago
by
Howard Chu
Committed by
Quanah Gibson-Mount
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Export pw_string64 as lutil_passwd_string64
parent
5d2a30c8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/lutil.h
+7
-0
7 additions, 0 deletions
include/lutil.h
libraries/liblutil/passwd.c
+5
-5
5 additions, 5 deletions
libraries/liblutil/passwd.c
with
12 additions
and
5 deletions
include/lutil.h
+
7
−
0
View file @
66f9f50d
...
...
@@ -143,6 +143,13 @@ LDAP_LUTIL_F( int )
lutil_salt_format
LDAP_P
((
const
char
*
format
));
LDAP_LUTIL_F
(
int
)
lutil_passwd_string64
LDAP_P
((
const
struct
berval
*
sc
,
const
struct
berval
*
hash
,
struct
berval
*
b64
,
const
struct
berval
*
salt
));
/* utils.c */
LDAP_LUTIL_F
(
char
*
)
lutil_progname
LDAP_P
((
...
...
This diff is collapsed.
Click to expand it.
libraries/liblutil/passwd.c
+
5
−
5
View file @
66f9f50d
...
...
@@ -424,7 +424,7 @@ static int pw_string(
}
#endif
/* SLAPD_LMHASH || SLAPD_CRYPT */
static
int
pw
_string64
(
int
lutil_passwd
_string64
(
const
struct
berval
*
sc
,
const
struct
berval
*
hash
,
struct
berval
*
b64
,
...
...
@@ -1051,7 +1051,7 @@ static int hash_ssha1(
(
const
unsigned
char
*
)
salt
.
bv_val
,
salt
.
bv_len
);
lutil_SHA1Final
(
SHA1digest
,
&
SHA1context
);
return
pw
_string64
(
scheme
,
&
digest
,
hash
,
&
salt
);
return
lutil_passwd
_string64
(
scheme
,
&
digest
,
hash
,
&
salt
);
}
static
int
hash_sha1
(
...
...
@@ -1071,7 +1071,7 @@ static int hash_sha1(
(
const
unsigned
char
*
)
passwd
->
bv_val
,
passwd
->
bv_len
);
lutil_SHA1Final
(
SHA1digest
,
&
SHA1context
);
return
pw
_string64
(
scheme
,
&
digest
,
hash
,
NULL
);
return
lutil_passwd
_string64
(
scheme
,
&
digest
,
hash
,
NULL
);
}
#endif
...
...
@@ -1103,7 +1103,7 @@ static int hash_smd5(
(
const
unsigned
char
*
)
salt
.
bv_val
,
salt
.
bv_len
);
lutil_MD5Final
(
MD5digest
,
&
MD5context
);
return
pw
_string64
(
scheme
,
&
digest
,
hash
,
&
salt
);
return
lutil_passwd
_string64
(
scheme
,
&
digest
,
hash
,
&
salt
);
}
static
int
hash_md5
(
...
...
@@ -1125,7 +1125,7 @@ static int hash_md5(
(
const
unsigned
char
*
)
passwd
->
bv_val
,
passwd
->
bv_len
);
lutil_MD5Final
(
MD5digest
,
&
MD5context
);
return
pw
_string64
(
scheme
,
&
digest
,
hash
,
NULL
);
return
lutil_passwd
_string64
(
scheme
,
&
digest
,
hash
,
NULL
);
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment