v3_utl.c 36 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289
  1. /*
  2. * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
  3. *
  4. * Licensed under the OpenSSL license (the "License"). You may not use
  5. * this file except in compliance with the License. You can obtain a copy
  6. * in the file LICENSE in the source distribution or at
  7. * https://www.openssl.org/source/license.html
  8. */
  9. /* X509 v3 extension utilities */
  10. #include "e_os.h"
  11. #include "internal/cryptlib.h"
  12. #include <stdio.h>
  13. #include <string.h>
  14. #include "crypto/ctype.h"
  15. #include <openssl/conf.h>
  16. #include <openssl/crypto.h>
  17. #include <openssl/x509v3.h>
  18. #include "crypto/x509.h"
  19. #include <openssl/bn.h>
  20. #include "ext_dat.h"
  21. static char *strip_spaces(char *name);
  22. static int sk_strcmp(const char *const *a, const char *const *b);
  23. static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name,
  24. GENERAL_NAMES *gens);
  25. static void str_free(OPENSSL_STRING str);
  26. static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, const ASN1_IA5STRING *email);
  27. static int ipv4_from_asc(unsigned char *v4, const char *in);
  28. static int ipv6_from_asc(unsigned char *v6, const char *in);
  29. static int ipv6_cb(const char *elem, int len, void *usr);
  30. static int ipv6_hex(unsigned char *out, const char *in, int inlen);
  31. /* Add a CONF_VALUE name value pair to stack */
  32. static int x509v3_add_len_value(const char *name, const char *value,
  33. size_t vallen, STACK_OF(CONF_VALUE) **extlist)
  34. {
  35. CONF_VALUE *vtmp = NULL;
  36. char *tname = NULL, *tvalue = NULL;
  37. int sk_allocated = (*extlist == NULL);
  38. if (name != NULL && (tname = OPENSSL_strdup(name)) == NULL)
  39. goto err;
  40. if (value != NULL && vallen > 0) {
  41. /*
  42. * We tolerate a single trailing NUL character, but otherwise no
  43. * embedded NULs
  44. */
  45. if (memchr(value, 0, vallen - 1) != NULL)
  46. goto err;
  47. tvalue = OPENSSL_strndup(value, vallen);
  48. if (tvalue == NULL)
  49. goto err;
  50. }
  51. if ((vtmp = OPENSSL_malloc(sizeof(*vtmp))) == NULL)
  52. goto err;
  53. if (sk_allocated && (*extlist = sk_CONF_VALUE_new_null()) == NULL)
  54. goto err;
  55. vtmp->section = NULL;
  56. vtmp->name = tname;
  57. vtmp->value = tvalue;
  58. if (!sk_CONF_VALUE_push(*extlist, vtmp))
  59. goto err;
  60. return 1;
  61. err:
  62. X509V3err(X509V3_F_X509V3_ADD_LEN_VALUE, ERR_R_MALLOC_FAILURE);
  63. if (sk_allocated) {
  64. sk_CONF_VALUE_free(*extlist);
  65. *extlist = NULL;
  66. }
  67. OPENSSL_free(vtmp);
  68. OPENSSL_free(tname);
  69. OPENSSL_free(tvalue);
  70. return 0;
  71. }
  72. int X509V3_add_value(const char *name, const char *value,
  73. STACK_OF(CONF_VALUE) **extlist)
  74. {
  75. return x509v3_add_len_value(name, value,
  76. value != NULL ? strlen((const char *)value) : 0,
  77. extlist);
  78. }
  79. int X509V3_add_value_uchar(const char *name, const unsigned char *value,
  80. STACK_OF(CONF_VALUE) **extlist)
  81. {
  82. return x509v3_add_len_value(name, (const char *)value,
  83. value != NULL ? strlen((const char *)value) : 0,
  84. extlist);
  85. }
  86. int x509v3_add_len_value_uchar(const char *name, const unsigned char *value,
  87. size_t vallen, STACK_OF(CONF_VALUE) **extlist)
  88. {
  89. return x509v3_add_len_value(name, (const char *)value, vallen, extlist);
  90. }
  91. /* Free function for STACK_OF(CONF_VALUE) */
  92. void X509V3_conf_free(CONF_VALUE *conf)
  93. {
  94. if (!conf)
  95. return;
  96. OPENSSL_free(conf->name);
  97. OPENSSL_free(conf->value);
  98. OPENSSL_free(conf->section);
  99. OPENSSL_free(conf);
  100. }
  101. int X509V3_add_value_bool(const char *name, int asn1_bool,
  102. STACK_OF(CONF_VALUE) **extlist)
  103. {
  104. if (asn1_bool)
  105. return X509V3_add_value(name, "TRUE", extlist);
  106. return X509V3_add_value(name, "FALSE", extlist);
  107. }
  108. int X509V3_add_value_bool_nf(const char *name, int asn1_bool,
  109. STACK_OF(CONF_VALUE) **extlist)
  110. {
  111. if (asn1_bool)
  112. return X509V3_add_value(name, "TRUE", extlist);
  113. return 1;
  114. }
  115. static char *bignum_to_string(const BIGNUM *bn)
  116. {
  117. char *tmp, *ret;
  118. size_t len;
  119. /*
  120. * Display large numbers in hex and small numbers in decimal. Converting to
  121. * decimal takes quadratic time and is no more useful than hex for large
  122. * numbers.
  123. */
  124. if (BN_num_bits(bn) < 128)
  125. return BN_bn2dec(bn);
  126. tmp = BN_bn2hex(bn);
  127. if (tmp == NULL)
  128. return NULL;
  129. len = strlen(tmp) + 3;
  130. ret = OPENSSL_malloc(len);
  131. if (ret == NULL) {
  132. X509V3err(X509V3_F_BIGNUM_TO_STRING, ERR_R_MALLOC_FAILURE);
  133. OPENSSL_free(tmp);
  134. return NULL;
  135. }
  136. /* Prepend "0x", but place it after the "-" if negative. */
  137. if (tmp[0] == '-') {
  138. OPENSSL_strlcpy(ret, "-0x", len);
  139. OPENSSL_strlcat(ret, tmp + 1, len);
  140. } else {
  141. OPENSSL_strlcpy(ret, "0x", len);
  142. OPENSSL_strlcat(ret, tmp, len);
  143. }
  144. OPENSSL_free(tmp);
  145. return ret;
  146. }
  147. char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *method, const ASN1_ENUMERATED *a)
  148. {
  149. BIGNUM *bntmp = NULL;
  150. char *strtmp = NULL;
  151. if (!a)
  152. return NULL;
  153. if ((bntmp = ASN1_ENUMERATED_to_BN(a, NULL)) == NULL
  154. || (strtmp = bignum_to_string(bntmp)) == NULL)
  155. X509V3err(X509V3_F_I2S_ASN1_ENUMERATED, ERR_R_MALLOC_FAILURE);
  156. BN_free(bntmp);
  157. return strtmp;
  158. }
  159. char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *method, const ASN1_INTEGER *a)
  160. {
  161. BIGNUM *bntmp = NULL;
  162. char *strtmp = NULL;
  163. if (!a)
  164. return NULL;
  165. if ((bntmp = ASN1_INTEGER_to_BN(a, NULL)) == NULL
  166. || (strtmp = bignum_to_string(bntmp)) == NULL)
  167. X509V3err(X509V3_F_I2S_ASN1_INTEGER, ERR_R_MALLOC_FAILURE);
  168. BN_free(bntmp);
  169. return strtmp;
  170. }
  171. ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, const char *value)
  172. {
  173. BIGNUM *bn = NULL;
  174. ASN1_INTEGER *aint;
  175. int isneg, ishex;
  176. int ret;
  177. if (value == NULL) {
  178. X509V3err(X509V3_F_S2I_ASN1_INTEGER, X509V3_R_INVALID_NULL_VALUE);
  179. return NULL;
  180. }
  181. bn = BN_new();
  182. if (bn == NULL) {
  183. X509V3err(X509V3_F_S2I_ASN1_INTEGER, ERR_R_MALLOC_FAILURE);
  184. return NULL;
  185. }
  186. if (value[0] == '-') {
  187. value++;
  188. isneg = 1;
  189. } else
  190. isneg = 0;
  191. if (value[0] == '0' && ((value[1] == 'x') || (value[1] == 'X'))) {
  192. value += 2;
  193. ishex = 1;
  194. } else
  195. ishex = 0;
  196. if (ishex)
  197. ret = BN_hex2bn(&bn, value);
  198. else
  199. ret = BN_dec2bn(&bn, value);
  200. if (!ret || value[ret]) {
  201. BN_free(bn);
  202. X509V3err(X509V3_F_S2I_ASN1_INTEGER, X509V3_R_BN_DEC2BN_ERROR);
  203. return NULL;
  204. }
  205. if (isneg && BN_is_zero(bn))
  206. isneg = 0;
  207. aint = BN_to_ASN1_INTEGER(bn, NULL);
  208. BN_free(bn);
  209. if (!aint) {
  210. X509V3err(X509V3_F_S2I_ASN1_INTEGER,
  211. X509V3_R_BN_TO_ASN1_INTEGER_ERROR);
  212. return NULL;
  213. }
  214. if (isneg)
  215. aint->type |= V_ASN1_NEG;
  216. return aint;
  217. }
  218. int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
  219. STACK_OF(CONF_VALUE) **extlist)
  220. {
  221. char *strtmp;
  222. int ret;
  223. if (!aint)
  224. return 1;
  225. if ((strtmp = i2s_ASN1_INTEGER(NULL, aint)) == NULL)
  226. return 0;
  227. ret = X509V3_add_value(name, strtmp, extlist);
  228. OPENSSL_free(strtmp);
  229. return ret;
  230. }
  231. int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool)
  232. {
  233. const char *btmp;
  234. if ((btmp = value->value) == NULL)
  235. goto err;
  236. if (strcmp(btmp, "TRUE") == 0
  237. || strcmp(btmp, "true") == 0
  238. || strcmp(btmp, "Y") == 0
  239. || strcmp(btmp, "y") == 0
  240. || strcmp(btmp, "YES") == 0
  241. || strcmp(btmp, "yes") == 0) {
  242. *asn1_bool = 0xff;
  243. return 1;
  244. }
  245. if (strcmp(btmp, "FALSE") == 0
  246. || strcmp(btmp, "false") == 0
  247. || strcmp(btmp, "N") == 0
  248. || strcmp(btmp, "n") == 0
  249. || strcmp(btmp, "NO") == 0
  250. || strcmp(btmp, "no") == 0) {
  251. *asn1_bool = 0;
  252. return 1;
  253. }
  254. err:
  255. X509V3err(X509V3_F_X509V3_GET_VALUE_BOOL,
  256. X509V3_R_INVALID_BOOLEAN_STRING);
  257. X509V3_conf_err(value);
  258. return 0;
  259. }
  260. int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint)
  261. {
  262. ASN1_INTEGER *itmp;
  263. if ((itmp = s2i_ASN1_INTEGER(NULL, value->value)) == NULL) {
  264. X509V3_conf_err(value);
  265. return 0;
  266. }
  267. *aint = itmp;
  268. return 1;
  269. }
  270. #define HDR_NAME 1
  271. #define HDR_VALUE 2
  272. /*
  273. * #define DEBUG
  274. */
  275. STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
  276. {
  277. char *p, *q, c;
  278. char *ntmp, *vtmp;
  279. STACK_OF(CONF_VALUE) *values = NULL;
  280. char *linebuf;
  281. int state;
  282. /* We are going to modify the line so copy it first */
  283. linebuf = OPENSSL_strdup(line);
  284. if (linebuf == NULL) {
  285. X509V3err(X509V3_F_X509V3_PARSE_LIST, ERR_R_MALLOC_FAILURE);
  286. goto err;
  287. }
  288. state = HDR_NAME;
  289. ntmp = NULL;
  290. /* Go through all characters */
  291. for (p = linebuf, q = linebuf; (c = *p) && (c != '\r') && (c != '\n');
  292. p++) {
  293. switch (state) {
  294. case HDR_NAME:
  295. if (c == ':') {
  296. state = HDR_VALUE;
  297. *p = 0;
  298. ntmp = strip_spaces(q);
  299. if (!ntmp) {
  300. X509V3err(X509V3_F_X509V3_PARSE_LIST,
  301. X509V3_R_INVALID_NULL_NAME);
  302. goto err;
  303. }
  304. q = p + 1;
  305. } else if (c == ',') {
  306. *p = 0;
  307. ntmp = strip_spaces(q);
  308. q = p + 1;
  309. if (!ntmp) {
  310. X509V3err(X509V3_F_X509V3_PARSE_LIST,
  311. X509V3_R_INVALID_NULL_NAME);
  312. goto err;
  313. }
  314. X509V3_add_value(ntmp, NULL, &values);
  315. }
  316. break;
  317. case HDR_VALUE:
  318. if (c == ',') {
  319. state = HDR_NAME;
  320. *p = 0;
  321. vtmp = strip_spaces(q);
  322. if (!vtmp) {
  323. X509V3err(X509V3_F_X509V3_PARSE_LIST,
  324. X509V3_R_INVALID_NULL_VALUE);
  325. goto err;
  326. }
  327. X509V3_add_value(ntmp, vtmp, &values);
  328. ntmp = NULL;
  329. q = p + 1;
  330. }
  331. }
  332. }
  333. if (state == HDR_VALUE) {
  334. vtmp = strip_spaces(q);
  335. if (!vtmp) {
  336. X509V3err(X509V3_F_X509V3_PARSE_LIST,
  337. X509V3_R_INVALID_NULL_VALUE);
  338. goto err;
  339. }
  340. X509V3_add_value(ntmp, vtmp, &values);
  341. } else {
  342. ntmp = strip_spaces(q);
  343. if (!ntmp) {
  344. X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME);
  345. goto err;
  346. }
  347. X509V3_add_value(ntmp, NULL, &values);
  348. }
  349. OPENSSL_free(linebuf);
  350. return values;
  351. err:
  352. OPENSSL_free(linebuf);
  353. sk_CONF_VALUE_pop_free(values, X509V3_conf_free);
  354. return NULL;
  355. }
  356. /* Delete leading and trailing spaces from a string */
  357. static char *strip_spaces(char *name)
  358. {
  359. char *p, *q;
  360. /* Skip over leading spaces */
  361. p = name;
  362. while (*p && ossl_isspace(*p))
  363. p++;
  364. if (!*p)
  365. return NULL;
  366. q = p + strlen(p) - 1;
  367. while ((q != p) && ossl_isspace(*q))
  368. q--;
  369. if (p != q)
  370. q[1] = 0;
  371. if (!*p)
  372. return NULL;
  373. return p;
  374. }
  375. /*
  376. * V2I name comparison function: returns zero if 'name' matches cmp or cmp.*
  377. */
  378. int name_cmp(const char *name, const char *cmp)
  379. {
  380. int len, ret;
  381. char c;
  382. len = strlen(cmp);
  383. if ((ret = strncmp(name, cmp, len)))
  384. return ret;
  385. c = name[len];
  386. if (!c || (c == '.'))
  387. return 0;
  388. return 1;
  389. }
  390. static int sk_strcmp(const char *const *a, const char *const *b)
  391. {
  392. return strcmp(*a, *b);
  393. }
  394. STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x)
  395. {
  396. GENERAL_NAMES *gens;
  397. STACK_OF(OPENSSL_STRING) *ret;
  398. gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
  399. ret = get_email(X509_get_subject_name(x), gens);
  400. sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
  401. return ret;
  402. }
  403. STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x)
  404. {
  405. AUTHORITY_INFO_ACCESS *info;
  406. STACK_OF(OPENSSL_STRING) *ret = NULL;
  407. int i;
  408. info = X509_get_ext_d2i(x, NID_info_access, NULL, NULL);
  409. if (!info)
  410. return NULL;
  411. for (i = 0; i < sk_ACCESS_DESCRIPTION_num(info); i++) {
  412. ACCESS_DESCRIPTION *ad = sk_ACCESS_DESCRIPTION_value(info, i);
  413. if (OBJ_obj2nid(ad->method) == NID_ad_OCSP) {
  414. if (ad->location->type == GEN_URI) {
  415. if (!append_ia5
  416. (&ret, ad->location->d.uniformResourceIdentifier))
  417. break;
  418. }
  419. }
  420. }
  421. AUTHORITY_INFO_ACCESS_free(info);
  422. return ret;
  423. }
  424. STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x)
  425. {
  426. GENERAL_NAMES *gens;
  427. STACK_OF(X509_EXTENSION) *exts;
  428. STACK_OF(OPENSSL_STRING) *ret;
  429. exts = X509_REQ_get_extensions(x);
  430. gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL);
  431. ret = get_email(X509_REQ_get_subject_name(x), gens);
  432. sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
  433. sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
  434. return ret;
  435. }
  436. static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name,
  437. GENERAL_NAMES *gens)
  438. {
  439. STACK_OF(OPENSSL_STRING) *ret = NULL;
  440. X509_NAME_ENTRY *ne;
  441. const ASN1_IA5STRING *email;
  442. GENERAL_NAME *gen;
  443. int i = -1;
  444. /* Now add any email address(es) to STACK */
  445. /* First supplied X509_NAME */
  446. while ((i = X509_NAME_get_index_by_NID(name,
  447. NID_pkcs9_emailAddress, i)) >= 0) {
  448. ne = X509_NAME_get_entry(name, i);
  449. email = X509_NAME_ENTRY_get_data(ne);
  450. if (!append_ia5(&ret, email))
  451. return NULL;
  452. }
  453. for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
  454. gen = sk_GENERAL_NAME_value(gens, i);
  455. if (gen->type != GEN_EMAIL)
  456. continue;
  457. if (!append_ia5(&ret, gen->d.ia5))
  458. return NULL;
  459. }
  460. return ret;
  461. }
  462. static void str_free(OPENSSL_STRING str)
  463. {
  464. OPENSSL_free(str);
  465. }
  466. static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, const ASN1_IA5STRING *email)
  467. {
  468. char *emtmp;
  469. /* First some sanity checks */
  470. if (email->type != V_ASN1_IA5STRING)
  471. return 1;
  472. if (email->data == NULL || email->length == 0)
  473. return 1;
  474. if (memchr(email->data, 0, email->length) != NULL)
  475. return 1;
  476. if (*sk == NULL)
  477. *sk = sk_OPENSSL_STRING_new(sk_strcmp);
  478. if (*sk == NULL)
  479. return 0;
  480. emtmp = OPENSSL_strndup((char *)email->data, email->length);
  481. if (emtmp == NULL) {
  482. X509_email_free(*sk);
  483. *sk = NULL;
  484. return 0;
  485. }
  486. /* Don't add duplicates */
  487. if (sk_OPENSSL_STRING_find(*sk, emtmp) != -1) {
  488. OPENSSL_free(emtmp);
  489. return 1;
  490. }
  491. if (!sk_OPENSSL_STRING_push(*sk, emtmp)) {
  492. OPENSSL_free(emtmp); /* free on push failure */
  493. X509_email_free(*sk);
  494. *sk = NULL;
  495. return 0;
  496. }
  497. return 1;
  498. }
  499. void X509_email_free(STACK_OF(OPENSSL_STRING) *sk)
  500. {
  501. sk_OPENSSL_STRING_pop_free(sk, str_free);
  502. }
  503. typedef int (*equal_fn) (const unsigned char *pattern, size_t pattern_len,
  504. const unsigned char *subject, size_t subject_len,
  505. unsigned int flags);
  506. /* Skip pattern prefix to match "wildcard" subject */
  507. static void skip_prefix(const unsigned char **p, size_t *plen,
  508. size_t subject_len,
  509. unsigned int flags)
  510. {
  511. const unsigned char *pattern = *p;
  512. size_t pattern_len = *plen;
  513. /*
  514. * If subject starts with a leading '.' followed by more octets, and
  515. * pattern is longer, compare just an equal-length suffix with the
  516. * full subject (starting at the '.'), provided the prefix contains
  517. * no NULs.
  518. */
  519. if ((flags & _X509_CHECK_FLAG_DOT_SUBDOMAINS) == 0)
  520. return;
  521. while (pattern_len > subject_len && *pattern) {
  522. if ((flags & X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS) &&
  523. *pattern == '.')
  524. break;
  525. ++pattern;
  526. --pattern_len;
  527. }
  528. /* Skip if entire prefix acceptable */
  529. if (pattern_len == subject_len) {
  530. *p = pattern;
  531. *plen = pattern_len;
  532. }
  533. }
  534. /* Compare while ASCII ignoring case. */
  535. static int equal_nocase(const unsigned char *pattern, size_t pattern_len,
  536. const unsigned char *subject, size_t subject_len,
  537. unsigned int flags)
  538. {
  539. skip_prefix(&pattern, &pattern_len, subject_len, flags);
  540. if (pattern_len != subject_len)
  541. return 0;
  542. while (pattern_len) {
  543. unsigned char l = *pattern;
  544. unsigned char r = *subject;
  545. /* The pattern must not contain NUL characters. */
  546. if (l == 0)
  547. return 0;
  548. if (l != r) {
  549. if ('A' <= l && l <= 'Z')
  550. l = (l - 'A') + 'a';
  551. if ('A' <= r && r <= 'Z')
  552. r = (r - 'A') + 'a';
  553. if (l != r)
  554. return 0;
  555. }
  556. ++pattern;
  557. ++subject;
  558. --pattern_len;
  559. }
  560. return 1;
  561. }
  562. /* Compare using memcmp. */
  563. static int equal_case(const unsigned char *pattern, size_t pattern_len,
  564. const unsigned char *subject, size_t subject_len,
  565. unsigned int flags)
  566. {
  567. skip_prefix(&pattern, &pattern_len, subject_len, flags);
  568. if (pattern_len != subject_len)
  569. return 0;
  570. return !memcmp(pattern, subject, pattern_len);
  571. }
  572. /*
  573. * RFC 5280, section 7.5, requires that only the domain is compared in a
  574. * case-insensitive manner.
  575. */
  576. static int equal_email(const unsigned char *a, size_t a_len,
  577. const unsigned char *b, size_t b_len,
  578. unsigned int unused_flags)
  579. {
  580. size_t i = a_len;
  581. if (a_len != b_len)
  582. return 0;
  583. /*
  584. * We search backwards for the '@' character, so that we do not have to
  585. * deal with quoted local-parts. The domain part is compared in a
  586. * case-insensitive manner.
  587. */
  588. while (i > 0) {
  589. --i;
  590. if (a[i] == '@' || b[i] == '@') {
  591. if (!equal_nocase(a + i, a_len - i, b + i, a_len - i, 0))
  592. return 0;
  593. break;
  594. }
  595. }
  596. if (i == 0)
  597. i = a_len;
  598. return equal_case(a, i, b, i, 0);
  599. }
  600. /*
  601. * Compare the prefix and suffix with the subject, and check that the
  602. * characters in-between are valid.
  603. */
  604. static int wildcard_match(const unsigned char *prefix, size_t prefix_len,
  605. const unsigned char *suffix, size_t suffix_len,
  606. const unsigned char *subject, size_t subject_len,
  607. unsigned int flags)
  608. {
  609. const unsigned char *wildcard_start;
  610. const unsigned char *wildcard_end;
  611. const unsigned char *p;
  612. int allow_multi = 0;
  613. int allow_idna = 0;
  614. if (subject_len < prefix_len + suffix_len)
  615. return 0;
  616. if (!equal_nocase(prefix, prefix_len, subject, prefix_len, flags))
  617. return 0;
  618. wildcard_start = subject + prefix_len;
  619. wildcard_end = subject + (subject_len - suffix_len);
  620. if (!equal_nocase(wildcard_end, suffix_len, suffix, suffix_len, flags))
  621. return 0;
  622. /*
  623. * If the wildcard makes up the entire first label, it must match at
  624. * least one character.
  625. */
  626. if (prefix_len == 0 && *suffix == '.') {
  627. if (wildcard_start == wildcard_end)
  628. return 0;
  629. allow_idna = 1;
  630. if (flags & X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS)
  631. allow_multi = 1;
  632. }
  633. /* IDNA labels cannot match partial wildcards */
  634. if (!allow_idna &&
  635. subject_len >= 4 && strncasecmp((char *)subject, "xn--", 4) == 0)
  636. return 0;
  637. /* The wildcard may match a literal '*' */
  638. if (wildcard_end == wildcard_start + 1 && *wildcard_start == '*')
  639. return 1;
  640. /*
  641. * Check that the part matched by the wildcard contains only
  642. * permitted characters and only matches a single label unless
  643. * allow_multi is set.
  644. */
  645. for (p = wildcard_start; p != wildcard_end; ++p)
  646. if (!(('0' <= *p && *p <= '9') ||
  647. ('A' <= *p && *p <= 'Z') ||
  648. ('a' <= *p && *p <= 'z') ||
  649. *p == '-' || (allow_multi && *p == '.')))
  650. return 0;
  651. return 1;
  652. }
  653. #define LABEL_START (1 << 0)
  654. #define LABEL_END (1 << 1)
  655. #define LABEL_HYPHEN (1 << 2)
  656. #define LABEL_IDNA (1 << 3)
  657. static const unsigned char *valid_star(const unsigned char *p, size_t len,
  658. unsigned int flags)
  659. {
  660. const unsigned char *star = 0;
  661. size_t i;
  662. int state = LABEL_START;
  663. int dots = 0;
  664. for (i = 0; i < len; ++i) {
  665. /*
  666. * Locate first and only legal wildcard, either at the start
  667. * or end of a non-IDNA first and not final label.
  668. */
  669. if (p[i] == '*') {
  670. int atstart = (state & LABEL_START);
  671. int atend = (i == len - 1 || p[i + 1] == '.');
  672. /*-
  673. * At most one wildcard per pattern.
  674. * No wildcards in IDNA labels.
  675. * No wildcards after the first label.
  676. */
  677. if (star != NULL || (state & LABEL_IDNA) != 0 || dots)
  678. return NULL;
  679. /* Only full-label '*.example.com' wildcards? */
  680. if ((flags & X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS)
  681. && (!atstart || !atend))
  682. return NULL;
  683. /* No 'foo*bar' wildcards */
  684. if (!atstart && !atend)
  685. return NULL;
  686. star = &p[i];
  687. state &= ~LABEL_START;
  688. } else if (('a' <= p[i] && p[i] <= 'z')
  689. || ('A' <= p[i] && p[i] <= 'Z')
  690. || ('0' <= p[i] && p[i] <= '9')) {
  691. if ((state & LABEL_START) != 0
  692. && len - i >= 4 && strncasecmp((char *)&p[i], "xn--", 4) == 0)
  693. state |= LABEL_IDNA;
  694. state &= ~(LABEL_HYPHEN | LABEL_START);
  695. } else if (p[i] == '.') {
  696. if ((state & (LABEL_HYPHEN | LABEL_START)) != 0)
  697. return NULL;
  698. state = LABEL_START;
  699. ++dots;
  700. } else if (p[i] == '-') {
  701. /* no domain/subdomain starts with '-' */
  702. if ((state & LABEL_START) != 0)
  703. return NULL;
  704. state |= LABEL_HYPHEN;
  705. } else
  706. return NULL;
  707. }
  708. /*
  709. * The final label must not end in a hyphen or ".", and
  710. * there must be at least two dots after the star.
  711. */
  712. if ((state & (LABEL_START | LABEL_HYPHEN)) != 0 || dots < 2)
  713. return NULL;
  714. return star;
  715. }
  716. /* Compare using wildcards. */
  717. static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
  718. const unsigned char *subject, size_t subject_len,
  719. unsigned int flags)
  720. {
  721. const unsigned char *star = NULL;
  722. /*
  723. * Subject names starting with '.' can only match a wildcard pattern
  724. * via a subject sub-domain pattern suffix match.
  725. */
  726. if (!(subject_len > 1 && subject[0] == '.'))
  727. star = valid_star(pattern, pattern_len, flags);
  728. if (star == NULL)
  729. return equal_nocase(pattern, pattern_len,
  730. subject, subject_len, flags);
  731. return wildcard_match(pattern, star - pattern,
  732. star + 1, (pattern + pattern_len) - star - 1,
  733. subject, subject_len, flags);
  734. }
  735. /*
  736. * Compare an ASN1_STRING to a supplied string. If they match return 1. If
  737. * cmp_type > 0 only compare if string matches the type, otherwise convert it
  738. * to UTF8.
  739. */
  740. static int do_check_string(const ASN1_STRING *a, int cmp_type, equal_fn equal,
  741. unsigned int flags, const char *b, size_t blen,
  742. char **peername)
  743. {
  744. int rv = 0;
  745. if (!a->data || !a->length)
  746. return 0;
  747. if (cmp_type > 0) {
  748. if (cmp_type != a->type)
  749. return 0;
  750. if (cmp_type == V_ASN1_IA5STRING)
  751. rv = equal(a->data, a->length, (unsigned char *)b, blen, flags);
  752. else if (a->length == (int)blen && !memcmp(a->data, b, blen))
  753. rv = 1;
  754. if (rv > 0 && peername != NULL) {
  755. *peername = OPENSSL_strndup((char *)a->data, a->length);
  756. if (*peername == NULL)
  757. return -1;
  758. }
  759. } else {
  760. int astrlen;
  761. unsigned char *astr;
  762. astrlen = ASN1_STRING_to_UTF8(&astr, a);
  763. if (astrlen < 0) {
  764. /*
  765. * -1 could be an internal malloc failure or a decoding error from
  766. * malformed input; we can't distinguish.
  767. */
  768. return -1;
  769. }
  770. rv = equal(astr, astrlen, (unsigned char *)b, blen, flags);
  771. if (rv > 0 && peername != NULL) {
  772. *peername = OPENSSL_strndup((char *)astr, astrlen);
  773. if (*peername == NULL) {
  774. OPENSSL_free(astr);
  775. return -1;
  776. }
  777. }
  778. OPENSSL_free(astr);
  779. }
  780. return rv;
  781. }
  782. static int do_x509_check(X509 *x, const char *chk, size_t chklen,
  783. unsigned int flags, int check_type, char **peername)
  784. {
  785. GENERAL_NAMES *gens = NULL;
  786. X509_NAME *name = NULL;
  787. int i;
  788. int cnid = NID_undef;
  789. int alt_type;
  790. int san_present = 0;
  791. int rv = 0;
  792. equal_fn equal;
  793. /* See below, this flag is internal-only */
  794. flags &= ~_X509_CHECK_FLAG_DOT_SUBDOMAINS;
  795. if (check_type == GEN_EMAIL) {
  796. cnid = NID_pkcs9_emailAddress;
  797. alt_type = V_ASN1_IA5STRING;
  798. equal = equal_email;
  799. } else if (check_type == GEN_DNS) {
  800. cnid = NID_commonName;
  801. /* Implicit client-side DNS sub-domain pattern */
  802. if (chklen > 1 && chk[0] == '.')
  803. flags |= _X509_CHECK_FLAG_DOT_SUBDOMAINS;
  804. alt_type = V_ASN1_IA5STRING;
  805. if (flags & X509_CHECK_FLAG_NO_WILDCARDS)
  806. equal = equal_nocase;
  807. else
  808. equal = equal_wildcard;
  809. } else {
  810. alt_type = V_ASN1_OCTET_STRING;
  811. equal = equal_case;
  812. }
  813. if (chklen == 0)
  814. chklen = strlen(chk);
  815. gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
  816. if (gens) {
  817. for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
  818. GENERAL_NAME *gen;
  819. ASN1_STRING *cstr;
  820. gen = sk_GENERAL_NAME_value(gens, i);
  821. if (gen->type != check_type)
  822. continue;
  823. san_present = 1;
  824. if (check_type == GEN_EMAIL)
  825. cstr = gen->d.rfc822Name;
  826. else if (check_type == GEN_DNS)
  827. cstr = gen->d.dNSName;
  828. else
  829. cstr = gen->d.iPAddress;
  830. /* Positive on success, negative on error! */
  831. if ((rv = do_check_string(cstr, alt_type, equal, flags,
  832. chk, chklen, peername)) != 0)
  833. break;
  834. }
  835. GENERAL_NAMES_free(gens);
  836. if (rv != 0)
  837. return rv;
  838. if (san_present && !(flags & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT))
  839. return 0;
  840. }
  841. /* We're done if CN-ID is not pertinent */
  842. if (cnid == NID_undef || (flags & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT))
  843. return 0;
  844. i = -1;
  845. name = X509_get_subject_name(x);
  846. while ((i = X509_NAME_get_index_by_NID(name, cnid, i)) >= 0) {
  847. const X509_NAME_ENTRY *ne = X509_NAME_get_entry(name, i);
  848. const ASN1_STRING *str = X509_NAME_ENTRY_get_data(ne);
  849. /* Positive on success, negative on error! */
  850. if ((rv = do_check_string(str, -1, equal, flags,
  851. chk, chklen, peername)) != 0)
  852. return rv;
  853. }
  854. return 0;
  855. }
  856. int X509_check_host(X509 *x, const char *chk, size_t chklen,
  857. unsigned int flags, char **peername)
  858. {
  859. if (chk == NULL)
  860. return -2;
  861. /*
  862. * Embedded NULs are disallowed, except as the last character of a
  863. * string of length 2 or more (tolerate caller including terminating
  864. * NUL in string length).
  865. */
  866. if (chklen == 0)
  867. chklen = strlen(chk);
  868. else if (memchr(chk, '\0', chklen > 1 ? chklen - 1 : chklen))
  869. return -2;
  870. if (chklen > 1 && chk[chklen - 1] == '\0')
  871. --chklen;
  872. return do_x509_check(x, chk, chklen, flags, GEN_DNS, peername);
  873. }
  874. int X509_check_email(X509 *x, const char *chk, size_t chklen,
  875. unsigned int flags)
  876. {
  877. if (chk == NULL)
  878. return -2;
  879. /*
  880. * Embedded NULs are disallowed, except as the last character of a
  881. * string of length 2 or more (tolerate caller including terminating
  882. * NUL in string length).
  883. */
  884. if (chklen == 0)
  885. chklen = strlen((char *)chk);
  886. else if (memchr(chk, '\0', chklen > 1 ? chklen - 1 : chklen))
  887. return -2;
  888. if (chklen > 1 && chk[chklen - 1] == '\0')
  889. --chklen;
  890. return do_x509_check(x, chk, chklen, flags, GEN_EMAIL, NULL);
  891. }
  892. int X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
  893. unsigned int flags)
  894. {
  895. if (chk == NULL)
  896. return -2;
  897. return do_x509_check(x, (char *)chk, chklen, flags, GEN_IPADD, NULL);
  898. }
  899. int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags)
  900. {
  901. unsigned char ipout[16];
  902. size_t iplen;
  903. if (ipasc == NULL)
  904. return -2;
  905. iplen = (size_t)a2i_ipadd(ipout, ipasc);
  906. if (iplen == 0)
  907. return -2;
  908. return do_x509_check(x, (char *)ipout, iplen, flags, GEN_IPADD, NULL);
  909. }
  910. /*
  911. * Convert IP addresses both IPv4 and IPv6 into an OCTET STRING compatible
  912. * with RFC3280.
  913. */
  914. ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc)
  915. {
  916. unsigned char ipout[16];
  917. ASN1_OCTET_STRING *ret;
  918. int iplen;
  919. /* If string contains a ':' assume IPv6 */
  920. iplen = a2i_ipadd(ipout, ipasc);
  921. if (!iplen)
  922. return NULL;
  923. ret = ASN1_OCTET_STRING_new();
  924. if (ret == NULL)
  925. return NULL;
  926. if (!ASN1_OCTET_STRING_set(ret, ipout, iplen)) {
  927. ASN1_OCTET_STRING_free(ret);
  928. return NULL;
  929. }
  930. return ret;
  931. }
  932. ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
  933. {
  934. ASN1_OCTET_STRING *ret = NULL;
  935. unsigned char ipout[32];
  936. char *iptmp = NULL, *p;
  937. int iplen1, iplen2;
  938. p = strchr(ipasc, '/');
  939. if (!p)
  940. return NULL;
  941. iptmp = OPENSSL_strdup(ipasc);
  942. if (!iptmp)
  943. return NULL;
  944. p = iptmp + (p - ipasc);
  945. *p++ = 0;
  946. iplen1 = a2i_ipadd(ipout, iptmp);
  947. if (!iplen1)
  948. goto err;
  949. iplen2 = a2i_ipadd(ipout + iplen1, p);
  950. OPENSSL_free(iptmp);
  951. iptmp = NULL;
  952. if (!iplen2 || (iplen1 != iplen2))
  953. goto err;
  954. ret = ASN1_OCTET_STRING_new();
  955. if (ret == NULL)
  956. goto err;
  957. if (!ASN1_OCTET_STRING_set(ret, ipout, iplen1 + iplen2))
  958. goto err;
  959. return ret;
  960. err:
  961. OPENSSL_free(iptmp);
  962. ASN1_OCTET_STRING_free(ret);
  963. return NULL;
  964. }
  965. int a2i_ipadd(unsigned char *ipout, const char *ipasc)
  966. {
  967. /* If string contains a ':' assume IPv6 */
  968. if (strchr(ipasc, ':')) {
  969. if (!ipv6_from_asc(ipout, ipasc))
  970. return 0;
  971. return 16;
  972. } else {
  973. if (!ipv4_from_asc(ipout, ipasc))
  974. return 0;
  975. return 4;
  976. }
  977. }
  978. static int ipv4_from_asc(unsigned char *v4, const char *in)
  979. {
  980. const char *p;
  981. int a0, a1, a2, a3, n;
  982. if (sscanf(in, "%d.%d.%d.%d%n", &a0, &a1, &a2, &a3, &n) != 4)
  983. return 0;
  984. if ((a0 < 0) || (a0 > 255) || (a1 < 0) || (a1 > 255)
  985. || (a2 < 0) || (a2 > 255) || (a3 < 0) || (a3 > 255))
  986. return 0;
  987. p = in + n;
  988. if (!(*p == '\0' || ossl_isspace(*p)))
  989. return 0;
  990. v4[0] = a0;
  991. v4[1] = a1;
  992. v4[2] = a2;
  993. v4[3] = a3;
  994. return 1;
  995. }
  996. typedef struct {
  997. /* Temporary store for IPV6 output */
  998. unsigned char tmp[16];
  999. /* Total number of bytes in tmp */
  1000. int total;
  1001. /* The position of a zero (corresponding to '::') */
  1002. int zero_pos;
  1003. /* Number of zeroes */
  1004. int zero_cnt;
  1005. } IPV6_STAT;
  1006. static int ipv6_from_asc(unsigned char *v6, const char *in)
  1007. {
  1008. IPV6_STAT v6stat;
  1009. v6stat.total = 0;
  1010. v6stat.zero_pos = -1;
  1011. v6stat.zero_cnt = 0;
  1012. /*
  1013. * Treat the IPv6 representation as a list of values separated by ':'.
  1014. * The presence of a '::' will parse as one, two or three zero length
  1015. * elements.
  1016. */
  1017. if (!CONF_parse_list(in, ':', 0, ipv6_cb, &v6stat))
  1018. return 0;
  1019. /* Now for some sanity checks */
  1020. if (v6stat.zero_pos == -1) {
  1021. /* If no '::' must have exactly 16 bytes */
  1022. if (v6stat.total != 16)
  1023. return 0;
  1024. } else {
  1025. /* If '::' must have less than 16 bytes */
  1026. if (v6stat.total == 16)
  1027. return 0;
  1028. /* More than three zeroes is an error */
  1029. if (v6stat.zero_cnt > 3)
  1030. return 0;
  1031. /* Can only have three zeroes if nothing else present */
  1032. else if (v6stat.zero_cnt == 3) {
  1033. if (v6stat.total > 0)
  1034. return 0;
  1035. }
  1036. /* Can only have two zeroes if at start or end */
  1037. else if (v6stat.zero_cnt == 2) {
  1038. if ((v6stat.zero_pos != 0)
  1039. && (v6stat.zero_pos != v6stat.total))
  1040. return 0;
  1041. } else
  1042. /* Can only have one zero if *not* start or end */
  1043. {
  1044. if ((v6stat.zero_pos == 0)
  1045. || (v6stat.zero_pos == v6stat.total))
  1046. return 0;
  1047. }
  1048. }
  1049. /* Format result */
  1050. if (v6stat.zero_pos >= 0) {
  1051. /* Copy initial part */
  1052. memcpy(v6, v6stat.tmp, v6stat.zero_pos);
  1053. /* Zero middle */
  1054. memset(v6 + v6stat.zero_pos, 0, 16 - v6stat.total);
  1055. /* Copy final part */
  1056. if (v6stat.total != v6stat.zero_pos)
  1057. memcpy(v6 + v6stat.zero_pos + 16 - v6stat.total,
  1058. v6stat.tmp + v6stat.zero_pos,
  1059. v6stat.total - v6stat.zero_pos);
  1060. } else
  1061. memcpy(v6, v6stat.tmp, 16);
  1062. return 1;
  1063. }
  1064. static int ipv6_cb(const char *elem, int len, void *usr)
  1065. {
  1066. IPV6_STAT *s = usr;
  1067. /* Error if 16 bytes written */
  1068. if (s->total == 16)
  1069. return 0;
  1070. if (len == 0) {
  1071. /* Zero length element, corresponds to '::' */
  1072. if (s->zero_pos == -1)
  1073. s->zero_pos = s->total;
  1074. /* If we've already got a :: its an error */
  1075. else if (s->zero_pos != s->total)
  1076. return 0;
  1077. s->zero_cnt++;
  1078. } else {
  1079. /* If more than 4 characters could be final a.b.c.d form */
  1080. if (len > 4) {
  1081. /* Need at least 4 bytes left */
  1082. if (s->total > 12)
  1083. return 0;
  1084. /* Must be end of string */
  1085. if (elem[len])
  1086. return 0;
  1087. if (!ipv4_from_asc(s->tmp + s->total, elem))
  1088. return 0;
  1089. s->total += 4;
  1090. } else {
  1091. if (!ipv6_hex(s->tmp + s->total, elem, len))
  1092. return 0;
  1093. s->total += 2;
  1094. }
  1095. }
  1096. return 1;
  1097. }
  1098. /*
  1099. * Convert a string of up to 4 hex digits into the corresponding IPv6 form.
  1100. */
  1101. static int ipv6_hex(unsigned char *out, const char *in, int inlen)
  1102. {
  1103. unsigned char c;
  1104. unsigned int num = 0;
  1105. int x;
  1106. if (inlen > 4)
  1107. return 0;
  1108. while (inlen--) {
  1109. c = *in++;
  1110. num <<= 4;
  1111. x = OPENSSL_hexchar2int(c);
  1112. if (x < 0)
  1113. return 0;
  1114. num |= (char)x;
  1115. }
  1116. out[0] = num >> 8;
  1117. out[1] = num & 0xff;
  1118. return 1;
  1119. }
  1120. int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
  1121. unsigned long chtype)
  1122. {
  1123. CONF_VALUE *v;
  1124. int i, mval, spec_char, plus_char;
  1125. char *p, *type;
  1126. if (!nm)
  1127. return 0;
  1128. for (i = 0; i < sk_CONF_VALUE_num(dn_sk); i++) {
  1129. v = sk_CONF_VALUE_value(dn_sk, i);
  1130. type = v->name;
  1131. /*
  1132. * Skip past any leading X. X: X, etc to allow for multiple instances
  1133. */
  1134. for (p = type; *p; p++) {
  1135. #ifndef CHARSET_EBCDIC
  1136. spec_char = ((*p == ':') || (*p == ',') || (*p == '.'));
  1137. #else
  1138. spec_char = ((*p == os_toascii[':']) || (*p == os_toascii[','])
  1139. || (*p == os_toascii['.']));
  1140. #endif
  1141. if (spec_char) {
  1142. p++;
  1143. if (*p)
  1144. type = p;
  1145. break;
  1146. }
  1147. }
  1148. #ifndef CHARSET_EBCDIC
  1149. plus_char = (*type == '+');
  1150. #else
  1151. plus_char = (*type == os_toascii['+']);
  1152. #endif
  1153. if (plus_char) {
  1154. mval = -1;
  1155. type++;
  1156. } else
  1157. mval = 0;
  1158. if (!X509_NAME_add_entry_by_txt(nm, type, chtype,
  1159. (unsigned char *)v->value, -1, -1,
  1160. mval))
  1161. return 0;
  1162. }
  1163. return 1;
  1164. }