summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/asn_moid.c
diff options
context:
space:
mode:
authortedu <>2014-04-18 00:10:08 +0000
committertedu <>2014-04-18 00:10:08 +0000
commit07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d (patch)
tree6327d50d69a1982f840dc68fe928ea459e2c41e0 /src/lib/libcrypto/asn1/asn_moid.c
parent288a9e368d9d4a72792b12a00ad69e3592d94073 (diff)
downloadopenbsd-07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d.tar.gz
openbsd-07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d.tar.bz2
openbsd-07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d.zip
putting most of the braces in the right column is the very least we can do.
Diffstat (limited to 'src/lib/libcrypto/asn1/asn_moid.c')
-rw-r--r--src/lib/libcrypto/asn1/asn_moid.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/libcrypto/asn1/asn_moid.c b/src/lib/libcrypto/asn1/asn_moid.c
index fd04d11459..7521496d67 100644
--- a/src/lib/libcrypto/asn1/asn_moid.c
+++ b/src/lib/libcrypto/asn1/asn_moid.c
@@ -69,38 +69,38 @@
69static int do_create(char *value, char *name); 69static int do_create(char *value, char *name);
70 70
71static int oid_module_init(CONF_IMODULE *md, const CONF *cnf) 71static int oid_module_init(CONF_IMODULE *md, const CONF *cnf)
72 { 72{
73 int i; 73 int i;
74 const char *oid_section; 74 const char *oid_section;
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 { 79 {
80 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ERROR_LOADING_SECTION); 80 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ERROR_LOADING_SECTION);
81 return 0; 81 return 0;
82 } 82 }
83 for(i = 0; i < sk_CONF_VALUE_num(sktmp); i++) 83 for(i = 0; i < sk_CONF_VALUE_num(sktmp); i++)
84 { 84 {
85 oval = sk_CONF_VALUE_value(sktmp, i); 85 oval = sk_CONF_VALUE_value(sktmp, i);
86 if(!do_create(oval->value, oval->name)) 86 if(!do_create(oval->value, oval->name))
87 { 87 {
88 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ADDING_OBJECT); 88 ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ADDING_OBJECT);
89 return 0; 89 return 0;
90 }
91 } 90 }
92 return 1;
93 } 91 }
92 return 1;
93}
94 94
95static void oid_module_finish(CONF_IMODULE *md) 95static void oid_module_finish(CONF_IMODULE *md)
96 { 96{
97 OBJ_cleanup(); 97 OBJ_cleanup();
98 } 98}
99 99
100void ASN1_add_oid_module(void) 100void ASN1_add_oid_module(void)
101 { 101{
102 CONF_module_add("oid_section", oid_module_init, oid_module_finish); 102 CONF_module_add("oid_section", oid_module_init, oid_module_finish);
103 } 103}
104 104
105/* Create an OID based on a name value pair. Accept two formats. 105/* Create an OID based on a name value pair. Accept two formats.
106 * shortname = 1.2.3.4 106 * shortname = 1.2.3.4
@@ -109,24 +109,24 @@ void ASN1_add_oid_module(void)
109 109
110 110
111static int do_create(char *value, char *name) 111static int do_create(char *value, char *name)
112 { 112{
113 int nid; 113 int nid;
114 ASN1_OBJECT *oid; 114 ASN1_OBJECT *oid;
115 char *ln, *ostr, *p, *lntmp; 115 char *ln, *ostr, *p, *lntmp;
116 p = strrchr(value, ','); 116 p = strrchr(value, ',');
117 if (!p) 117 if (!p)
118 { 118 {
119 ln = name; 119 ln = name;
120 ostr = value; 120 ostr = value;
121 } 121 }
122 else 122 else
123 { 123 {
124 ln = NULL; 124 ln = NULL;
125 ostr = p + 1; 125 ostr = p + 1;
126 if (!*ostr) 126 if (!*ostr)
127 return 0; 127 return 0;
128 while(isspace((unsigned char)*ostr)) ostr++; 128 while(isspace((unsigned char)*ostr)) ostr++;
129 } 129 }
130 130
131 nid = OBJ_create(ostr, name, ln); 131 nid = OBJ_create(ostr, name, ln);
132 132
@@ -134,16 +134,16 @@ static int do_create(char *value, char *name)
134 return 0; 134 return 0;
135 135
136 if (p) 136 if (p)
137 { 137 {
138 ln = value; 138 ln = value;
139 while(isspace((unsigned char)*ln)) ln++; 139 while(isspace((unsigned char)*ln)) ln++;
140 p--; 140 p--;
141 while(isspace((unsigned char)*p)) 141 while(isspace((unsigned char)*p))
142 { 142 {
143 if (p == ln) 143 if (p == ln)
144 return 0; 144 return 0;
145 p--; 145 p--;
146 } 146 }
147 p++; 147 p++;
148 lntmp = malloc((p - ln) + 1); 148 lntmp = malloc((p - ln) + 1);
149 if (lntmp == NULL) 149 if (lntmp == NULL)
@@ -152,9 +152,9 @@ static int do_create(char *value, char *name)
152 lntmp[p - ln] = 0; 152 lntmp[p - ln] = 0;
153 oid = OBJ_nid2obj(nid); 153 oid = OBJ_nid2obj(nid);
154 oid->ln = lntmp; 154 oid->ln = lntmp;
155 } 155 }
156 156
157 return 1; 157 return 1;
158 } 158}
159 159
160 160