View | Details | Raw Unified | Return to bug 3020
Collapse All | Expand All

(-)a/regress/Makefile (-2 / +3 lines)
Lines 113-120 CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ Link Here
113 
		rsa1 rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \
 113 
		rsa1 rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \
114 
		rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
 114 
		rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
115 
		scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
 115 
		scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
116 
		sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
 116 
		sftp-server.sh sftp.log ssh-log-wrapper.sh \
117 
		ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
 117 
		ssh-rsa_oldfmt \
118 
		ssh.log ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
118 
		ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
 119 
		ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
119 
		sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \
 120 
		sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \
120 
		sshd_proxy_orig t10.out t10.out.pub t12.out t12.out.pub \
 121 
		sshd_proxy_orig t10.out t10.out.pub t12.out t12.out.pub \
(-)a/regress/conch-ciphers.sh (-1 / +1 lines)
Lines 16-22 for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \ Link Here
16 
	rm -f ${COPY}
 16 
	rm -f ${COPY}
17 
	# XXX the 2nd "cat" seems to be needed because of buggy FD handling
 17 
	# XXX the 2nd "cat" seems to be needed because of buggy FD handling
18 
	# in conch
 18 
	# in conch
19 
	${CONCH} --identity $OBJ/rsa --port $PORT --user $USER  -e none \
 19 
	${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \
20 
	    --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \
 20 
	    --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \
21 
	    127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
 21 
	    127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
22 
	if [ $? -ne 0 ]; then
 22 
	if [ $? -ne 0 ]; then
(-)a/regress/test-exec.sh (-6 / +5 lines)
Lines 527-539 if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then Link Here
527 
	    >> $OBJ/authorized_keys_$USER
 527 
	    >> $OBJ/authorized_keys_$USER
528 

          528
          

        

        

          529
          
	# Convert rsa2 host key to PuTTY format

          529
          
	# Convert rsa2 host key to PuTTY format

        

          
            

              530
              
	cp $OBJ/rsa $OBJ/rsa_oldfmt


              530
              
	cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt

            

            

              531
              
	${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null


              531
              
	${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null

            

            

              532
              
	${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/rsa_oldfmt > \


              532
              
	${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/ssh-rsa_oldfmt > \

            

        

          533
          
	    ${OBJ}/.putty/sshhostkeys

          533
          
	    ${OBJ}/.putty/sshhostkeys

        

          
            

              534
              
	${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa_oldfmt >> \


              534
              
	${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/ssh-rsa_oldfmt >> \

            

        

          535
          
	    ${OBJ}/.putty/sshhostkeys

          535
          
	    ${OBJ}/.putty/sshhostkeys

        

          
            

              536
              
	rm -f $OBJ/rsa_oldfmt


              536
              
	rm -f $OBJ/ssh-rsa_oldfmt

            

        

          537
          

          537
          

        

        

          538
          
	# Setup proxied session

          538
          
	# Setup proxied session

        

        

          539
          
	mkdir -p ${OBJ}/.putty/sessions

          539
          
	mkdir -p ${OBJ}/.putty/sessions

        

            

              540
              
- 

              
              
            






  

  Return to bug 3020