Attachment 1484 Details for Bug 1371 – 2003_all_pkcs11-scp.patch

[patch] 2003_all_pkcs11-scp.patch

2003_all_pkcs11-scp.patch (text/plain), 1.04 KB, created by Alon Bar-Lev on 2008-04-25 04:47:07 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Bar-Lev

Created: 2008-04-25 04:47:07 AEST

Size: 1.04 KB

patch

obsolete

>[PATCH] scp PKCS#11 parameter addition
>
>Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
>
>---
>
>diff -urNp openssh-5.0p1/scp.c openssh-5.0p1.new/scp.c
>--- openssh-5.0p1/scp.c	2008-03-14 02:59:50.000000000 +0200
>+++ openssh-5.0p1.new/scp.c	2008-04-24 20:59:26.000000000 +0300
>@@ -323,9 +323,12 @@ main(int argc, char **argv)
> 	addargs(&args, "-oClearAllForwardings yes");
> 
> 	fflag = tflag = 0;
>-	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
>+	while ((ch = getopt(argc, argv, "#:dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
> 		switch (ch) {
> 		/* User-visible flags. */
>+		case '#':
>+			addargs(&args, "-#%s", optarg);
>+			break;
> 		case '1':
> 		case '2':
> 		case '4':
>@@ -1169,6 +1172,9 @@ usage(void)
> 	(void) fprintf(stderr,
> 	    "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
> 	    "           [-l limit] [-o ssh_option] [-P port] [-S program]\n"
>+#ifdef ENABLE_PKCS11
>+	    "           [-# pkcs11_provider_info]\n"
>+#endif
> 	    "           [[user@]host1:]file1 ... [[user@]host2:]file2\n");
> 	exit(1);
> }

Actions: View | Diff

Attachments on bug 1371: 1444 | 1463 | 1464 | 1465 | 1466 | 1467 | 1468 | 1469 | 1470 | 1471 | 1477 | 1478 | 1484 | 1485 | 1486 | 1487 | 1488 | 1489 | 1490 | 1491 | 1492 | 1493 | 1494 | 1495 | 1496 | 1497 | 1547 | 1557 | 1558