Module Name: src
Committed By: he
Date: Thu Dec 2 10:23:51 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh/dist: ssh-pkcs11.c
Log Message:
Make this build for platforms which don't define HAVE_DLOPEN, notably
our sun2 port. Eliminates "defined but not used" warnings turned into
errors by our setup.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c:1.2 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c:1.3
--- src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c:1.2 Sun Nov 21 18:59:04 2010
+++ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c Thu Dec 2 10:23:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh-pkcs11.c,v 1.2 2010/11/21 18:59:04 adam Exp $ */
+/* $NetBSD: ssh-pkcs11.c,v 1.3 2010/12/02 10:23:51 he Exp $ */
/* $OpenBSD: ssh-pkcs11.c,v 1.6 2010/06/08 21:32:19 markus Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
@@ -16,7 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "includes.h"
-__RCSID("$NetBSD: ssh-pkcs11.c,v 1.2 2010/11/21 18:59:04 adam Exp $");
+__RCSID("$NetBSD: ssh-pkcs11.c,v 1.3 2010/12/02 10:23:51 he Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -166,6 +166,7 @@
return (-1);
}
+#ifdef HAVE_DLOPEN
/* openssl callback for freeing an RSA key */
static int
pkcs11_rsa_finish(RSA *rsa)
@@ -466,7 +467,6 @@
return (0);
}
-#ifdef HAVE_DLOPEN
/* register a new provider, fails if provider already exists */
int
pkcs11_add_provider(char *provider_id, char *pin, Key ***keyp)
