projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix more error codes.
[openssl.git]
/
crypto
/
x509v3
/
v3_conf.c
diff --git
a/crypto/x509v3/v3_conf.c
b/crypto/x509v3/v3_conf.c
index 7e813db0d79e83eccc5c05b24df915b7aa943255..2b867305fba15a3e6066e9998e980a560c1baf61 100644
(file)
--- a/
crypto/x509v3/v3_conf.c
+++ b/
crypto/x509v3/v3_conf.c
@@
-90,7
+90,7
@@
X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, char *name,
ret = do_ext_nconf(conf, ctx, OBJ_sn2nid(name), crit, value);
if (!ret)
{
ret = do_ext_nconf(conf, ctx, OBJ_sn2nid(name), crit, value);
if (!ret)
{
- X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_ERROR_IN_EXTENSION);
+ X509V3err(X509V3_F_X509V3_EXT_
N
CONF,X509V3_R_ERROR_IN_EXTENSION);
ERR_add_error_data(4,"name=", name, ", value=", value);
}
return ret;
ERR_add_error_data(4,"name=", name, ", value=", value);
}
return ret;
@@
-121,12
+121,12
@@
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
void *ext_struc;
if (ext_nid == NID_undef)
{
void *ext_struc;
if (ext_nid == NID_undef)
{
- X509V3err(X509V3_F_DO_EXT_CONF,X509V3_R_UNKNOWN_EXTENSION_NAME);
+ X509V3err(X509V3_F_DO_EXT_
N
CONF,X509V3_R_UNKNOWN_EXTENSION_NAME);
return NULL;
}
if (!(method = X509V3_EXT_get_nid(ext_nid)))
{
return NULL;
}
if (!(method = X509V3_EXT_get_nid(ext_nid)))
{
- X509V3err(X509V3_F_DO_EXT_CONF,X509V3_R_UNKNOWN_EXTENSION);
+ X509V3err(X509V3_F_DO_EXT_
N
CONF,X509V3_R_UNKNOWN_EXTENSION);
return NULL;
}
/* Now get internal extension representation based on type */
return NULL;
}
/* Now get internal extension representation based on type */
@@
-136,7
+136,7
@@
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
else nval = X509V3_parse_list(value);
if(sk_CONF_VALUE_num(nval) <= 0)
{
else nval = X509V3_parse_list(value);
if(sk_CONF_VALUE_num(nval) <= 0)
{
- X509V3err(X509V3_F_
X509V3_EXT_
CONF,X509V3_R_INVALID_EXTENSION_STRING);
+ X509V3err(X509V3_F_
DO_EXT_N
CONF,X509V3_R_INVALID_EXTENSION_STRING);
ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid), ",section=", value);
return NULL;
}
ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid), ",section=", value);
return NULL;
}
@@
-153,14
+153,14
@@
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
{
if(!ctx->db || !ctx->db_meth)
{
{
if(!ctx->db || !ctx->db_meth)
{
- X509V3err(X509V3_F_
X509V3_EXT_
CONF,X509V3_R_NO_CONFIG_DATABASE);
+ X509V3err(X509V3_F_
DO_EXT_N
CONF,X509V3_R_NO_CONFIG_DATABASE);
return NULL;
}
if(!(ext_struc = method->r2i(method, ctx, value))) return NULL;
}
else
{
return NULL;
}
if(!(ext_struc = method->r2i(method, ctx, value))) return NULL;
}
else
{
- X509V3err(X509V3_F_
X509V3_EXT_
CONF,X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED);
+ X509V3err(X509V3_F_
DO_EXT_N
CONF,X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED);
ERR_add_error_data(2, "name=", OBJ_nid2sn(ext_nid));
return NULL;
}
ERR_add_error_data(2, "name=", OBJ_nid2sn(ext_nid));
return NULL;
}
@@
-238,12
+238,12
@@
static int v3_check_generic(char **value)
{
int gen_type = 0;
char *p = *value;
{
int gen_type = 0;
char *p = *value;
- if ((strlen(p) >= 4) && !strncmp(p, "DER:
,
", 4))
+ if ((strlen(p) >= 4) && !strncmp(p, "DER:", 4))
{
p+=4;
gen_type = 1;
}
{
p+=4;
gen_type = 1;
}
-
if ((strlen(p) >= 5) && !strncmp(p, "ASN1:,
", 5))
+
else if ((strlen(p) >= 5) && !strncmp(p, "ASN1:
", 5))
{
p+=5;
gen_type = 2;
{
p+=5;
gen_type = 2;