[BACK]Return to ssh-pkcs11.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-pkcs11.h between version 1.4 and 1.5

version 1.4, 2015/01/15 09:40:00 version 1.5, 2019/01/20 22:51:37
Line 14 
Line 14 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */   */
   
   /* Errors for pkcs11_add_provider() */
   #define SSH_PKCS11_ERR_GENERIC                  1
   #define SSH_PKCS11_ERR_LOGIN_FAIL               2
   #define SSH_PKCS11_ERR_NO_SLOTS                 3
   #define SSH_PKCS11_ERR_PIN_REQUIRED             4
   #define SSH_PKCS11_ERR_PIN_LOCKED               5
   
 int     pkcs11_init(int);  int     pkcs11_init(int);
 void    pkcs11_terminate(void);  void    pkcs11_terminate(void);
 int     pkcs11_add_provider(char *, char *, struct sshkey ***);  int     pkcs11_add_provider(char *, char *, struct sshkey ***);
 int     pkcs11_del_provider(char *);  int     pkcs11_del_provider(char *);
   #ifdef WITH_PKCS11_KEYGEN
   struct sshkey *
           pkcs11_gakp(char *, char *, unsigned int, char *, unsigned int,
               unsigned int, unsigned char, u_int32_t *);
   struct sshkey *
           pkcs11_destroy_keypair(char *, char *, unsigned long, unsigned char,
               u_int32_t *);
   #endif
   
 #if !defined(WITH_OPENSSL) && defined(ENABLE_PKCS11)  #if !defined(WITH_OPENSSL) && defined(ENABLE_PKCS11)
 #undef ENABLE_PKCS11  #undef ENABLE_PKCS11

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5