First of all, sorry for sending a "subscribe" to the list by misstake (if it
wasnt filtered out by the MLM software).
Second, i have a Debian/Woody system running 2.4.18 (Patched for XFS
support). I figured my next attempt of adding functionality would be crypto.
So i patch the kernel successfully, then procede to patch the linux utils,
but that does not complete as expected. According to the docs a pathc should
work on a util-linux that has a higher version.. and "t" should be higher
then "b", so what might i be missing?
cookiemonster:~/Download/Crypto/util-linux-2.11t# patch -p1 <
/usr/src/linux/Documentation/crypto/util-linux-2.11b.patch
patching file MCONFIG
patching file mount/Makefile
patching file mount/lomount.c
Hunk #10 FAILED at 617.
1 out of 14 hunks FAILED -- saving rejects to file mount/lomount.c.rej
patching file mount/lomount.h
patching file mount/losetup.8
patching file mount/mount.8
Hunk #1 succeeded at 258 (offset 6 lines).
Hunk #2 FAILED at 529.
Hunk #3 succeeded at 1604 (offset 240 lines).
1 out of 3 hunks FAILED -- saving rejects to file mount/mount.8.rej
patching file mount/mount.c
Hunk #1 succeeded at 108 (offset 1 line).
Hunk #2 succeeded at 595 (offset 21 lines).
Hunk #3 succeeded at 1357 (offset 69 lines).
Hunk #4 succeeded at 1394 with fuzz 1 (offset 72 lines).
Hunk #5 succeeded at 1410 with fuzz 2 (offset 72 lines).
Hunk #6 FAILED at 1432.
Hunk #7 succeeded at 1448 (offset 73 lines).
Hunk #8 succeeded at 1466 (offset 73 lines).
Hunk #9 succeeded at 1574 (offset 91 lines).
1 out of 9 hunks FAILED -- saving rejects to file mount/mount.c.rej
patching file mount/rmd160.c
patching file mount/rmd160.h
cookiemonster:~/Download/Crypto/util-linux-2.11t# ls /root/Download/Crypto/
patch-int-2.4.3.1 util-linux-2.11t util-linux-2.11t.tar.gz
cookiemonster:~/Download/Crypto/util-linux-2.11t#
cookiemonster:~/Download/Crypto/util-linux-2.11t/mount# cat *.rej
***************
*** 387,405 ****
int
main(int argc, char **argv) {
- char *offset, *encryption;
int delete,off,c;
int res = 0;
int ro = 0;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
delete = off = 0;
- offset = encryption = NULL;
progname = argv[0];
- while ((c = getopt(argc,argv,"de:o:v")) != EOF) {
switch (c) {
case 'd':
delete = 1;
--- 617,638 ----
int
main(int argc, char **argv) {
+ char *offset, *encryption, *passfd, *keysize;
int delete,off,c;
+ int pfd = -1;
int res = 0;
int ro = 0;
+ int keysz = 0;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
delete = off = 0;
+ offset = encryption = passfd = keysize = NULL;
progname = argv[0];
+ while ((c = getopt_long(argc,argv,"de:hk:o:p:v",
+ longopts, NULL)) != EOF) {
switch (c) {
case 'd':
delete = 1;
***************
*** 523,528 ****
.BR noexec ", " nosuid ", and " nodev
(unless overridden by subsequent options, as in the option line
.BR user,exec,dev,suid ).
.RE
.SH "FILESYSTEM SPECIFIC MOUNT OPTIONS"
--- 529,543 ----
.BR noexec ", " nosuid ", and " nodev
(unless overridden by subsequent options, as in the option line
.BR user,exec,dev,suid ).
+ .TP
+ .B encryption
+ Specifies an encryption algorithm to use. Used in conjunction with the
+ .BR loop " option."
+ .TP
+ .B keybits
+ Specifies the key size to use for an encryption algorithm. Used in
conjunction
+ with the
+ .BR loop " and " encryption " options."
.RE
.SH "FILESYSTEM SPECIFIC MOUNT OPTIONS"
***************
*** 1421,1427 ****
initproctitle(argc, argv);
#endif
- while ((c = getopt_long (argc, argv, "afFhlL:no:rsU:vVwt:",
longopts, NULL)) != EOF) {
switch (c) {
case 'a': /* mount everything in fstab */
--- 1432,1438 ----
initproctitle(argc, argv);
#endif
+ while ((c = getopt_long (argc, argv, "afFhlL:no:p:rsU:vVwt:",
longopts, NULL)) != EOF) {
switch (c) {
case 'a': /* mount everything in fstab */
cookiemonster:~/Download/Crypto/util-linux-2.11t/mount#
-
Linux-crypto: cryptography in and on the Linux system
Archive: http://mail.nl.linux.org/linux-crypto/
