diff options
| author | kris <kris@FreeBSD.org> | 2000-04-13 06:33:22 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-04-13 06:33:22 +0000 |
| commit | 54c77f990d8a5f46f1d18b67cddb279f49176146 (patch) | |
| tree | 85b9c007d5ac1d91a3895eef3fd18d6114b62cc4 /crypto/openssl/crypto/x509/by_dir.c | |
| parent | 7e4e44947b1aa16034c99654c268dc92300be719 (diff) | |
| download | FreeBSD-src-54c77f990d8a5f46f1d18b67cddb279f49176146.zip FreeBSD-src-54c77f990d8a5f46f1d18b67cddb279f49176146.tar.gz | |
Initial import of OpenSSL 0.9.5a
Diffstat (limited to 'crypto/openssl/crypto/x509/by_dir.c')
| -rw-r--r-- | crypto/openssl/crypto/x509/by_dir.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/crypto/openssl/crypto/x509/by_dir.c b/crypto/openssl/crypto/x509/by_dir.c index 734e39a..14d12c5 100644 --- a/crypto/openssl/crypto/x509/by_dir.c +++ b/crypto/openssl/crypto/x509/by_dir.c @@ -59,10 +59,18 @@ #include <stdio.h> #include <time.h> #include <errno.h> -#include <sys/types.h> -#include <sys/stat.h> #include "cryptlib.h" + +#ifndef NO_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef MAC_OS_pre_X +# include <stat.h> +#else +# include <sys/stat.h> +#endif + #include <openssl/lhash.h> #include <openssl/x509.h> @@ -210,9 +218,9 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type) memcpy(ip,ctx->dirs_type,(ctx->num_dirs_alloced-10)* sizeof(int)); if (ctx->dirs != NULL) - Free((char *)ctx->dirs); + Free(ctx->dirs); if (ctx->dirs_type != NULL) - Free((char *)ctx->dirs_type); + Free(ctx->dirs_type); ctx->dirs=pp; ctx->dirs_type=ip; } @@ -318,8 +326,7 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, /* we have added it to the cache so now pull * it out again */ CRYPTO_r_lock(CRYPTO_LOCK_X509_STORE); - tmp=(X509_OBJECT *)lh_retrieve(xl->store_ctx->certs, - (char *)&stmp); + tmp=(X509_OBJECT *)lh_retrieve(xl->store_ctx->certs,&stmp); CRYPTO_r_unlock(CRYPTO_LOCK_X509_STORE); if (tmp != NULL) |
