diff options
| author | Colin Watson <cjwatson@debian.org> | 2015-08-19 14:23:50 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2015-08-19 14:23:50 +0100 |
| commit | baccdb349b31c47cd76fb63211f754ed33a9707e (patch) | |
| tree | d03653f975fd4eb8bf71bb0c9d168614401202fa /ssh-pkcs11.h | |
| parent | 487bdb3a5ef6075887b830ccb8a0b14f6da78e93 (diff) | |
| parent | 9f82e5a9042f2d872e98f48a876fcab3e25dd9bb (diff) | |
Import openssh_6.8p1.orig.tar.gz
Diffstat (limited to 'ssh-pkcs11.h')
| -rw-r--r-- | ssh-pkcs11.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-pkcs11.h b/ssh-pkcs11.h index 4d2efda13..0ced74f29 100644 --- a/ssh-pkcs11.h +++ b/ssh-pkcs11.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssh-pkcs11.h,v 1.3 2014/04/29 18:01:49 markus Exp $ */ | 1 | /* $OpenBSD: ssh-pkcs11.h,v 1.4 2015/01/15 09:40:00 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. |
| 4 | * | 4 | * |
| @@ -16,7 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | int pkcs11_init(int); | 17 | int pkcs11_init(int); |
| 18 | void pkcs11_terminate(void); | 18 | void pkcs11_terminate(void); |
| 19 | int pkcs11_add_provider(char *, char *, Key ***); | 19 | int pkcs11_add_provider(char *, char *, struct sshkey ***); |
| 20 | int pkcs11_del_provider(char *); | 20 | int pkcs11_del_provider(char *); |
| 21 | 21 | ||
| 22 | #if !defined(WITH_OPENSSL) && defined(ENABLE_PKCS11) | 22 | #if !defined(WITH_OPENSSL) && defined(ENABLE_PKCS11) |