diff options
Diffstat (limited to 'src/lib/libcrypto/ts/ts_conf.c')
| -rw-r--r-- | src/lib/libcrypto/ts/ts_conf.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c index 41d185ee5a..103d430272 100644 --- a/src/lib/libcrypto/ts/ts_conf.c +++ b/src/lib/libcrypto/ts/ts_conf.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_conf.c,v 1.11 2018/04/14 07:18:37 tb Exp $ */ | 1 | /* $OpenBSD: ts_conf.c,v 1.12 2023/07/07 07:25:21 beck Exp $ */ |
| 2 | /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL | 2 | /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL |
| 3 | * project 2002. | 3 | * project 2002. |
| 4 | */ | 4 | */ |
| @@ -110,6 +110,7 @@ end: | |||
| 110 | BIO_free(cert); | 110 | BIO_free(cert); |
| 111 | return x; | 111 | return x; |
| 112 | } | 112 | } |
| 113 | LCRYPTO_ALIAS(TS_CONF_load_cert); | ||
| 113 | 114 | ||
| 114 | STACK_OF(X509) * | 115 | STACK_OF(X509) * |
| 115 | TS_CONF_load_certs(const char *file) | 116 | TS_CONF_load_certs(const char *file) |
| @@ -144,6 +145,7 @@ end: | |||
| 144 | BIO_free(certs); | 145 | BIO_free(certs); |
| 145 | return othercerts; | 146 | return othercerts; |
| 146 | } | 147 | } |
| 148 | LCRYPTO_ALIAS(TS_CONF_load_certs); | ||
| 147 | 149 | ||
| 148 | EVP_PKEY * | 150 | EVP_PKEY * |
| 149 | TS_CONF_load_key(const char *file, const char *pass) | 151 | TS_CONF_load_key(const char *file, const char *pass) |
| @@ -161,6 +163,7 @@ end: | |||
| 161 | BIO_free(key); | 163 | BIO_free(key); |
| 162 | return pkey; | 164 | return pkey; |
| 163 | } | 165 | } |
| 166 | LCRYPTO_ALIAS(TS_CONF_load_key); | ||
| 164 | 167 | ||
| 165 | /* Function definitions for handling configuration options. */ | 168 | /* Function definitions for handling configuration options. */ |
| 166 | 169 | ||
| @@ -186,6 +189,7 @@ TS_CONF_get_tsa_section(CONF *conf, const char *section) | |||
| 186 | } | 189 | } |
| 187 | return section; | 190 | return section; |
| 188 | } | 191 | } |
| 192 | LCRYPTO_ALIAS(TS_CONF_get_tsa_section); | ||
| 189 | 193 | ||
| 190 | int | 194 | int |
| 191 | TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb, | 195 | TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb, |
| @@ -205,6 +209,7 @@ TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb, | |||
| 205 | err: | 209 | err: |
| 206 | return ret; | 210 | return ret; |
| 207 | } | 211 | } |
| 212 | LCRYPTO_ALIAS(TS_CONF_set_serial); | ||
| 208 | 213 | ||
| 209 | #ifndef OPENSSL_NO_ENGINE | 214 | #ifndef OPENSSL_NO_ENGINE |
| 210 | 215 | ||
| @@ -225,6 +230,7 @@ TS_CONF_set_crypto_device(CONF *conf, const char *section, const char *device) | |||
| 225 | err: | 230 | err: |
| 226 | return ret; | 231 | return ret; |
| 227 | } | 232 | } |
| 233 | LCRYPTO_ALIAS(TS_CONF_set_crypto_device); | ||
| 228 | 234 | ||
| 229 | int | 235 | int |
| 230 | TS_CONF_set_default_engine(const char *name) | 236 | TS_CONF_set_default_engine(const char *name) |
| @@ -251,6 +257,7 @@ err: | |||
| 251 | ENGINE_free(e); | 257 | ENGINE_free(e); |
| 252 | return ret; | 258 | return ret; |
| 253 | } | 259 | } |
| 260 | LCRYPTO_ALIAS(TS_CONF_set_default_engine); | ||
| 254 | 261 | ||
| 255 | #endif | 262 | #endif |
| 256 | 263 | ||
| @@ -278,6 +285,7 @@ err: | |||
| 278 | X509_free(cert_obj); | 285 | X509_free(cert_obj); |
| 279 | return ret; | 286 | return ret; |
| 280 | } | 287 | } |
| 288 | LCRYPTO_ALIAS(TS_CONF_set_signer_cert); | ||
| 281 | 289 | ||
| 282 | int | 290 | int |
| 283 | TS_CONF_set_certs(CONF *conf, const char *section, const char *certs, | 291 | TS_CONF_set_certs(CONF *conf, const char *section, const char *certs, |
| @@ -302,6 +310,7 @@ err: | |||
| 302 | sk_X509_pop_free(certs_obj, X509_free); | 310 | sk_X509_pop_free(certs_obj, X509_free); |
| 303 | return ret; | 311 | return ret; |
| 304 | } | 312 | } |
| 313 | LCRYPTO_ALIAS(TS_CONF_set_certs); | ||
| 305 | 314 | ||
| 306 | int | 315 | int |
| 307 | TS_CONF_set_signer_key(CONF *conf, const char *section, const char *key, | 316 | TS_CONF_set_signer_key(CONF *conf, const char *section, const char *key, |
| @@ -327,6 +336,7 @@ err: | |||
| 327 | EVP_PKEY_free(key_obj); | 336 | EVP_PKEY_free(key_obj); |
| 328 | return ret; | 337 | return ret; |
| 329 | } | 338 | } |
| 339 | LCRYPTO_ALIAS(TS_CONF_set_signer_key); | ||
| 330 | 340 | ||
| 331 | int | 341 | int |
| 332 | TS_CONF_set_def_policy(CONF *conf, const char *section, const char *policy, | 342 | TS_CONF_set_def_policy(CONF *conf, const char *section, const char *policy, |
| @@ -354,6 +364,7 @@ err: | |||
| 354 | ASN1_OBJECT_free(policy_obj); | 364 | ASN1_OBJECT_free(policy_obj); |
| 355 | return ret; | 365 | return ret; |
| 356 | } | 366 | } |
| 367 | LCRYPTO_ALIAS(TS_CONF_set_def_policy); | ||
| 357 | 368 | ||
| 358 | int | 369 | int |
| 359 | TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx) | 370 | TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx) |
| @@ -387,6 +398,7 @@ err: | |||
| 387 | sk_CONF_VALUE_pop_free(list, X509V3_conf_free); | 398 | sk_CONF_VALUE_pop_free(list, X509V3_conf_free); |
| 388 | return ret; | 399 | return ret; |
| 389 | } | 400 | } |
| 401 | LCRYPTO_ALIAS(TS_CONF_set_policies); | ||
| 390 | 402 | ||
| 391 | int | 403 | int |
| 392 | TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx) | 404 | TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx) |
| @@ -426,6 +438,7 @@ err: | |||
| 426 | sk_CONF_VALUE_pop_free(list, X509V3_conf_free); | 438 | sk_CONF_VALUE_pop_free(list, X509V3_conf_free); |
| 427 | return ret; | 439 | return ret; |
| 428 | } | 440 | } |
| 441 | LCRYPTO_ALIAS(TS_CONF_set_digests); | ||
| 429 | 442 | ||
| 430 | int | 443 | int |
| 431 | TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx) | 444 | TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx) |
| @@ -465,6 +478,7 @@ err: | |||
| 465 | sk_CONF_VALUE_pop_free(list, X509V3_conf_free); | 478 | sk_CONF_VALUE_pop_free(list, X509V3_conf_free); |
| 466 | return ret; | 479 | return ret; |
| 467 | } | 480 | } |
| 481 | LCRYPTO_ALIAS(TS_CONF_set_accuracy); | ||
| 468 | 482 | ||
| 469 | int | 483 | int |
| 470 | TS_CONF_set_clock_precision_digits(CONF *conf, const char *section, | 484 | TS_CONF_set_clock_precision_digits(CONF *conf, const char *section, |
| @@ -490,6 +504,7 @@ TS_CONF_set_clock_precision_digits(CONF *conf, const char *section, | |||
| 490 | err: | 504 | err: |
| 491 | return ret; | 505 | return ret; |
| 492 | } | 506 | } |
| 507 | LCRYPTO_ALIAS(TS_CONF_set_clock_precision_digits); | ||
| 493 | 508 | ||
| 494 | static int | 509 | static int |
| 495 | TS_CONF_add_flag(CONF *conf, const char *section, const char *field, int flag, | 510 | TS_CONF_add_flag(CONF *conf, const char *section, const char *field, int flag, |
| @@ -515,12 +530,14 @@ TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx) | |||
| 515 | { | 530 | { |
| 516 | return TS_CONF_add_flag(conf, section, ENV_ORDERING, TS_ORDERING, ctx); | 531 | return TS_CONF_add_flag(conf, section, ENV_ORDERING, TS_ORDERING, ctx); |
| 517 | } | 532 | } |
| 533 | LCRYPTO_ALIAS(TS_CONF_set_ordering); | ||
| 518 | 534 | ||
| 519 | int | 535 | int |
| 520 | TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx) | 536 | TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx) |
| 521 | { | 537 | { |
| 522 | return TS_CONF_add_flag(conf, section, ENV_TSA_NAME, TS_TSA_NAME, ctx); | 538 | return TS_CONF_add_flag(conf, section, ENV_TSA_NAME, TS_TSA_NAME, ctx); |
| 523 | } | 539 | } |
| 540 | LCRYPTO_ALIAS(TS_CONF_set_tsa_name); | ||
| 524 | 541 | ||
| 525 | int | 542 | int |
| 526 | TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section, TS_RESP_CTX *ctx) | 543 | TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section, TS_RESP_CTX *ctx) |
| @@ -528,3 +545,4 @@ TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section, TS_RESP_CTX *ctx) | |||
| 528 | return TS_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN, | 545 | return TS_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN, |
| 529 | TS_ESS_CERT_ID_CHAIN, ctx); | 546 | TS_ESS_CERT_ID_CHAIN, ctx); |
| 530 | } | 547 | } |
| 548 | LCRYPTO_ALIAS(TS_CONF_set_ess_cert_id_chain); | ||
