1 |
vapier 08/04/02 15:42:30 |
2 |
|
3 |
Added: openssh-4.9_p1-x509-hpn-glue.patch |
4 |
Log: |
5 |
Add updated X509/hpn patches. |
6 |
(Portage version: 2.2_pre5) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-misc/openssh/files/openssh-4.9_p1-x509-hpn-glue.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/files/openssh-4.9_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-4.9_p1-x509-hpn-glue.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: openssh-4.9_p1-x509-hpn-glue.patch |
15 |
=================================================================== |
16 |
move things around so hpn applies cleanly when using X509 |
17 |
|
18 |
--- servconf.c |
19 |
+++ servconf.c |
20 |
@@ -106,6 +106,17 @@ |
21 |
options->log_level = SYSLOG_LEVEL_NOT_SET; |
22 |
options->rhosts_rsa_authentication = -1; |
23 |
options->hostbased_authentication = -1; |
24 |
+ options->hostbased_algorithms = NULL; |
25 |
+ options->pubkey_algorithms = NULL; |
26 |
+ ssh_x509flags_initialize(&options->x509flags, 1); |
27 |
+#ifndef SSH_X509STORE_DISABLED |
28 |
+ ssh_x509store_initialize(&options->ca); |
29 |
+#endif /*ndef SSH_X509STORE_DISABLED*/ |
30 |
+#ifdef SSH_OCSP_ENABLED |
31 |
+ options->va.type = -1; |
32 |
+ options->va.certificate_file = NULL; |
33 |
+ options->va.responder_url = NULL; |
34 |
+#endif /*def SSH_OCSP_ENABLED*/ |
35 |
options->hostbased_uses_name_from_packet_only = -1; |
36 |
options->rsa_authentication = -1; |
37 |
options->pubkey_authentication = -1; |
38 |
@@ -147,18 +158,6 @@ |
39 |
options->num_permitted_opens = -1; |
40 |
options->adm_forced_command = NULL; |
41 |
options->chroot_directory = NULL; |
42 |
- |
43 |
- options->hostbased_algorithms = NULL; |
44 |
- options->pubkey_algorithms = NULL; |
45 |
- ssh_x509flags_initialize(&options->x509flags, 1); |
46 |
-#ifndef SSH_X509STORE_DISABLED |
47 |
- ssh_x509store_initialize(&options->ca); |
48 |
-#endif /*ndef SSH_X509STORE_DISABLED*/ |
49 |
-#ifdef SSH_OCSP_ENABLED |
50 |
- options->va.type = -1; |
51 |
- options->va.certificate_file = NULL; |
52 |
- options->va.responder_url = NULL; |
53 |
-#endif /*def SSH_OCSP_ENABLED*/ |
54 |
} |
55 |
|
56 |
void |
57 |
@@ -329,6 +329,16 @@ |
58 |
/* Portable-specific options */ |
59 |
sUsePAM, |
60 |
/* Standard Options */ |
61 |
+ sHostbasedAlgorithms, |
62 |
+ sPubkeyAlgorithms, |
63 |
+ sX509KeyAlgorithm, |
64 |
+ sAllowedClientCertPurpose, |
65 |
+ sKeyAllowSelfIssued, sMandatoryCRL, |
66 |
+ sCACertificateFile, sCACertificatePath, |
67 |
+ sCARevocationFile, sCARevocationPath, |
68 |
+ sCAldapVersion, sCAldapURL, |
69 |
+ sVAType, sVACertificateFile, |
70 |
+ sVAOCSPResponderURL, |
71 |
sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, |
72 |
sPermitRootLogin, sLogFacility, sLogLevel, |
73 |
sRhostsRSAAuthentication, sRSAAuthentication, |
74 |
@@ -351,16 +361,6 @@ |
75 |
sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, |
76 |
sMatch, sPermitOpen, sForceCommand, |
77 |
sUsePrivilegeSeparation, |
78 |
- sHostbasedAlgorithms, |
79 |
- sPubkeyAlgorithms, |
80 |
- sX509KeyAlgorithm, |
81 |
- sAllowedClientCertPurpose, |
82 |
- sKeyAllowSelfIssued, sMandatoryCRL, |
83 |
- sCACertificateFile, sCACertificatePath, |
84 |
- sCARevocationFile, sCARevocationPath, |
85 |
- sCAldapVersion, sCAldapURL, |
86 |
- sVAType, sVACertificateFile, |
87 |
- sVAOCSPResponderURL, |
88 |
sDeprecated, sUnsupported |
89 |
} ServerOpCodes; |
90 |
|
91 |
--- Makefile.in |
92 |
+++ Makefile.in |
93 |
@@ -44,11 +44,12 @@ |
94 |
CC=@CC@ |
95 |
LD=@LD@ |
96 |
CFLAGS=@CFLAGS@ |
97 |
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ |
98 |
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
99 |
LIBS=@LIBS@ |
100 |
SSHDLIBS=@SSHDLIBS@ |
101 |
LIBEDIT=@LIBEDIT@ |
102 |
LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ |
103 |
+CPPFLAGS += @LDAP_CPPFLAGS@ |
104 |
AR=@AR@ |
105 |
AWK=@AWK@ |
106 |
RANLIB=@RANLIB@ |
107 |
|
108 |
|
109 |
|
110 |
-- |
111 |
gentoo-commits@l.g.o mailing list |