projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use OPENSSL_hexchar2int
[openssl.git]
/
crypto
/
x509v3
/
v3_conf.c
diff --git
a/crypto/x509v3/v3_conf.c
b/crypto/x509v3/v3_conf.c
index 672d3de977729bf6c28494ca63fc786f60a354e4..c7d268247da8f6e955bc632e6580ce4d5651976f 100644
(file)
--- a/
crypto/x509v3/v3_conf.c
+++ b/
crypto/x509v3/v3_conf.c
@@
-1,4
+1,3
@@
-/* v3_conf.c */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
* 1999.
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
* 1999.
@@
-60,9
+59,10
@@
#include <stdio.h>
#include <ctype.h>
#include <stdio.h>
#include <ctype.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/conf.h>
#include <openssl/x509.h>
#include <openssl/conf.h>
#include <openssl/x509.h>
+#include "internal/x509_int.h"
#include <openssl/x509v3.h>
static int v3_check_critical(char **value);
#include <openssl/x509v3.h>
static int v3_check_critical(char **value);
@@
-121,11
+121,12
@@
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
X509_EXTENSION *ext;
STACK_OF(CONF_VALUE) *nval;
void *ext_struc;
X509_EXTENSION *ext;
STACK_OF(CONF_VALUE) *nval;
void *ext_struc;
+
if (ext_nid == NID_undef) {
X509V3err(X509V3_F_DO_EXT_NCONF, X509V3_R_UNKNOWN_EXTENSION_NAME);
return NULL;
}
if (ext_nid == NID_undef) {
X509V3err(X509V3_F_DO_EXT_NCONF, X509V3_R_UNKNOWN_EXTENSION_NAME);
return NULL;
}
- if (
!(method = X509V3_EXT_get_nid(ext_nid))
) {
+ if (
(method = X509V3_EXT_get_nid(ext_nid)) == NULL
) {
X509V3err(X509V3_F_DO_EXT_NCONF, X509V3_R_UNKNOWN_EXTENSION);
return NULL;
}
X509V3err(X509V3_F_DO_EXT_NCONF, X509V3_R_UNKNOWN_EXTENSION);
return NULL;
}
@@
-148,14
+149,14
@@
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
if (!ext_struc)
return NULL;
} else if (method->s2i) {
if (!ext_struc)
return NULL;
} else if (method->s2i) {
- if (
!(ext_struc = method->s2i(method, ctx, value))
)
+ if (
(ext_struc = method->s2i(method, ctx, value)) == NULL
)
return NULL;
} else if (method->r2i) {
if (!ctx->db || !ctx->db_meth) {
X509V3err(X509V3_F_DO_EXT_NCONF, X509V3_R_NO_CONFIG_DATABASE);
return NULL;
}
return NULL;
} else if (method->r2i) {
if (!ctx->db || !ctx->db_meth) {
X509V3err(X509V3_F_DO_EXT_NCONF, X509V3_R_NO_CONFIG_DATABASE);
return NULL;
}
- if (
!(ext_struc = method->r2i(method, ctx, value))
)
+ if (
(ext_struc = method->r2i(method, ctx, value)) == NULL
)
return NULL;
} else {
X509V3err(X509V3_F_DO_EXT_NCONF,
return NULL;
} else {
X509V3err(X509V3_F_DO_EXT_NCONF,
@@
-189,13
+190,14
@@
static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
goto merr;
} else {
unsigned char *p;
goto merr;
} else {
unsigned char *p;
+
ext_len = method->i2d(ext_struc, NULL);
ext_len = method->i2d(ext_struc, NULL);
- if (
!(ext_der = OPENSSL_malloc(ext_len))
)
+ if (
(ext_der = OPENSSL_malloc(ext_len)) == NULL
)
goto merr;
p = ext_der;
method->i2d(ext_struc, &p);
}
goto merr;
p = ext_der;
method->i2d(ext_struc, &p);
}
- if (
!(ext_oct = ASN1_OCTET_STRING_new())
)
+ if (
(ext_oct = ASN1_OCTET_STRING_new()) == NULL
)
goto merr;
ext_oct->data = ext_der;
ext_der = NULL;
goto merr;
ext_oct->data = ext_der;
ext_der = NULL;
@@
-221,7
+223,8
@@
static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc)
{
const X509V3_EXT_METHOD *method;
X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc)
{
const X509V3_EXT_METHOD *method;
- if (!(method = X509V3_EXT_get_nid(ext_nid))) {
+
+ if ((method = X509V3_EXT_get_nid(ext_nid)) == NULL) {
X509V3err(X509V3_F_X509V3_EXT_I2D, X509V3_R_UNKNOWN_EXTENSION);
return NULL;
}
X509V3err(X509V3_F_X509V3_EXT_I2D, X509V3_R_UNKNOWN_EXTENSION);
return NULL;
}
@@
-271,7
+274,8
@@
static X509_EXTENSION *v3_generic_extension(const char *ext, char *value,
ASN1_OBJECT *obj = NULL;
ASN1_OCTET_STRING *oct = NULL;
X509_EXTENSION *extension = NULL;
ASN1_OBJECT *obj = NULL;
ASN1_OCTET_STRING *oct = NULL;
X509_EXTENSION *extension = NULL;
- if (!(obj = OBJ_txt2obj(ext, 0))) {
+
+ if ((obj = OBJ_txt2obj(ext, 0)) == NULL) {
X509V3err(X509V3_F_V3_GENERIC_EXTENSION,
X509V3_R_EXTENSION_NAME_ERROR);
ERR_add_error_data(2, "name=", ext);
X509V3err(X509V3_F_V3_GENERIC_EXTENSION,
X509V3_R_EXTENSION_NAME_ERROR);
ERR_add_error_data(2, "name=", ext);
@@
-279,7
+283,7
@@
static X509_EXTENSION *v3_generic_extension(const char *ext, char *value,
}
if (gen_type == 1)
}
if (gen_type == 1)
- ext_der =
string_to_hex
(value, &ext_len);
+ ext_der =
OPENSSL_hexstr2buf
(value, &ext_len);
else if (gen_type == 2)
ext_der = generic_asn1(value, ctx, &ext_len);
else if (gen_type == 2)
ext_der = generic_asn1(value, ctx, &ext_len);
@@
-290,7
+294,7
@@
static X509_EXTENSION *v3_generic_extension(const char *ext, char *value,
goto err;
}
goto err;
}
- if (
!(oct = ASN1_OCTET_STRING_new())
) {
+ if (
(oct = ASN1_OCTET_STRING_new()) == NULL
) {
X509V3err(X509V3_F_V3_GENERIC_EXTENSION, ERR_R_MALLOC_FAILURE);
goto err;
}
X509V3err(X509V3_F_V3_GENERIC_EXTENSION, ERR_R_MALLOC_FAILURE);
goto err;
}
@@
-346,11
+350,12
@@
int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, char *section,
STACK_OF(CONF_VALUE) *nval;
CONF_VALUE *val;
int i;
STACK_OF(CONF_VALUE) *nval;
CONF_VALUE *val;
int i;
- if (!(nval = NCONF_get_section(conf, section)))
+
+ if ((nval = NCONF_get_section(conf, section)) == NULL)
return 0;
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
val = sk_CONF_VALUE_value(nval, i);
return 0;
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
val = sk_CONF_VALUE_value(nval, i);
- if (
!(ext = X509V3_EXT_nconf(conf, ctx, val->name, val->value))
)
+ if (
(ext = X509V3_EXT_nconf(conf, ctx, val->name, val->value)) == NULL
)
return 0;
if (ctx->flags == X509V3_CTX_REPLACE)
delete_ext(*sk, ext);
return 0;
if (ctx->flags == X509V3_CTX_REPLACE)
delete_ext(*sk, ext);
@@
-370,7
+375,7
@@
int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
{
STACK_OF(X509_EXTENSION) **sk = NULL;
if (cert)
{
STACK_OF(X509_EXTENSION) **sk = NULL;
if (cert)
- sk = &cert->cert_info
->
extensions;
+ sk = &cert->cert_info
.
extensions;
return X509V3_EXT_add_nconf_sk(conf, ctx, section, sk);
}
return X509V3_EXT_add_nconf_sk(conf, ctx, section, sk);
}
@@
-381,7
+386,7
@@
int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
{
STACK_OF(X509_EXTENSION) **sk = NULL;
if (crl)
{
STACK_OF(X509_EXTENSION) **sk = NULL;
if (crl)
- sk = &crl->crl
->
extensions;
+ sk = &crl->crl
.
extensions;
return X509V3_EXT_add_nconf_sk(conf, ctx, section, sk);
}
return X509V3_EXT_add_nconf_sk(conf, ctx, section, sk);
}