| 1 |
robbat2 08/08/23 21:33:06 |
| 2 |
|
| 3 |
Added: openssh-5.1_p1-x509-hpn-glue.patch |
| 4 |
Log: |
| 5 |
Forward-port the X509/hpn glue patch per bug #235086. |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: openssh-5.1_p1-x509-hpn-glue.patch |
| 15 |
=================================================================== |
| 16 |
Move things around so hpn applies cleanly when using X509. |
| 17 |
|
| 18 |
Forward-Ported-from: files/openssh-4.9_p1-x509-hpn-glue.patch |
| 19 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 20 |
|
| 21 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/Makefile.in openssh-5.1p1+x509-hpn-glue/Makefile.in |
| 22 |
--- openssh-5.1p1+x509/Makefile.in 2008-08-23 14:12:53.000000000 -0700 |
| 23 |
+++ openssh-5.1p1+x509-hpn-glue/Makefile.in 2008-08-23 14:13:51.000000000 -0700 |
| 24 |
@@ -44,11 +44,12 @@ |
| 25 |
CC=@CC@ |
| 26 |
LD=@LD@ |
| 27 |
CFLAGS=@CFLAGS@ |
| 28 |
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ |
| 29 |
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
| 30 |
LIBS=@LIBS@ |
| 31 |
SSHDLIBS=@SSHDLIBS@ |
| 32 |
LIBEDIT=@LIBEDIT@ |
| 33 |
LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ |
| 34 |
+CPPFLAGS += @LDAP_CPPFLAGS@ |
| 35 |
AR=@AR@ |
| 36 |
AWK=@AWK@ |
| 37 |
RANLIB=@RANLIB@ |
| 38 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/servconf.c openssh-5.1p1+x509-hpn-glue/servconf.c |
| 39 |
--- openssh-5.1p1+x509/servconf.c 2008-08-23 14:12:53.000000000 -0700 |
| 40 |
+++ openssh-5.1p1+x509-hpn-glue/servconf.c 2008-08-23 14:23:56.000000000 -0700 |
| 41 |
@@ -108,6 +108,17 @@ |
| 42 |
options->log_level = SYSLOG_LEVEL_NOT_SET; |
| 43 |
options->rhosts_rsa_authentication = -1; |
| 44 |
options->hostbased_authentication = -1; |
| 45 |
+ options->hostbased_algorithms = NULL; |
| 46 |
+ options->pubkey_algorithms = NULL; |
| 47 |
+ ssh_x509flags_initialize(&options->x509flags, 1); |
| 48 |
+#ifndef SSH_X509STORE_DISABLED |
| 49 |
+ ssh_x509store_initialize(&options->ca); |
| 50 |
+#endif /*ndef SSH_X509STORE_DISABLED*/ |
| 51 |
+#ifdef SSH_OCSP_ENABLED |
| 52 |
+ options->va.type = -1; |
| 53 |
+ options->va.certificate_file = NULL; |
| 54 |
+ options->va.responder_url = NULL; |
| 55 |
+#endif /*def SSH_OCSP_ENABLED*/ |
| 56 |
options->hostbased_uses_name_from_packet_only = -1; |
| 57 |
options->rsa_authentication = -1; |
| 58 |
options->pubkey_authentication = -1; |
| 59 |
@@ -151,18 +162,6 @@ |
| 60 |
options->num_permitted_opens = -1; |
| 61 |
options->adm_forced_command = NULL; |
| 62 |
options->chroot_directory = NULL; |
| 63 |
- |
| 64 |
- options->hostbased_algorithms = NULL; |
| 65 |
- options->pubkey_algorithms = NULL; |
| 66 |
- ssh_x509flags_initialize(&options->x509flags, 1); |
| 67 |
-#ifndef SSH_X509STORE_DISABLED |
| 68 |
- ssh_x509store_initialize(&options->ca); |
| 69 |
-#endif /*ndef SSH_X509STORE_DISABLED*/ |
| 70 |
-#ifdef SSH_OCSP_ENABLED |
| 71 |
- options->va.type = -1; |
| 72 |
- options->va.certificate_file = NULL; |
| 73 |
- options->va.responder_url = NULL; |
| 74 |
-#endif /*def SSH_OCSP_ENABLED*/ |
| 75 |
} |
| 76 |
|
| 77 |
void |
| 78 |
@@ -338,6 +337,16 @@ |
| 79 |
/* Portable-specific options */ |
| 80 |
sUsePAM, |
| 81 |
/* Standard Options */ |
| 82 |
+ sHostbasedAlgorithms, |
| 83 |
+ sPubkeyAlgorithms, |
| 84 |
+ sX509KeyAlgorithm, |
| 85 |
+ sAllowedClientCertPurpose, |
| 86 |
+ sKeyAllowSelfIssued, sMandatoryCRL, |
| 87 |
+ sCACertificateFile, sCACertificatePath, |
| 88 |
+ sCARevocationFile, sCARevocationPath, |
| 89 |
+ sCAldapVersion, sCAldapURL, |
| 90 |
+ sVAType, sVACertificateFile, |
| 91 |
+ sVAOCSPResponderURL, |
| 92 |
sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, |
| 93 |
sPermitRootLogin, sLogFacility, sLogLevel, |
| 94 |
sRhostsRSAAuthentication, sRSAAuthentication, |
| 95 |
@@ -360,16 +369,6 @@ |
| 96 |
sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, |
| 97 |
sMatch, sPermitOpen, sForceCommand, sChrootDirectory, |
| 98 |
sUsePrivilegeSeparation, sAllowAgentForwarding, |
| 99 |
- sHostbasedAlgorithms, |
| 100 |
- sPubkeyAlgorithms, |
| 101 |
- sX509KeyAlgorithm, |
| 102 |
- sAllowedClientCertPurpose, |
| 103 |
- sKeyAllowSelfIssued, sMandatoryCRL, |
| 104 |
- sCACertificateFile, sCACertificatePath, |
| 105 |
- sCARevocationFile, sCARevocationPath, |
| 106 |
- sCAldapVersion, sCAldapURL, |
| 107 |
- sVAType, sVACertificateFile, |
| 108 |
- sVAOCSPResponderURL, |
| 109 |
sDeprecated, sUnsupported |
| 110 |
} ServerOpCodes; |
Archives