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

(-)ssh-keygen.c (-3 lines)
Lines 49-58 Link Here
49 
#include "hostfile.h"
 49 
#include "hostfile.h"
50 
#include "dns.h"
 50 
#include "dns.h"
51 
#include "ssh2.h"
 51 
#include "ssh2.h"
52 

              
              
            

            

              53
              
#ifdef ENABLE_PKCS11

            

        

          54
          
#include "ssh-pkcs11.h"

          52
          
#include "ssh-pkcs11.h"

        

            

              55
              
#endif

              
              
            

        

          56
          

          53
          

        

        

          57
          
/* Number of bits in the RSA/DSA key.  This value can be set on the command line. */

          54
          
/* Number of bits in the RSA/DSA key.  This value can be set on the command line. */

        

        

          58
          
#define DEFAULT_BITS		2048

          55
          
#define DEFAULT_BITS		2048

        



(-)ssh-pkcs11.c
      (+14 lines)




  

    
      
            Lines 590-593
          fail:
      
      
        Link Here
      
    
  

        

          590
          
	return (-1);

          590
          
	return (-1);

        

        

          591
          
}

          591
          
}

        

        

          592
          

          592
          

        

            

              
              
              593
              
#else

            

            

              594
              

            

            

              595
              
int

            

            

              596
              
pkcs11_init(int interactive)

            

            

              597
              
{

            

            

              598
              
	return (0);

            

            

              599
              
}

            

            

              600
              

            

            

              601
              
void

            

            

              602
              
pkcs11_terminate(void)

            

            

              603
              
{

            

            

              604
              
	return;

            

            

              605
              
}

            

            

              606
              

            

        

          593
          
#endif /* ENABLE_PKCS11 */

          607
          
#endif /* ENABLE_PKCS11 */

        






  

  Return to bug 1929