summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/asn_moid.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/asn_moid.c')
-rw-r--r--src/lib/libcrypto/asn1/asn_moid.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/lib/libcrypto/asn1/asn_moid.c b/src/lib/libcrypto/asn1/asn_moid.c
index 7521496d67..0c09a8e934 100644
--- a/src/lib/libcrypto/asn1/asn_moid.c
+++ b/src/lib/libcrypto/asn1/asn_moid.c
@@ -75,16 +75,13 @@ static int oid_module_init(CONF_IMODULE *md, const CONF *cnf)
75 STACK_OF(CONF_VALUE) *sktmp; 75 STACK_OF(CONF_VALUE) *sktmp;
76 CONF_VALUE *oval; 76 CONF_VALUE *oval;
77 oid_section = CONF_imodule_get_value(md); 77 oid_section = CONF_imodule_get_value(md);
78 if(!(sktmp = NCONF_get_section(cnf, oid_section))) 78 if(!(sktmp = NCONF_get_section(cnf, oid_section))) {
79 {
80 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ERROR_LOADING_SECTION); 79 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ERROR_LOADING_SECTION);
81 return 0; 80 return 0;
82 } 81 }
83 for(i = 0; i < sk_CONF_VALUE_num(sktmp); i++) 82 for(i = 0; i < sk_CONF_VALUE_num(sktmp); i++) {
84 {
85 oval = sk_CONF_VALUE_value(sktmp, i); 83 oval = sk_CONF_VALUE_value(sktmp, i);
86 if(!do_create(oval->value, oval->name)) 84 if(!do_create(oval->value, oval->name)) {
87 {
88 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ADDING_OBJECT); 85 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ADDING_OBJECT);
89 return 0; 86 return 0;
90 } 87 }
@@ -114,13 +111,10 @@ static int do_create(char *value, char *name)
114 ASN1_OBJECT *oid; 111 ASN1_OBJECT *oid;
115 char *ln, *ostr, *p, *lntmp; 112 char *ln, *ostr, *p, *lntmp;
116 p = strrchr(value, ','); 113 p = strrchr(value, ',');
117 if (!p) 114 if (!p) {
118 {
119 ln = name; 115 ln = name;
120 ostr = value; 116 ostr = value;
121 } 117 } else {
122 else
123 {
124 ln = NULL; 118 ln = NULL;
125 ostr = p + 1; 119 ostr = p + 1;
126 if (!*ostr) 120 if (!*ostr)
@@ -133,13 +127,11 @@ static int do_create(char *value, char *name)
133 if (nid == NID_undef) 127 if (nid == NID_undef)
134 return 0; 128 return 0;
135 129
136 if (p) 130 if (p) {
137 {
138 ln = value; 131 ln = value;
139 while(isspace((unsigned char)*ln)) ln++; 132 while(isspace((unsigned char)*ln)) ln++;
140 p--; 133 p--;
141 while(isspace((unsigned char)*p)) 134 while(isspace((unsigned char)*p)) {
142 {
143 if (p == ln) 135 if (p == ln)
144 return 0; 136 return 0;
145 p--; 137 p--;