diff options
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/by_dir.c | 3 | ||||
| -rw-r--r-- | crypto/x509/x509_vpm.c | 26 | ||||
| -rw-r--r-- | crypto/x509/x509spki.c | 6 | ||||
| -rw-r--r-- | crypto/x509/x_name.c | 9 |
4 files changed, 15 insertions, 29 deletions
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index b30fa30d5f..31b3c3c9dc 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -176,8 +176,7 @@ static int by_dir_hash_cmp(const BY_DIR_HASH *const *a, static void by_dir_entry_free(BY_DIR_ENTRY *ent) { - if (ent->dir) - OPENSSL_free(ent->dir); + OPENSSL_free(ent->dir); if (ent->hashes) sk_BY_DIR_HASH_pop_free(ent->hashes, by_dir_hash_free); OPENSSL_free(ent); diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index 57c2606bbb..b0d9c4de91 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -149,19 +149,13 @@ static void x509_verify_param_zero(X509_VERIFY_PARAM *param) paramid = param->id; string_stack_free(paramid->hosts); paramid->hosts = NULL; - if (paramid->peername) - OPENSSL_free(paramid->peername); - if (paramid->email) { - OPENSSL_free(paramid->email); - paramid->email = NULL; - paramid->emaillen = 0; - } - if (paramid->ip) { - OPENSSL_free(paramid->ip); - paramid->ip = NULL; - paramid->iplen = 0; - } - + OPENSSL_free(paramid->peername); + OPENSSL_free(paramid->email); + paramid->email = NULL; + paramid->emaillen = 0; + OPENSSL_free(paramid->ip); + paramid->ip = NULL; + paramid->iplen = 0; } X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void) @@ -346,8 +340,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, tmp = NULL; srclen = 0; } - if (*pdest) - OPENSSL_free(*pdest); + OPENSSL_free(*pdest); *pdest = tmp; if (pdestlen) *pdestlen = srclen; @@ -356,8 +349,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) { - if (param->name) - OPENSSL_free(param->name); + OPENSSL_free(param->name); param->name = BUF_strdup(name); if (param->name) return 1; diff --git a/crypto/x509/x509spki.c b/crypto/x509/x509spki.c index 347ab4cd7b..fb46d4e3af 100644 --- a/crypto/x509/x509spki.c +++ b/crypto/x509/x509spki.c @@ -113,10 +113,8 @@ char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki) b64_str = OPENSSL_malloc(der_len * 2); if (!der_spki || !b64_str) { X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE); - if (der_spki != NULL) - OPENSSL_free(der_spki); - if (b64_str != NULL) - OPENSSL_free(b64_str); + OPENSSL_free(der_spki); + OPENSSL_free(b64_str); return NULL; } p = der_spki; diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index cdc4c973b3..cab7171474 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -166,8 +166,7 @@ static void x509_name_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it) BUF_MEM_free(a->bytes); sk_X509_NAME_ENTRY_pop_free(a->entries, X509_NAME_ENTRY_free); - if (a->canon_enc) - OPENSSL_free(a->canon_enc); + OPENSSL_free(a->canon_enc); OPENSSL_free(a); *pval = NULL; } @@ -343,10 +342,8 @@ static int x509_name_canon(X509_NAME *a) X509_NAME_ENTRY *entry, *tmpentry = NULL; int i, set = -1, ret = 0; - if (a->canon_enc) { - OPENSSL_free(a->canon_enc); - a->canon_enc = NULL; - } + OPENSSL_free(a->canon_enc); + a->canon_enc = NULL; /* Special case: empty X509_NAME => null encoding */ if (sk_X509_NAME_ENTRY_num(a->entries) == 0) { a->canon_enclen = 0; |