giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanups, fix --with-common-dir work with OpenSSL engine detection 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1253 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet 2003-07-11 18:16:12 +00:00
parent cde2543e4e
commit c83c8870d1
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -482,7 +482,7 @@ saved_CPPFLAGS="$CPPFLAGS"
AC_SUBST(LIBCRYPTO)
AC_SUBST(LIBCRYPTOA)
AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
for ssldir in $tryssldir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
for ssldir in $tryssldir $trycommondir "" /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
# Skip directories if they don't exist
if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
continue;

5
src/sslengines/engine_pkcs11.c
View File

@ -76,8 +76,6 @@ int pkcs11_finish(ENGINE *engine) {
}
int pkcs11_init(ENGINE *engine) {
int r=0;
if(!quiet)
fprintf(stderr,"initializing engine\n");
@ -122,7 +120,6 @@ static int hex2byte(const char *hex)
static int hex_to_bin(const char *in, unsigned char *out, size_t *outlen)
{
int err = 0;
size_t left, count = 0;
if (in == NULL || *in == '\0') {
@ -166,7 +163,6 @@ static int hex_to_bin(const char *in, unsigned char *out, size_t *outlen)
c++;
}
out:
*outlen = count;
return 1;
}
@ -251,7 +247,6 @@ EVP_PKEY *pkcs11_load_key(ENGINE *e, const char *s_slot_key_id,
fail("failed to enumerate slots\n");
printf("Found %u slot%s\n", count, (count <= 1)? "" : "s");
again:
for (n = 0; n < count; n++) {
slot = slot_list + n;
flags[0] = '\0';