- update crypt.3 man page
This commit is contained in:
parent
fb8d9ccf4d
commit
f6504afbf0
74
man-pages-2.75-crypt.patch
Normal file
74
man-pages-2.75-crypt.patch
Normal file
@ -0,0 +1,74 @@
|
||||
diff -up man-pages-2.75/man3/crypt.3.pom man-pages-2.75/man3/crypt.3
|
||||
--- man-pages-2.75/man3/crypt.3.pom 2008-01-03 17:07:29.000000000 +0100
|
||||
+++ man-pages-2.75/man3/crypt.3 2008-01-14 11:04:42.000000000 +0100
|
||||
@@ -141,22 +141,59 @@ function was not implemented, probably b
|
||||
SVr4, 4.3BSD, POSIX.1-2001
|
||||
.SH NOTES
|
||||
.SS Glibc Notes
|
||||
-The glibc2 version of this function has the following additional features.
|
||||
+The glibc2 version of this function has the following additional features:
|
||||
+
|
||||
If
|
||||
.I salt
|
||||
-is a character string starting with the three characters "$1$"
|
||||
-followed by at most eight characters, and optionally terminated by "$",
|
||||
-then instead of using the DES machine, the glibc crypt function
|
||||
-uses an MD5-based algorithm, and outputs up to 34 bytes,
|
||||
-namely "$1$<salt>$<encoded>", where
|
||||
-"<salt>" stands for the up to 8 characters following "$1$" in the salt,
|
||||
-and "<encoded>" is a further 22 characters.
|
||||
-The characters in "<salt>" and "<encoded>" are drawn from the set
|
||||
+is a character string starting with the three characters "$<ID>$"
|
||||
+followed by a string terminated by "$",
|
||||
+
|
||||
+$<ID>$<salt>$<pwd>
|
||||
+
|
||||
+then instead of using the DES machine, ID identifies the method used and
|
||||
+this then determines how the rest of the password string is
|
||||
+interpreted. So far the following ID values are in use:
|
||||
+
|
||||
+.TS
|
||||
+l l.
|
||||
+ID | Method
|
||||
+_
|
||||
+1 | MD5 (Linux, BSD)
|
||||
+2a | Blowfish (OpenBSD)
|
||||
+md5 | Sun MD5
|
||||
+.TE
|
||||
+
|
||||
+For the new SHA-256 and SHA-512 methods the following values are
|
||||
+selected:
|
||||
+
|
||||
+.TS
|
||||
+l l.
|
||||
+ID | Method
|
||||
+_
|
||||
+5 | SHA-256
|
||||
+6 | SHA-512
|
||||
+.TE
|
||||
+
|
||||
+So $5$<salt>$<pwd> is a SHA-256 encoded password and $6$<salt>$<pwd> is a
|
||||
+SHA-512 encoded one.
|
||||
+
|
||||
+"<salt>" stands for the up to 16 characters following "$ID$" in the salt.
|
||||
+The pwd part of the password string is the actual computed password.
|
||||
+The size of this string is fixed:
|
||||
+
|
||||
+.TS
|
||||
+l l.
|
||||
+MD5 | 22 characters
|
||||
+SHA-256 | 43 characters
|
||||
+SHA-512 | 86 characters
|
||||
+.TE
|
||||
+
|
||||
+The characters in "<salt>" and "<pwd>" are drawn from the set
|
||||
[\fBa\fP\(en\fBzA\fP\(en\fBZ0\fP\(en\fB9./\fP].
|
||||
-The entire
|
||||
+In SHA implementation the entire
|
||||
.I key
|
||||
is significant here (instead of only the first
|
||||
-8 bytes).
|
||||
+8 bytes in MD5).
|
||||
.SH "SEE ALSO"
|
||||
.BR login (1),
|
||||
.BR passwd (1),
|
@ -1,7 +1,7 @@
|
||||
Summary: Man (manual) pages from the Linux Documentation Project
|
||||
Name: man-pages
|
||||
Version: 2.75
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+, GLP, BSD, MIT, Copyright only, IEEE
|
||||
Group: Documentation
|
||||
URL: http://www.kernel.org/pub/linux/docs/manpages/
|
||||
@ -31,6 +31,7 @@ Patch46: man-pages-2.51-nscd-conf.patch
|
||||
Patch48: man-pages-2.51-sched_setaffinity.patch
|
||||
Patch49: man-pages-2.63-getent.patch
|
||||
Patch50: man-pages-2.63-iconv.patch
|
||||
Patch51: man-pages-2.75-crypt.patch
|
||||
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Autoreq: false
|
||||
@ -65,6 +66,7 @@ done
|
||||
%patch48 -p1
|
||||
%patch49 -p1
|
||||
%patch50 -p1
|
||||
%patch51 -p1
|
||||
|
||||
### And now remove those we are not going to use:
|
||||
|
||||
@ -175,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%lang(en) %{_mandir}/en/man*
|
||||
|
||||
%changelog
|
||||
* Fri Jan 11 2008 Ivana Varekova <varekova@redhat.com> - 2.75-2
|
||||
- update crypt.3 man page
|
||||
|
||||
* Fri Jan 11 2008 Ivana Varekova <varekova@redhat.com> - 2.75-1
|
||||
- update to 2.75
|
||||
- remove fs page patch
|
||||
|
Loading…
Reference in New Issue
Block a user