projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass phrase reorganisation.
[oweals/openssl.git]
/
crypto
/
x509
/
by_dir.c
diff --git
a/crypto/x509/by_dir.c
b/crypto/x509/by_dir.c
index 3e1565ea5be084a51e64f9402c4297d3cb733444..14d12c56bd709e47198ecb8b73547624c7f08a3a 100644
(file)
--- a/
crypto/x509/by_dir.c
+++ b/
crypto/x509/by_dir.c
@@
-218,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)
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)
if (ctx->dirs_type != NULL)
- Free(
(char *)
ctx->dirs_type);
+ Free(ctx->dirs_type);
ctx->dirs=pp;
ctx->dirs_type=ip;
}
ctx->dirs=pp;
ctx->dirs_type=ip;
}
@@
-326,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);
/* 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)
CRYPTO_r_unlock(CRYPTO_LOCK_X509_STORE);
if (tmp != NULL)