summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509name.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509/x509name.c')
-rw-r--r--src/lib/libcrypto/x509/x509name.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
index 19a253da4d..a6e4dbef89 100644
--- a/src/lib/libcrypto/x509/x509name.c
+++ b/src/lib/libcrypto/x509/x509name.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509name.c,v 1.30 2022/12/26 07:18:53 jmc Exp $ */ 1/* $OpenBSD: x509name.c,v 1.31 2023/02/16 08:38:17 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -78,7 +78,7 @@ X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
78 return (-1); 78 return (-1);
79 return (X509_NAME_get_text_by_OBJ(name, obj, buf, len)); 79 return (X509_NAME_get_text_by_OBJ(name, obj, buf, len));
80} 80}
81LCRYPTO_ALIAS(X509_NAME_get_text_by_NID) 81LCRYPTO_ALIAS(X509_NAME_get_text_by_NID);
82 82
83int 83int
84X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf, 84X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf,
@@ -100,7 +100,7 @@ X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf,
100 } 100 }
101 return (i); 101 return (i);
102} 102}
103LCRYPTO_ALIAS(X509_NAME_get_text_by_OBJ) 103LCRYPTO_ALIAS(X509_NAME_get_text_by_OBJ);
104 104
105int 105int
106X509_NAME_entry_count(const X509_NAME *name) 106X509_NAME_entry_count(const X509_NAME *name)
@@ -109,7 +109,7 @@ X509_NAME_entry_count(const X509_NAME *name)
109 return (0); 109 return (0);
110 return (sk_X509_NAME_ENTRY_num(name->entries)); 110 return (sk_X509_NAME_ENTRY_num(name->entries));
111} 111}
112LCRYPTO_ALIAS(X509_NAME_entry_count) 112LCRYPTO_ALIAS(X509_NAME_entry_count);
113 113
114int 114int
115X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos) 115X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos)
@@ -121,7 +121,7 @@ X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos)
121 return (-2); 121 return (-2);
122 return (X509_NAME_get_index_by_OBJ(name, obj, lastpos)); 122 return (X509_NAME_get_index_by_OBJ(name, obj, lastpos));
123} 123}
124LCRYPTO_ALIAS(X509_NAME_get_index_by_NID) 124LCRYPTO_ALIAS(X509_NAME_get_index_by_NID);
125 125
126/* NOTE: you should be passing -1, not 0 as lastpos */ 126/* NOTE: you should be passing -1, not 0 as lastpos */
127int 127int
@@ -145,7 +145,7 @@ X509_NAME_get_index_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
145 } 145 }
146 return (-1); 146 return (-1);
147} 147}
148LCRYPTO_ALIAS(X509_NAME_get_index_by_OBJ) 148LCRYPTO_ALIAS(X509_NAME_get_index_by_OBJ);
149 149
150X509_NAME_ENTRY * 150X509_NAME_ENTRY *
151X509_NAME_get_entry(const X509_NAME *name, int loc) 151X509_NAME_get_entry(const X509_NAME *name, int loc)
@@ -156,7 +156,7 @@ X509_NAME_get_entry(const X509_NAME *name, int loc)
156 else 156 else
157 return (sk_X509_NAME_ENTRY_value(name->entries, loc)); 157 return (sk_X509_NAME_ENTRY_value(name->entries, loc));
158} 158}
159LCRYPTO_ALIAS(X509_NAME_get_entry) 159LCRYPTO_ALIAS(X509_NAME_get_entry);
160 160
161X509_NAME_ENTRY * 161X509_NAME_ENTRY *
162X509_NAME_delete_entry(X509_NAME *name, int loc) 162X509_NAME_delete_entry(X509_NAME *name, int loc)
@@ -195,7 +195,7 @@ X509_NAME_delete_entry(X509_NAME *name, int loc)
195 sk_X509_NAME_ENTRY_value(sk, i)->set--; 195 sk_X509_NAME_ENTRY_value(sk, i)->set--;
196 return (ret); 196 return (ret);
197} 197}
198LCRYPTO_ALIAS(X509_NAME_delete_entry) 198LCRYPTO_ALIAS(X509_NAME_delete_entry);
199 199
200int 200int
201X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type, 201X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,
@@ -211,7 +211,7 @@ X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,
211 X509_NAME_ENTRY_free(ne); 211 X509_NAME_ENTRY_free(ne);
212 return ret; 212 return ret;
213} 213}
214LCRYPTO_ALIAS(X509_NAME_add_entry_by_OBJ) 214LCRYPTO_ALIAS(X509_NAME_add_entry_by_OBJ);
215 215
216int 216int
217X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, 217X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
@@ -227,7 +227,7 @@ X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
227 X509_NAME_ENTRY_free(ne); 227 X509_NAME_ENTRY_free(ne);
228 return ret; 228 return ret;
229} 229}
230LCRYPTO_ALIAS(X509_NAME_add_entry_by_NID) 230LCRYPTO_ALIAS(X509_NAME_add_entry_by_NID);
231 231
232int 232int
233X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, 233X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
@@ -243,7 +243,7 @@ X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
243 X509_NAME_ENTRY_free(ne); 243 X509_NAME_ENTRY_free(ne);
244 return ret; 244 return ret;
245} 245}
246LCRYPTO_ALIAS(X509_NAME_add_entry_by_txt) 246LCRYPTO_ALIAS(X509_NAME_add_entry_by_txt);
247 247
248/* if set is -1, append to previous set, 0 'a new one', and 1, 248/* if set is -1, append to previous set, 0 'a new one', and 1,
249 * prepend to the guy we are about to stomp on. */ 249 * prepend to the guy we are about to stomp on. */
@@ -302,7 +302,7 @@ err:
302 X509_NAME_ENTRY_free(new_name); 302 X509_NAME_ENTRY_free(new_name);
303 return (0); 303 return (0);
304} 304}
305LCRYPTO_ALIAS(X509_NAME_add_entry) 305LCRYPTO_ALIAS(X509_NAME_add_entry);
306 306
307X509_NAME_ENTRY * 307X509_NAME_ENTRY *
308X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, 308X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
@@ -321,7 +321,7 @@ X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
321 ASN1_OBJECT_free(obj); 321 ASN1_OBJECT_free(obj);
322 return nentry; 322 return nentry;
323} 323}
324LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_txt) 324LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_txt);
325 325
326X509_NAME_ENTRY * 326X509_NAME_ENTRY *
327X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type, 327X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,
@@ -339,7 +339,7 @@ X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,
339 ASN1_OBJECT_free(obj); 339 ASN1_OBJECT_free(obj);
340 return nentry; 340 return nentry;
341} 341}
342LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_NID) 342LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_NID);
343 343
344X509_NAME_ENTRY * 344X509_NAME_ENTRY *
345X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, const ASN1_OBJECT *obj, 345X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, const ASN1_OBJECT *obj,
@@ -367,7 +367,7 @@ err:
367 X509_NAME_ENTRY_free(ret); 367 X509_NAME_ENTRY_free(ret);
368 return (NULL); 368 return (NULL);
369} 369}
370LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_OBJ) 370LCRYPTO_ALIAS(X509_NAME_ENTRY_create_by_OBJ);
371 371
372int 372int
373X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj) 373X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)
@@ -380,7 +380,7 @@ X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)
380 ne->object = OBJ_dup(obj); 380 ne->object = OBJ_dup(obj);
381 return ((ne->object == NULL) ? 0 : 1); 381 return ((ne->object == NULL) ? 0 : 1);
382} 382}
383LCRYPTO_ALIAS(X509_NAME_ENTRY_set_object) 383LCRYPTO_ALIAS(X509_NAME_ENTRY_set_object);
384 384
385int 385int
386X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, 386X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
@@ -406,7 +406,7 @@ X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
406 } 406 }
407 return (1); 407 return (1);
408} 408}
409LCRYPTO_ALIAS(X509_NAME_ENTRY_set_data) 409LCRYPTO_ALIAS(X509_NAME_ENTRY_set_data);
410 410
411ASN1_OBJECT * 411ASN1_OBJECT *
412X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne) 412X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne)
@@ -415,7 +415,7 @@ X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne)
415 return (NULL); 415 return (NULL);
416 return (ne->object); 416 return (ne->object);
417} 417}
418LCRYPTO_ALIAS(X509_NAME_ENTRY_get_object) 418LCRYPTO_ALIAS(X509_NAME_ENTRY_get_object);
419 419
420ASN1_STRING * 420ASN1_STRING *
421X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne) 421X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne)
@@ -424,11 +424,11 @@ X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne)
424 return (NULL); 424 return (NULL);
425 return (ne->value); 425 return (ne->value);
426} 426}
427LCRYPTO_ALIAS(X509_NAME_ENTRY_get_data) 427LCRYPTO_ALIAS(X509_NAME_ENTRY_get_data);
428 428
429int 429int
430X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) 430X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
431{ 431{
432 return (ne->set); 432 return (ne->set);
433} 433}
434LCRYPTO_ALIAS(X509_NAME_ENTRY_set) 434LCRYPTO_ALIAS(X509_NAME_ENTRY_set);