diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 190 | ||||
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/ts.h | 219 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_asn1.c | 64 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_conf.c | 20 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_err.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_lib.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_req_print.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_req_utils.c | 25 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_rsp_print.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_rsp_sign.c | 22 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_rsp_utils.c | 44 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_rsp_verify.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_verify_ctx.c | 12 |
13 files changed, 608 insertions, 11 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index d6c1610db9..cbf06b4d23 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
| @@ -1263,3 +1263,193 @@ _libre_BIO_vprintf | |||
| 1263 | _libre_BIO_snprintf | 1263 | _libre_BIO_snprintf |
| 1264 | _libre_BIO_vsnprintf | 1264 | _libre_BIO_vsnprintf |
| 1265 | _libre_ERR_load_BIO_strings | 1265 | _libre_ERR_load_BIO_strings |
| 1266 | _libre_TS_REQ_new | ||
| 1267 | _libre_TS_REQ_free | ||
| 1268 | _libre_i2d_TS_REQ | ||
| 1269 | _libre_d2i_TS_REQ | ||
| 1270 | _libre_TS_REQ_dup | ||
| 1271 | _libre_d2i_TS_REQ_fp | ||
| 1272 | _libre_i2d_TS_REQ_fp | ||
| 1273 | _libre_d2i_TS_REQ_bio | ||
| 1274 | _libre_i2d_TS_REQ_bio | ||
| 1275 | _libre_TS_MSG_IMPRINT_new | ||
| 1276 | _libre_TS_MSG_IMPRINT_free | ||
| 1277 | _libre_i2d_TS_MSG_IMPRINT | ||
| 1278 | _libre_d2i_TS_MSG_IMPRINT | ||
| 1279 | _libre_TS_MSG_IMPRINT_dup | ||
| 1280 | _libre_d2i_TS_MSG_IMPRINT_fp | ||
| 1281 | _libre_i2d_TS_MSG_IMPRINT_fp | ||
| 1282 | _libre_d2i_TS_MSG_IMPRINT_bio | ||
| 1283 | _libre_i2d_TS_MSG_IMPRINT_bio | ||
| 1284 | _libre_TS_RESP_new | ||
| 1285 | _libre_TS_RESP_free | ||
| 1286 | _libre_i2d_TS_RESP | ||
| 1287 | _libre_d2i_TS_RESP | ||
| 1288 | _libre_PKCS7_to_TS_TST_INFO | ||
| 1289 | _libre_TS_RESP_dup | ||
| 1290 | _libre_d2i_TS_RESP_fp | ||
| 1291 | _libre_i2d_TS_RESP_fp | ||
| 1292 | _libre_d2i_TS_RESP_bio | ||
| 1293 | _libre_i2d_TS_RESP_bio | ||
| 1294 | _libre_TS_STATUS_INFO_new | ||
| 1295 | _libre_TS_STATUS_INFO_free | ||
| 1296 | _libre_i2d_TS_STATUS_INFO | ||
| 1297 | _libre_d2i_TS_STATUS_INFO | ||
| 1298 | _libre_TS_STATUS_INFO_dup | ||
| 1299 | _libre_TS_TST_INFO_new | ||
| 1300 | _libre_TS_TST_INFO_free | ||
| 1301 | _libre_i2d_TS_TST_INFO | ||
| 1302 | _libre_d2i_TS_TST_INFO | ||
| 1303 | _libre_TS_TST_INFO_dup | ||
| 1304 | _libre_d2i_TS_TST_INFO_fp | ||
| 1305 | _libre_i2d_TS_TST_INFO_fp | ||
| 1306 | _libre_d2i_TS_TST_INFO_bio | ||
| 1307 | _libre_i2d_TS_TST_INFO_bio | ||
| 1308 | _libre_TS_ACCURACY_new | ||
| 1309 | _libre_TS_ACCURACY_free | ||
| 1310 | _libre_i2d_TS_ACCURACY | ||
| 1311 | _libre_d2i_TS_ACCURACY | ||
| 1312 | _libre_TS_ACCURACY_dup | ||
| 1313 | _libre_ESS_ISSUER_SERIAL_new | ||
| 1314 | _libre_ESS_ISSUER_SERIAL_free | ||
| 1315 | _libre_i2d_ESS_ISSUER_SERIAL | ||
| 1316 | _libre_d2i_ESS_ISSUER_SERIAL | ||
| 1317 | _libre_ESS_ISSUER_SERIAL_dup | ||
| 1318 | _libre_ESS_CERT_ID_new | ||
| 1319 | _libre_ESS_CERT_ID_free | ||
| 1320 | _libre_i2d_ESS_CERT_ID | ||
| 1321 | _libre_d2i_ESS_CERT_ID | ||
| 1322 | _libre_ESS_CERT_ID_dup | ||
| 1323 | _libre_ESS_SIGNING_CERT_new | ||
| 1324 | _libre_ESS_SIGNING_CERT_free | ||
| 1325 | _libre_i2d_ESS_SIGNING_CERT | ||
| 1326 | _libre_d2i_ESS_SIGNING_CERT | ||
| 1327 | _libre_ESS_SIGNING_CERT_dup | ||
| 1328 | _libre_TS_REQ_set_version | ||
| 1329 | _libre_TS_REQ_get_version | ||
| 1330 | _libre_TS_REQ_set_msg_imprint | ||
| 1331 | _libre_TS_REQ_get_msg_imprint | ||
| 1332 | _libre_TS_MSG_IMPRINT_set_algo | ||
| 1333 | _libre_TS_MSG_IMPRINT_get_algo | ||
| 1334 | _libre_TS_MSG_IMPRINT_set_msg | ||
| 1335 | _libre_TS_MSG_IMPRINT_get_msg | ||
| 1336 | _libre_TS_REQ_set_policy_id | ||
| 1337 | _libre_TS_REQ_get_policy_id | ||
| 1338 | _libre_TS_REQ_set_nonce | ||
| 1339 | _libre_TS_REQ_get_nonce | ||
| 1340 | _libre_TS_REQ_set_cert_req | ||
| 1341 | _libre_TS_REQ_get_cert_req | ||
| 1342 | _libre_TS_REQ_get_exts | ||
| 1343 | _libre_TS_REQ_ext_free | ||
| 1344 | _libre_TS_REQ_get_ext_count | ||
| 1345 | _libre_TS_REQ_get_ext_by_NID | ||
| 1346 | _libre_TS_REQ_get_ext_by_OBJ | ||
| 1347 | _libre_TS_REQ_get_ext_by_critical | ||
| 1348 | _libre_TS_REQ_get_ext | ||
| 1349 | _libre_TS_REQ_delete_ext | ||
| 1350 | _libre_TS_REQ_add_ext | ||
| 1351 | _libre_TS_REQ_get_ext_d2i | ||
| 1352 | _libre_TS_REQ_print_bio | ||
| 1353 | _libre_TS_RESP_set_status_info | ||
| 1354 | _libre_TS_RESP_get_status_info | ||
| 1355 | _libre_TS_STATUS_INFO_get0_failure_info | ||
| 1356 | _libre_TS_STATUS_INFO_get0_text | ||
| 1357 | _libre_TS_STATUS_INFO_get0_status | ||
| 1358 | _libre_TS_STATUS_INFO_set_status | ||
| 1359 | _libre_TS_RESP_set_tst_info | ||
| 1360 | _libre_TS_RESP_get_token | ||
| 1361 | _libre_TS_RESP_get_tst_info | ||
| 1362 | _libre_TS_TST_INFO_set_version | ||
| 1363 | _libre_TS_TST_INFO_get_version | ||
| 1364 | _libre_TS_TST_INFO_set_policy_id | ||
| 1365 | _libre_TS_TST_INFO_get_policy_id | ||
| 1366 | _libre_TS_TST_INFO_set_msg_imprint | ||
| 1367 | _libre_TS_TST_INFO_get_msg_imprint | ||
| 1368 | _libre_TS_TST_INFO_set_serial | ||
| 1369 | _libre_TS_TST_INFO_get_serial | ||
| 1370 | _libre_TS_TST_INFO_set_time | ||
| 1371 | _libre_TS_TST_INFO_get_time | ||
| 1372 | _libre_TS_TST_INFO_set_accuracy | ||
| 1373 | _libre_TS_TST_INFO_get_accuracy | ||
| 1374 | _libre_TS_ACCURACY_set_seconds | ||
| 1375 | _libre_TS_ACCURACY_get_seconds | ||
| 1376 | _libre_TS_ACCURACY_set_millis | ||
| 1377 | _libre_TS_ACCURACY_get_millis | ||
| 1378 | _libre_TS_ACCURACY_set_micros | ||
| 1379 | _libre_TS_ACCURACY_get_micros | ||
| 1380 | _libre_TS_TST_INFO_set_ordering | ||
| 1381 | _libre_TS_TST_INFO_get_ordering | ||
| 1382 | _libre_TS_TST_INFO_set_nonce | ||
| 1383 | _libre_TS_TST_INFO_get_nonce | ||
| 1384 | _libre_TS_TST_INFO_set_tsa | ||
| 1385 | _libre_TS_TST_INFO_get_tsa | ||
| 1386 | _libre_TS_TST_INFO_get_exts | ||
| 1387 | _libre_TS_TST_INFO_ext_free | ||
| 1388 | _libre_TS_TST_INFO_get_ext_count | ||
| 1389 | _libre_TS_TST_INFO_get_ext_by_NID | ||
| 1390 | _libre_TS_TST_INFO_get_ext_by_OBJ | ||
| 1391 | _libre_TS_TST_INFO_get_ext_by_critical | ||
| 1392 | _libre_TS_TST_INFO_get_ext | ||
| 1393 | _libre_TS_TST_INFO_delete_ext | ||
| 1394 | _libre_TS_TST_INFO_add_ext | ||
| 1395 | _libre_TS_TST_INFO_get_ext_d2i | ||
| 1396 | _libre_TS_RESP_CTX_new | ||
| 1397 | _libre_TS_RESP_CTX_free | ||
| 1398 | _libre_TS_RESP_CTX_set_signer_cert | ||
| 1399 | _libre_TS_RESP_CTX_set_signer_key | ||
| 1400 | _libre_TS_RESP_CTX_set_def_policy | ||
| 1401 | _libre_TS_RESP_CTX_set_certs | ||
| 1402 | _libre_TS_RESP_CTX_add_policy | ||
| 1403 | _libre_TS_RESP_CTX_add_md | ||
| 1404 | _libre_TS_RESP_CTX_set_accuracy | ||
| 1405 | _libre_TS_RESP_CTX_set_clock_precision_digits | ||
| 1406 | _libre_TS_RESP_CTX_add_flags | ||
| 1407 | _libre_TS_RESP_CTX_set_serial_cb | ||
| 1408 | _libre_TS_RESP_CTX_set_time_cb | ||
| 1409 | _libre_TS_RESP_CTX_set_extension_cb | ||
| 1410 | _libre_TS_RESP_CTX_set_status_info | ||
| 1411 | _libre_TS_RESP_CTX_set_status_info_cond | ||
| 1412 | _libre_TS_RESP_CTX_add_failure_info | ||
| 1413 | _libre_TS_RESP_CTX_get_request | ||
| 1414 | _libre_TS_RESP_CTX_get_tst_info | ||
| 1415 | _libre_TS_RESP_create_response | ||
| 1416 | _libre_TS_RESP_verify_signature | ||
| 1417 | _libre_TS_RESP_verify_response | ||
| 1418 | _libre_TS_RESP_verify_token | ||
| 1419 | _libre_TS_VERIFY_CTX_new | ||
| 1420 | _libre_TS_VERIFY_CTX_free | ||
| 1421 | _libre_TS_VERIFY_CTX_cleanup | ||
| 1422 | _libre_TS_VERIFY_CTX_add_flags | ||
| 1423 | _libre_TS_VERIFY_CTX_set_flags | ||
| 1424 | _libre_TS_VERIFY_CTX_set_data | ||
| 1425 | _libre_TS_VERIFY_CTX_set_store | ||
| 1426 | _libre_TS_VERIFY_CTX_set_certs | ||
| 1427 | _libre_TS_VERIFY_CTX_set_imprint | ||
| 1428 | _libre_TS_REQ_to_TS_VERIFY_CTX | ||
| 1429 | _libre_TS_RESP_print_bio | ||
| 1430 | _libre_TS_STATUS_INFO_print_bio | ||
| 1431 | _libre_TS_TST_INFO_print_bio | ||
| 1432 | _libre_TS_ASN1_INTEGER_print_bio | ||
| 1433 | _libre_TS_OBJ_print_bio | ||
| 1434 | _libre_TS_ext_print_bio | ||
| 1435 | _libre_TS_X509_ALGOR_print_bio | ||
| 1436 | _libre_TS_MSG_IMPRINT_print_bio | ||
| 1437 | _libre_TS_CONF_load_cert | ||
| 1438 | _libre_TS_CONF_load_certs | ||
| 1439 | _libre_TS_CONF_load_key | ||
| 1440 | _libre_TS_CONF_get_tsa_section | ||
| 1441 | _libre_TS_CONF_set_serial | ||
| 1442 | _libre_TS_CONF_set_crypto_device | ||
| 1443 | _libre_TS_CONF_set_default_engine | ||
| 1444 | _libre_TS_CONF_set_signer_cert | ||
| 1445 | _libre_TS_CONF_set_certs | ||
| 1446 | _libre_TS_CONF_set_signer_key | ||
| 1447 | _libre_TS_CONF_set_def_policy | ||
| 1448 | _libre_TS_CONF_set_policies | ||
| 1449 | _libre_TS_CONF_set_digests | ||
| 1450 | _libre_TS_CONF_set_accuracy | ||
| 1451 | _libre_TS_CONF_set_clock_precision_digits | ||
| 1452 | _libre_TS_CONF_set_ordering | ||
| 1453 | _libre_TS_CONF_set_tsa_name | ||
| 1454 | _libre_TS_CONF_set_ess_cert_id_chain | ||
| 1455 | _libre_ERR_load_TS_strings | ||
diff --git a/src/lib/libcrypto/hidden/openssl/ts.h b/src/lib/libcrypto/hidden/openssl/ts.h new file mode 100644 index 0000000000..de336ef93b --- /dev/null +++ b/src/lib/libcrypto/hidden/openssl/ts.h | |||
| @@ -0,0 +1,219 @@ | |||
| 1 | /* $OpenBSD: ts.h,v 1.1 2023/07/07 07:25:21 beck Exp $ */ | ||
| 2 | /* | ||
| 3 | * Copyright (c) 2023 Bob Beck <beck@openbsd.org> | ||
| 4 | * | ||
| 5 | * Permission to use, copy, modify, and distribute this software for any | ||
| 6 | * purpose with or without fee is hereby granted, provided that the above | ||
| 7 | * copyright notice and this permission notice appear in all copies. | ||
| 8 | * | ||
| 9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| 10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| 11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| 12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| 13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| 14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef _LIBCRYPTO_TS_H | ||
| 19 | #define _LIBCRYPTO_TS_H | ||
| 20 | |||
| 21 | #ifndef _MSC_VER | ||
| 22 | #include_next <openssl/ts.h> | ||
| 23 | #else | ||
| 24 | #include "../include/openssl/ts.h" | ||
| 25 | #endif | ||
| 26 | #include "crypto_namespace.h" | ||
| 27 | |||
| 28 | LCRYPTO_USED(TS_REQ_new); | ||
| 29 | LCRYPTO_USED(TS_REQ_free); | ||
| 30 | LCRYPTO_USED(i2d_TS_REQ); | ||
| 31 | LCRYPTO_USED(d2i_TS_REQ); | ||
| 32 | LCRYPTO_USED(TS_REQ_dup); | ||
| 33 | LCRYPTO_USED(d2i_TS_REQ_fp); | ||
| 34 | LCRYPTO_USED(i2d_TS_REQ_fp); | ||
| 35 | LCRYPTO_USED(d2i_TS_REQ_bio); | ||
| 36 | LCRYPTO_USED(i2d_TS_REQ_bio); | ||
| 37 | LCRYPTO_USED(TS_MSG_IMPRINT_new); | ||
| 38 | LCRYPTO_USED(TS_MSG_IMPRINT_free); | ||
| 39 | LCRYPTO_USED(i2d_TS_MSG_IMPRINT); | ||
| 40 | LCRYPTO_USED(d2i_TS_MSG_IMPRINT); | ||
| 41 | LCRYPTO_USED(TS_MSG_IMPRINT_dup); | ||
| 42 | LCRYPTO_USED(d2i_TS_MSG_IMPRINT_fp); | ||
| 43 | LCRYPTO_USED(i2d_TS_MSG_IMPRINT_fp); | ||
| 44 | LCRYPTO_USED(d2i_TS_MSG_IMPRINT_bio); | ||
| 45 | LCRYPTO_USED(i2d_TS_MSG_IMPRINT_bio); | ||
| 46 | LCRYPTO_USED(TS_RESP_new); | ||
| 47 | LCRYPTO_USED(TS_RESP_free); | ||
| 48 | LCRYPTO_USED(i2d_TS_RESP); | ||
| 49 | LCRYPTO_USED(d2i_TS_RESP); | ||
| 50 | LCRYPTO_USED(PKCS7_to_TS_TST_INFO); | ||
| 51 | LCRYPTO_USED(TS_RESP_dup); | ||
| 52 | LCRYPTO_USED(d2i_TS_RESP_fp); | ||
| 53 | LCRYPTO_USED(i2d_TS_RESP_fp); | ||
| 54 | LCRYPTO_USED(d2i_TS_RESP_bio); | ||
| 55 | LCRYPTO_USED(i2d_TS_RESP_bio); | ||
| 56 | LCRYPTO_USED(TS_STATUS_INFO_new); | ||
| 57 | LCRYPTO_USED(TS_STATUS_INFO_free); | ||
| 58 | LCRYPTO_USED(i2d_TS_STATUS_INFO); | ||
| 59 | LCRYPTO_USED(d2i_TS_STATUS_INFO); | ||
| 60 | LCRYPTO_USED(TS_STATUS_INFO_dup); | ||
| 61 | LCRYPTO_USED(TS_TST_INFO_new); | ||
| 62 | LCRYPTO_USED(TS_TST_INFO_free); | ||
| 63 | LCRYPTO_USED(i2d_TS_TST_INFO); | ||
| 64 | LCRYPTO_USED(d2i_TS_TST_INFO); | ||
| 65 | LCRYPTO_USED(TS_TST_INFO_dup); | ||
| 66 | LCRYPTO_USED(d2i_TS_TST_INFO_fp); | ||
| 67 | LCRYPTO_USED(i2d_TS_TST_INFO_fp); | ||
| 68 | LCRYPTO_USED(d2i_TS_TST_INFO_bio); | ||
| 69 | LCRYPTO_USED(i2d_TS_TST_INFO_bio); | ||
| 70 | LCRYPTO_USED(TS_ACCURACY_new); | ||
| 71 | LCRYPTO_USED(TS_ACCURACY_free); | ||
| 72 | LCRYPTO_USED(i2d_TS_ACCURACY); | ||
| 73 | LCRYPTO_USED(d2i_TS_ACCURACY); | ||
| 74 | LCRYPTO_USED(TS_ACCURACY_dup); | ||
| 75 | LCRYPTO_USED(ESS_ISSUER_SERIAL_new); | ||
| 76 | LCRYPTO_USED(ESS_ISSUER_SERIAL_free); | ||
| 77 | LCRYPTO_USED(i2d_ESS_ISSUER_SERIAL); | ||
| 78 | LCRYPTO_USED(d2i_ESS_ISSUER_SERIAL); | ||
| 79 | LCRYPTO_USED(ESS_ISSUER_SERIAL_dup); | ||
| 80 | LCRYPTO_USED(ESS_CERT_ID_new); | ||
| 81 | LCRYPTO_USED(ESS_CERT_ID_free); | ||
| 82 | LCRYPTO_USED(i2d_ESS_CERT_ID); | ||
| 83 | LCRYPTO_USED(d2i_ESS_CERT_ID); | ||
| 84 | LCRYPTO_USED(ESS_CERT_ID_dup); | ||
| 85 | LCRYPTO_USED(ESS_SIGNING_CERT_new); | ||
| 86 | LCRYPTO_USED(ESS_SIGNING_CERT_free); | ||
| 87 | LCRYPTO_USED(i2d_ESS_SIGNING_CERT); | ||
| 88 | LCRYPTO_USED(d2i_ESS_SIGNING_CERT); | ||
| 89 | LCRYPTO_USED(ESS_SIGNING_CERT_dup); | ||
| 90 | LCRYPTO_USED(TS_REQ_set_version); | ||
| 91 | LCRYPTO_USED(TS_REQ_get_version); | ||
| 92 | LCRYPTO_USED(TS_REQ_set_msg_imprint); | ||
| 93 | LCRYPTO_USED(TS_REQ_get_msg_imprint); | ||
| 94 | LCRYPTO_USED(TS_MSG_IMPRINT_set_algo); | ||
| 95 | LCRYPTO_USED(TS_MSG_IMPRINT_get_algo); | ||
| 96 | LCRYPTO_USED(TS_MSG_IMPRINT_set_msg); | ||
| 97 | LCRYPTO_USED(TS_MSG_IMPRINT_get_msg); | ||
| 98 | LCRYPTO_USED(TS_REQ_set_policy_id); | ||
| 99 | LCRYPTO_USED(TS_REQ_get_policy_id); | ||
| 100 | LCRYPTO_USED(TS_REQ_set_nonce); | ||
| 101 | LCRYPTO_USED(TS_REQ_get_nonce); | ||
| 102 | LCRYPTO_USED(TS_REQ_set_cert_req); | ||
| 103 | LCRYPTO_USED(TS_REQ_get_cert_req); | ||
| 104 | LCRYPTO_USED(TS_REQ_get_exts); | ||
| 105 | LCRYPTO_USED(TS_REQ_ext_free); | ||
| 106 | LCRYPTO_USED(TS_REQ_get_ext_count); | ||
| 107 | LCRYPTO_USED(TS_REQ_get_ext_by_NID); | ||
| 108 | LCRYPTO_USED(TS_REQ_get_ext_by_OBJ); | ||
| 109 | LCRYPTO_USED(TS_REQ_get_ext_by_critical); | ||
| 110 | LCRYPTO_USED(TS_REQ_get_ext); | ||
| 111 | LCRYPTO_USED(TS_REQ_delete_ext); | ||
| 112 | LCRYPTO_USED(TS_REQ_add_ext); | ||
| 113 | LCRYPTO_USED(TS_REQ_get_ext_d2i); | ||
| 114 | LCRYPTO_USED(TS_REQ_print_bio); | ||
| 115 | LCRYPTO_USED(TS_RESP_set_status_info); | ||
| 116 | LCRYPTO_USED(TS_RESP_get_status_info); | ||
| 117 | LCRYPTO_USED(TS_STATUS_INFO_get0_failure_info); | ||
| 118 | LCRYPTO_USED(TS_STATUS_INFO_get0_text); | ||
| 119 | LCRYPTO_USED(TS_STATUS_INFO_get0_status); | ||
| 120 | LCRYPTO_USED(TS_STATUS_INFO_set_status); | ||
| 121 | LCRYPTO_USED(TS_RESP_set_tst_info); | ||
| 122 | LCRYPTO_USED(TS_RESP_get_token); | ||
| 123 | LCRYPTO_USED(TS_RESP_get_tst_info); | ||
| 124 | LCRYPTO_USED(TS_TST_INFO_set_version); | ||
| 125 | LCRYPTO_USED(TS_TST_INFO_get_version); | ||
| 126 | LCRYPTO_USED(TS_TST_INFO_set_policy_id); | ||
| 127 | LCRYPTO_USED(TS_TST_INFO_get_policy_id); | ||
| 128 | LCRYPTO_USED(TS_TST_INFO_set_msg_imprint); | ||
| 129 | LCRYPTO_USED(TS_TST_INFO_get_msg_imprint); | ||
| 130 | LCRYPTO_USED(TS_TST_INFO_set_serial); | ||
| 131 | LCRYPTO_USED(TS_TST_INFO_get_serial); | ||
| 132 | LCRYPTO_USED(TS_TST_INFO_set_time); | ||
| 133 | LCRYPTO_USED(TS_TST_INFO_get_time); | ||
| 134 | LCRYPTO_USED(TS_TST_INFO_set_accuracy); | ||
| 135 | LCRYPTO_USED(TS_TST_INFO_get_accuracy); | ||
| 136 | LCRYPTO_USED(TS_ACCURACY_set_seconds); | ||
| 137 | LCRYPTO_USED(TS_ACCURACY_get_seconds); | ||
| 138 | LCRYPTO_USED(TS_ACCURACY_set_millis); | ||
| 139 | LCRYPTO_USED(TS_ACCURACY_get_millis); | ||
| 140 | LCRYPTO_USED(TS_ACCURACY_set_micros); | ||
| 141 | LCRYPTO_USED(TS_ACCURACY_get_micros); | ||
| 142 | LCRYPTO_USED(TS_TST_INFO_set_ordering); | ||
| 143 | LCRYPTO_USED(TS_TST_INFO_get_ordering); | ||
| 144 | LCRYPTO_USED(TS_TST_INFO_set_nonce); | ||
| 145 | LCRYPTO_USED(TS_TST_INFO_get_nonce); | ||
| 146 | LCRYPTO_USED(TS_TST_INFO_set_tsa); | ||
| 147 | LCRYPTO_USED(TS_TST_INFO_get_tsa); | ||
| 148 | LCRYPTO_USED(TS_TST_INFO_get_exts); | ||
| 149 | LCRYPTO_USED(TS_TST_INFO_ext_free); | ||
| 150 | LCRYPTO_USED(TS_TST_INFO_get_ext_count); | ||
| 151 | LCRYPTO_USED(TS_TST_INFO_get_ext_by_NID); | ||
| 152 | LCRYPTO_USED(TS_TST_INFO_get_ext_by_OBJ); | ||
| 153 | LCRYPTO_USED(TS_TST_INFO_get_ext_by_critical); | ||
| 154 | LCRYPTO_USED(TS_TST_INFO_get_ext); | ||
| 155 | LCRYPTO_USED(TS_TST_INFO_delete_ext); | ||
| 156 | LCRYPTO_USED(TS_TST_INFO_add_ext); | ||
| 157 | LCRYPTO_USED(TS_TST_INFO_get_ext_d2i); | ||
| 158 | LCRYPTO_USED(TS_RESP_CTX_new); | ||
| 159 | LCRYPTO_USED(TS_RESP_CTX_free); | ||
| 160 | LCRYPTO_USED(TS_RESP_CTX_set_signer_cert); | ||
| 161 | LCRYPTO_USED(TS_RESP_CTX_set_signer_key); | ||
| 162 | LCRYPTO_USED(TS_RESP_CTX_set_def_policy); | ||
| 163 | LCRYPTO_USED(TS_RESP_CTX_set_certs); | ||
| 164 | LCRYPTO_USED(TS_RESP_CTX_add_policy); | ||
| 165 | LCRYPTO_USED(TS_RESP_CTX_add_md); | ||
| 166 | LCRYPTO_USED(TS_RESP_CTX_set_accuracy); | ||
| 167 | LCRYPTO_USED(TS_RESP_CTX_set_clock_precision_digits); | ||
| 168 | LCRYPTO_USED(TS_RESP_CTX_add_flags); | ||
| 169 | LCRYPTO_USED(TS_RESP_CTX_set_serial_cb); | ||
| 170 | LCRYPTO_USED(TS_RESP_CTX_set_time_cb); | ||
| 171 | LCRYPTO_USED(TS_RESP_CTX_set_extension_cb); | ||
| 172 | LCRYPTO_USED(TS_RESP_CTX_set_status_info); | ||
| 173 | LCRYPTO_USED(TS_RESP_CTX_set_status_info_cond); | ||
| 174 | LCRYPTO_USED(TS_RESP_CTX_add_failure_info); | ||
| 175 | LCRYPTO_USED(TS_RESP_CTX_get_request); | ||
| 176 | LCRYPTO_USED(TS_RESP_CTX_get_tst_info); | ||
| 177 | LCRYPTO_USED(TS_RESP_create_response); | ||
| 178 | LCRYPTO_USED(TS_RESP_verify_signature); | ||
| 179 | LCRYPTO_USED(TS_RESP_verify_response); | ||
| 180 | LCRYPTO_USED(TS_RESP_verify_token); | ||
| 181 | LCRYPTO_USED(TS_VERIFY_CTX_new); | ||
| 182 | LCRYPTO_USED(TS_VERIFY_CTX_free); | ||
| 183 | LCRYPTO_USED(TS_VERIFY_CTX_cleanup); | ||
| 184 | LCRYPTO_USED(TS_VERIFY_CTX_add_flags); | ||
| 185 | LCRYPTO_USED(TS_VERIFY_CTX_set_flags); | ||
| 186 | LCRYPTO_USED(TS_VERIFY_CTX_set_data); | ||
| 187 | LCRYPTO_USED(TS_VERIFY_CTX_set_store); | ||
| 188 | LCRYPTO_USED(TS_VERIFY_CTX_set_certs); | ||
| 189 | LCRYPTO_USED(TS_VERIFY_CTX_set_imprint); | ||
| 190 | LCRYPTO_USED(TS_REQ_to_TS_VERIFY_CTX); | ||
| 191 | LCRYPTO_USED(TS_RESP_print_bio); | ||
| 192 | LCRYPTO_USED(TS_STATUS_INFO_print_bio); | ||
| 193 | LCRYPTO_USED(TS_TST_INFO_print_bio); | ||
| 194 | LCRYPTO_USED(TS_ASN1_INTEGER_print_bio); | ||
| 195 | LCRYPTO_USED(TS_OBJ_print_bio); | ||
| 196 | LCRYPTO_USED(TS_ext_print_bio); | ||
| 197 | LCRYPTO_USED(TS_X509_ALGOR_print_bio); | ||
| 198 | LCRYPTO_USED(TS_MSG_IMPRINT_print_bio); | ||
| 199 | LCRYPTO_USED(TS_CONF_load_cert); | ||
| 200 | LCRYPTO_USED(TS_CONF_load_certs); | ||
| 201 | LCRYPTO_USED(TS_CONF_load_key); | ||
| 202 | LCRYPTO_USED(TS_CONF_get_tsa_section); | ||
| 203 | LCRYPTO_USED(TS_CONF_set_serial); | ||
| 204 | LCRYPTO_USED(TS_CONF_set_crypto_device); | ||
| 205 | LCRYPTO_USED(TS_CONF_set_default_engine); | ||
| 206 | LCRYPTO_USED(TS_CONF_set_signer_cert); | ||
| 207 | LCRYPTO_USED(TS_CONF_set_certs); | ||
| 208 | LCRYPTO_USED(TS_CONF_set_signer_key); | ||
| 209 | LCRYPTO_USED(TS_CONF_set_def_policy); | ||
| 210 | LCRYPTO_USED(TS_CONF_set_policies); | ||
| 211 | LCRYPTO_USED(TS_CONF_set_digests); | ||
| 212 | LCRYPTO_USED(TS_CONF_set_accuracy); | ||
| 213 | LCRYPTO_USED(TS_CONF_set_clock_precision_digits); | ||
| 214 | LCRYPTO_USED(TS_CONF_set_ordering); | ||
| 215 | LCRYPTO_USED(TS_CONF_set_tsa_name); | ||
| 216 | LCRYPTO_USED(TS_CONF_set_ess_cert_id_chain); | ||
| 217 | LCRYPTO_USED(ERR_load_TS_strings); | ||
| 218 | |||
| 219 | #endif /* _LIBCRYPTO_TS_H */ | ||
diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c index 6537f1c85a..60ee0b81cb 100644 --- a/src/lib/libcrypto/ts/ts_asn1.c +++ b/src/lib/libcrypto/ts/ts_asn1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_asn1.c,v 1.13 2022/07/24 08:16:47 tb Exp $ */ | 1 | /* $OpenBSD: ts_asn1.c,v 1.14 2023/07/07 07:25:21 beck Exp $ */ |
| 2 | /* Written by Nils Larsch for the OpenSSL project 2004. | 2 | /* Written by Nils Larsch for the OpenSSL project 2004. |
| 3 | */ | 3 | */ |
| 4 | /* ==================================================================== | 4 | /* ==================================================================== |
| @@ -97,30 +97,35 @@ d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a, const unsigned char **in, long len) | |||
| 97 | return (TS_MSG_IMPRINT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 97 | return (TS_MSG_IMPRINT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 98 | &TS_MSG_IMPRINT_it); | 98 | &TS_MSG_IMPRINT_it); |
| 99 | } | 99 | } |
| 100 | LCRYPTO_ALIAS(d2i_TS_MSG_IMPRINT); | ||
| 100 | 101 | ||
| 101 | int | 102 | int |
| 102 | i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **out) | 103 | i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **out) |
| 103 | { | 104 | { |
| 104 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_MSG_IMPRINT_it); | 105 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_MSG_IMPRINT_it); |
| 105 | } | 106 | } |
| 107 | LCRYPTO_ALIAS(i2d_TS_MSG_IMPRINT); | ||
| 106 | 108 | ||
| 107 | TS_MSG_IMPRINT * | 109 | TS_MSG_IMPRINT * |
| 108 | TS_MSG_IMPRINT_new(void) | 110 | TS_MSG_IMPRINT_new(void) |
| 109 | { | 111 | { |
| 110 | return (TS_MSG_IMPRINT *)ASN1_item_new(&TS_MSG_IMPRINT_it); | 112 | return (TS_MSG_IMPRINT *)ASN1_item_new(&TS_MSG_IMPRINT_it); |
| 111 | } | 113 | } |
| 114 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_new); | ||
| 112 | 115 | ||
| 113 | void | 116 | void |
| 114 | TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a) | 117 | TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a) |
| 115 | { | 118 | { |
| 116 | ASN1_item_free((ASN1_VALUE *)a, &TS_MSG_IMPRINT_it); | 119 | ASN1_item_free((ASN1_VALUE *)a, &TS_MSG_IMPRINT_it); |
| 117 | } | 120 | } |
| 121 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_free); | ||
| 118 | 122 | ||
| 119 | TS_MSG_IMPRINT * | 123 | TS_MSG_IMPRINT * |
| 120 | TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *x) | 124 | TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *x) |
| 121 | { | 125 | { |
| 122 | return ASN1_item_dup(&TS_MSG_IMPRINT_it, x); | 126 | return ASN1_item_dup(&TS_MSG_IMPRINT_it, x); |
| 123 | } | 127 | } |
| 128 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_dup); | ||
| 124 | 129 | ||
| 125 | #ifndef OPENSSL_NO_BIO | 130 | #ifndef OPENSSL_NO_BIO |
| 126 | TS_MSG_IMPRINT * | 131 | TS_MSG_IMPRINT * |
| @@ -128,12 +133,14 @@ d2i_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT **a) | |||
| 128 | { | 133 | { |
| 129 | return ASN1_item_d2i_bio(&TS_MSG_IMPRINT_it, bp, a); | 134 | return ASN1_item_d2i_bio(&TS_MSG_IMPRINT_it, bp, a); |
| 130 | } | 135 | } |
| 136 | LCRYPTO_ALIAS(d2i_TS_MSG_IMPRINT_bio); | ||
| 131 | 137 | ||
| 132 | int | 138 | int |
| 133 | i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a) | 139 | i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a) |
| 134 | { | 140 | { |
| 135 | return ASN1_item_i2d_bio(&TS_MSG_IMPRINT_it, bp, a); | 141 | return ASN1_item_i2d_bio(&TS_MSG_IMPRINT_it, bp, a); |
| 136 | } | 142 | } |
| 143 | LCRYPTO_ALIAS(i2d_TS_MSG_IMPRINT_bio); | ||
| 137 | #endif | 144 | #endif |
| 138 | 145 | ||
| 139 | TS_MSG_IMPRINT * | 146 | TS_MSG_IMPRINT * |
| @@ -141,12 +148,14 @@ d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a) | |||
| 141 | { | 148 | { |
| 142 | return ASN1_item_d2i_fp(&TS_MSG_IMPRINT_it, fp, a); | 149 | return ASN1_item_d2i_fp(&TS_MSG_IMPRINT_it, fp, a); |
| 143 | } | 150 | } |
| 151 | LCRYPTO_ALIAS(d2i_TS_MSG_IMPRINT_fp); | ||
| 144 | 152 | ||
| 145 | int | 153 | int |
| 146 | i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a) | 154 | i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a) |
| 147 | { | 155 | { |
| 148 | return ASN1_item_i2d_fp(&TS_MSG_IMPRINT_it, fp, a); | 156 | return ASN1_item_i2d_fp(&TS_MSG_IMPRINT_it, fp, a); |
| 149 | } | 157 | } |
| 158 | LCRYPTO_ALIAS(i2d_TS_MSG_IMPRINT_fp); | ||
| 150 | 159 | ||
| 151 | static const ASN1_TEMPLATE TS_REQ_seq_tt[] = { | 160 | static const ASN1_TEMPLATE TS_REQ_seq_tt[] = { |
| 152 | { | 161 | { |
| @@ -210,30 +219,35 @@ d2i_TS_REQ(TS_REQ **a, const unsigned char **in, long len) | |||
| 210 | return (TS_REQ *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 219 | return (TS_REQ *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 211 | &TS_REQ_it); | 220 | &TS_REQ_it); |
| 212 | } | 221 | } |
| 222 | LCRYPTO_ALIAS(d2i_TS_REQ); | ||
| 213 | 223 | ||
| 214 | int | 224 | int |
| 215 | i2d_TS_REQ(const TS_REQ *a, unsigned char **out) | 225 | i2d_TS_REQ(const TS_REQ *a, unsigned char **out) |
| 216 | { | 226 | { |
| 217 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_REQ_it); | 227 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_REQ_it); |
| 218 | } | 228 | } |
| 229 | LCRYPTO_ALIAS(i2d_TS_REQ); | ||
| 219 | 230 | ||
| 220 | TS_REQ * | 231 | TS_REQ * |
| 221 | TS_REQ_new(void) | 232 | TS_REQ_new(void) |
| 222 | { | 233 | { |
| 223 | return (TS_REQ *)ASN1_item_new(&TS_REQ_it); | 234 | return (TS_REQ *)ASN1_item_new(&TS_REQ_it); |
| 224 | } | 235 | } |
| 236 | LCRYPTO_ALIAS(TS_REQ_new); | ||
| 225 | 237 | ||
| 226 | void | 238 | void |
| 227 | TS_REQ_free(TS_REQ *a) | 239 | TS_REQ_free(TS_REQ *a) |
| 228 | { | 240 | { |
| 229 | ASN1_item_free((ASN1_VALUE *)a, &TS_REQ_it); | 241 | ASN1_item_free((ASN1_VALUE *)a, &TS_REQ_it); |
| 230 | } | 242 | } |
| 243 | LCRYPTO_ALIAS(TS_REQ_free); | ||
| 231 | 244 | ||
| 232 | TS_REQ * | 245 | TS_REQ * |
| 233 | TS_REQ_dup(TS_REQ *x) | 246 | TS_REQ_dup(TS_REQ *x) |
| 234 | { | 247 | { |
| 235 | return ASN1_item_dup(&TS_REQ_it, x); | 248 | return ASN1_item_dup(&TS_REQ_it, x); |
| 236 | } | 249 | } |
| 250 | LCRYPTO_ALIAS(TS_REQ_dup); | ||
| 237 | 251 | ||
| 238 | #ifndef OPENSSL_NO_BIO | 252 | #ifndef OPENSSL_NO_BIO |
| 239 | TS_REQ * | 253 | TS_REQ * |
| @@ -241,12 +255,14 @@ d2i_TS_REQ_bio(BIO *bp, TS_REQ **a) | |||
| 241 | { | 255 | { |
| 242 | return ASN1_item_d2i_bio(&TS_REQ_it, bp, a); | 256 | return ASN1_item_d2i_bio(&TS_REQ_it, bp, a); |
| 243 | } | 257 | } |
| 258 | LCRYPTO_ALIAS(d2i_TS_REQ_bio); | ||
| 244 | 259 | ||
| 245 | int | 260 | int |
| 246 | i2d_TS_REQ_bio(BIO *bp, TS_REQ *a) | 261 | i2d_TS_REQ_bio(BIO *bp, TS_REQ *a) |
| 247 | { | 262 | { |
| 248 | return ASN1_item_i2d_bio(&TS_REQ_it, bp, a); | 263 | return ASN1_item_i2d_bio(&TS_REQ_it, bp, a); |
| 249 | } | 264 | } |
| 265 | LCRYPTO_ALIAS(i2d_TS_REQ_bio); | ||
| 250 | #endif | 266 | #endif |
| 251 | 267 | ||
| 252 | TS_REQ * | 268 | TS_REQ * |
| @@ -254,12 +270,14 @@ d2i_TS_REQ_fp(FILE *fp, TS_REQ **a) | |||
| 254 | { | 270 | { |
| 255 | return ASN1_item_d2i_fp(&TS_REQ_it, fp, a); | 271 | return ASN1_item_d2i_fp(&TS_REQ_it, fp, a); |
| 256 | } | 272 | } |
| 273 | LCRYPTO_ALIAS(d2i_TS_REQ_fp); | ||
| 257 | 274 | ||
| 258 | int | 275 | int |
| 259 | i2d_TS_REQ_fp(FILE *fp, TS_REQ *a) | 276 | i2d_TS_REQ_fp(FILE *fp, TS_REQ *a) |
| 260 | { | 277 | { |
| 261 | return ASN1_item_i2d_fp(&TS_REQ_it, fp, a); | 278 | return ASN1_item_i2d_fp(&TS_REQ_it, fp, a); |
| 262 | } | 279 | } |
| 280 | LCRYPTO_ALIAS(i2d_TS_REQ_fp); | ||
| 263 | 281 | ||
| 264 | static const ASN1_TEMPLATE TS_ACCURACY_seq_tt[] = { | 282 | static const ASN1_TEMPLATE TS_ACCURACY_seq_tt[] = { |
| 265 | { | 283 | { |
| @@ -302,30 +320,35 @@ d2i_TS_ACCURACY(TS_ACCURACY **a, const unsigned char **in, long len) | |||
| 302 | return (TS_ACCURACY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 320 | return (TS_ACCURACY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 303 | &TS_ACCURACY_it); | 321 | &TS_ACCURACY_it); |
| 304 | } | 322 | } |
| 323 | LCRYPTO_ALIAS(d2i_TS_ACCURACY); | ||
| 305 | 324 | ||
| 306 | int | 325 | int |
| 307 | i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **out) | 326 | i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **out) |
| 308 | { | 327 | { |
| 309 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_ACCURACY_it); | 328 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_ACCURACY_it); |
| 310 | } | 329 | } |
| 330 | LCRYPTO_ALIAS(i2d_TS_ACCURACY); | ||
| 311 | 331 | ||
| 312 | TS_ACCURACY * | 332 | TS_ACCURACY * |
| 313 | TS_ACCURACY_new(void) | 333 | TS_ACCURACY_new(void) |
| 314 | { | 334 | { |
| 315 | return (TS_ACCURACY *)ASN1_item_new(&TS_ACCURACY_it); | 335 | return (TS_ACCURACY *)ASN1_item_new(&TS_ACCURACY_it); |
| 316 | } | 336 | } |
| 337 | LCRYPTO_ALIAS(TS_ACCURACY_new); | ||
| 317 | 338 | ||
| 318 | void | 339 | void |
| 319 | TS_ACCURACY_free(TS_ACCURACY *a) | 340 | TS_ACCURACY_free(TS_ACCURACY *a) |
| 320 | { | 341 | { |
| 321 | ASN1_item_free((ASN1_VALUE *)a, &TS_ACCURACY_it); | 342 | ASN1_item_free((ASN1_VALUE *)a, &TS_ACCURACY_it); |
| 322 | } | 343 | } |
| 344 | LCRYPTO_ALIAS(TS_ACCURACY_free); | ||
| 323 | 345 | ||
| 324 | TS_ACCURACY * | 346 | TS_ACCURACY * |
| 325 | TS_ACCURACY_dup(TS_ACCURACY *x) | 347 | TS_ACCURACY_dup(TS_ACCURACY *x) |
| 326 | { | 348 | { |
| 327 | return ASN1_item_dup(&TS_ACCURACY_it, x); | 349 | return ASN1_item_dup(&TS_ACCURACY_it, x); |
| 328 | } | 350 | } |
| 351 | LCRYPTO_ALIAS(TS_ACCURACY_dup); | ||
| 329 | 352 | ||
| 330 | static const ASN1_TEMPLATE TS_TST_INFO_seq_tt[] = { | 353 | static const ASN1_TEMPLATE TS_TST_INFO_seq_tt[] = { |
| 331 | { | 354 | { |
| @@ -417,30 +440,35 @@ d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **in, long len) | |||
| 417 | return (TS_TST_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 440 | return (TS_TST_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 418 | &TS_TST_INFO_it); | 441 | &TS_TST_INFO_it); |
| 419 | } | 442 | } |
| 443 | LCRYPTO_ALIAS(d2i_TS_TST_INFO); | ||
| 420 | 444 | ||
| 421 | int | 445 | int |
| 422 | i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **out) | 446 | i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **out) |
| 423 | { | 447 | { |
| 424 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_TST_INFO_it); | 448 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_TST_INFO_it); |
| 425 | } | 449 | } |
| 450 | LCRYPTO_ALIAS(i2d_TS_TST_INFO); | ||
| 426 | 451 | ||
| 427 | TS_TST_INFO * | 452 | TS_TST_INFO * |
| 428 | TS_TST_INFO_new(void) | 453 | TS_TST_INFO_new(void) |
| 429 | { | 454 | { |
| 430 | return (TS_TST_INFO *)ASN1_item_new(&TS_TST_INFO_it); | 455 | return (TS_TST_INFO *)ASN1_item_new(&TS_TST_INFO_it); |
| 431 | } | 456 | } |
| 457 | LCRYPTO_ALIAS(TS_TST_INFO_new); | ||
| 432 | 458 | ||
| 433 | void | 459 | void |
| 434 | TS_TST_INFO_free(TS_TST_INFO *a) | 460 | TS_TST_INFO_free(TS_TST_INFO *a) |
| 435 | { | 461 | { |
| 436 | ASN1_item_free((ASN1_VALUE *)a, &TS_TST_INFO_it); | 462 | ASN1_item_free((ASN1_VALUE *)a, &TS_TST_INFO_it); |
| 437 | } | 463 | } |
| 464 | LCRYPTO_ALIAS(TS_TST_INFO_free); | ||
| 438 | 465 | ||
| 439 | TS_TST_INFO * | 466 | TS_TST_INFO * |
| 440 | TS_TST_INFO_dup(TS_TST_INFO *x) | 467 | TS_TST_INFO_dup(TS_TST_INFO *x) |
| 441 | { | 468 | { |
| 442 | return ASN1_item_dup(&TS_TST_INFO_it, x); | 469 | return ASN1_item_dup(&TS_TST_INFO_it, x); |
| 443 | } | 470 | } |
| 471 | LCRYPTO_ALIAS(TS_TST_INFO_dup); | ||
| 444 | 472 | ||
| 445 | #ifndef OPENSSL_NO_BIO | 473 | #ifndef OPENSSL_NO_BIO |
| 446 | TS_TST_INFO * | 474 | TS_TST_INFO * |
| @@ -448,12 +476,14 @@ d2i_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO **a) | |||
| 448 | { | 476 | { |
| 449 | return ASN1_item_d2i_bio(&TS_TST_INFO_it, bp, a); | 477 | return ASN1_item_d2i_bio(&TS_TST_INFO_it, bp, a); |
| 450 | } | 478 | } |
| 479 | LCRYPTO_ALIAS(d2i_TS_TST_INFO_bio); | ||
| 451 | 480 | ||
| 452 | int | 481 | int |
| 453 | i2d_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO *a) | 482 | i2d_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO *a) |
| 454 | { | 483 | { |
| 455 | return ASN1_item_i2d_bio(&TS_TST_INFO_it, bp, a); | 484 | return ASN1_item_i2d_bio(&TS_TST_INFO_it, bp, a); |
| 456 | } | 485 | } |
| 486 | LCRYPTO_ALIAS(i2d_TS_TST_INFO_bio); | ||
| 457 | #endif | 487 | #endif |
| 458 | 488 | ||
| 459 | TS_TST_INFO * | 489 | TS_TST_INFO * |
| @@ -461,12 +491,14 @@ d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a) | |||
| 461 | { | 491 | { |
| 462 | return ASN1_item_d2i_fp(&TS_TST_INFO_it, fp, a); | 492 | return ASN1_item_d2i_fp(&TS_TST_INFO_it, fp, a); |
| 463 | } | 493 | } |
| 494 | LCRYPTO_ALIAS(d2i_TS_TST_INFO_fp); | ||
| 464 | 495 | ||
| 465 | int | 496 | int |
| 466 | i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a) | 497 | i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a) |
| 467 | { | 498 | { |
| 468 | return ASN1_item_i2d_fp(&TS_TST_INFO_it, fp, a); | 499 | return ASN1_item_i2d_fp(&TS_TST_INFO_it, fp, a); |
| 469 | } | 500 | } |
| 501 | LCRYPTO_ALIAS(i2d_TS_TST_INFO_fp); | ||
| 470 | 502 | ||
| 471 | static const ASN1_TEMPLATE TS_STATUS_INFO_seq_tt[] = { | 503 | static const ASN1_TEMPLATE TS_STATUS_INFO_seq_tt[] = { |
| 472 | { | 504 | { |
| @@ -509,30 +541,35 @@ d2i_TS_STATUS_INFO(TS_STATUS_INFO **a, const unsigned char **in, long len) | |||
| 509 | return (TS_STATUS_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 541 | return (TS_STATUS_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 510 | &TS_STATUS_INFO_it); | 542 | &TS_STATUS_INFO_it); |
| 511 | } | 543 | } |
| 544 | LCRYPTO_ALIAS(d2i_TS_STATUS_INFO); | ||
| 512 | 545 | ||
| 513 | int | 546 | int |
| 514 | i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **out) | 547 | i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **out) |
| 515 | { | 548 | { |
| 516 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_STATUS_INFO_it); | 549 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_STATUS_INFO_it); |
| 517 | } | 550 | } |
| 551 | LCRYPTO_ALIAS(i2d_TS_STATUS_INFO); | ||
| 518 | 552 | ||
| 519 | TS_STATUS_INFO * | 553 | TS_STATUS_INFO * |
| 520 | TS_STATUS_INFO_new(void) | 554 | TS_STATUS_INFO_new(void) |
| 521 | { | 555 | { |
| 522 | return (TS_STATUS_INFO *)ASN1_item_new(&TS_STATUS_INFO_it); | 556 | return (TS_STATUS_INFO *)ASN1_item_new(&TS_STATUS_INFO_it); |
| 523 | } | 557 | } |
| 558 | LCRYPTO_ALIAS(TS_STATUS_INFO_new); | ||
| 524 | 559 | ||
| 525 | void | 560 | void |
| 526 | TS_STATUS_INFO_free(TS_STATUS_INFO *a) | 561 | TS_STATUS_INFO_free(TS_STATUS_INFO *a) |
| 527 | { | 562 | { |
| 528 | ASN1_item_free((ASN1_VALUE *)a, &TS_STATUS_INFO_it); | 563 | ASN1_item_free((ASN1_VALUE *)a, &TS_STATUS_INFO_it); |
| 529 | } | 564 | } |
| 565 | LCRYPTO_ALIAS(TS_STATUS_INFO_free); | ||
| 530 | 566 | ||
| 531 | TS_STATUS_INFO * | 567 | TS_STATUS_INFO * |
| 532 | TS_STATUS_INFO_dup(TS_STATUS_INFO *x) | 568 | TS_STATUS_INFO_dup(TS_STATUS_INFO *x) |
| 533 | { | 569 | { |
| 534 | return ASN1_item_dup(&TS_STATUS_INFO_it, x); | 570 | return ASN1_item_dup(&TS_STATUS_INFO_it, x); |
| 535 | } | 571 | } |
| 572 | LCRYPTO_ALIAS(TS_STATUS_INFO_dup); | ||
| 536 | 573 | ||
| 537 | static int | 574 | static int |
| 538 | ts_resp_set_tst_info(TS_RESP *a) | 575 | ts_resp_set_tst_info(TS_RESP *a) |
| @@ -620,30 +657,35 @@ d2i_TS_RESP(TS_RESP **a, const unsigned char **in, long len) | |||
| 620 | return (TS_RESP *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 657 | return (TS_RESP *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 621 | &TS_RESP_it); | 658 | &TS_RESP_it); |
| 622 | } | 659 | } |
| 660 | LCRYPTO_ALIAS(d2i_TS_RESP); | ||
| 623 | 661 | ||
| 624 | int | 662 | int |
| 625 | i2d_TS_RESP(const TS_RESP *a, unsigned char **out) | 663 | i2d_TS_RESP(const TS_RESP *a, unsigned char **out) |
| 626 | { | 664 | { |
| 627 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_RESP_it); | 665 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &TS_RESP_it); |
| 628 | } | 666 | } |
| 667 | LCRYPTO_ALIAS(i2d_TS_RESP); | ||
| 629 | 668 | ||
| 630 | TS_RESP * | 669 | TS_RESP * |
| 631 | TS_RESP_new(void) | 670 | TS_RESP_new(void) |
| 632 | { | 671 | { |
| 633 | return (TS_RESP *)ASN1_item_new(&TS_RESP_it); | 672 | return (TS_RESP *)ASN1_item_new(&TS_RESP_it); |
| 634 | } | 673 | } |
| 674 | LCRYPTO_ALIAS(TS_RESP_new); | ||
| 635 | 675 | ||
| 636 | void | 676 | void |
| 637 | TS_RESP_free(TS_RESP *a) | 677 | TS_RESP_free(TS_RESP *a) |
| 638 | { | 678 | { |
| 639 | ASN1_item_free((ASN1_VALUE *)a, &TS_RESP_it); | 679 | ASN1_item_free((ASN1_VALUE *)a, &TS_RESP_it); |
| 640 | } | 680 | } |
| 681 | LCRYPTO_ALIAS(TS_RESP_free); | ||
| 641 | 682 | ||
| 642 | TS_RESP * | 683 | TS_RESP * |
| 643 | TS_RESP_dup(TS_RESP *x) | 684 | TS_RESP_dup(TS_RESP *x) |
| 644 | { | 685 | { |
| 645 | return ASN1_item_dup(&TS_RESP_it, x); | 686 | return ASN1_item_dup(&TS_RESP_it, x); |
| 646 | } | 687 | } |
| 688 | LCRYPTO_ALIAS(TS_RESP_dup); | ||
| 647 | 689 | ||
| 648 | #ifndef OPENSSL_NO_BIO | 690 | #ifndef OPENSSL_NO_BIO |
| 649 | TS_RESP * | 691 | TS_RESP * |
| @@ -651,12 +693,14 @@ d2i_TS_RESP_bio(BIO *bp, TS_RESP **a) | |||
| 651 | { | 693 | { |
| 652 | return ASN1_item_d2i_bio(&TS_RESP_it, bp, a); | 694 | return ASN1_item_d2i_bio(&TS_RESP_it, bp, a); |
| 653 | } | 695 | } |
| 696 | LCRYPTO_ALIAS(d2i_TS_RESP_bio); | ||
| 654 | 697 | ||
| 655 | int | 698 | int |
| 656 | i2d_TS_RESP_bio(BIO *bp, TS_RESP *a) | 699 | i2d_TS_RESP_bio(BIO *bp, TS_RESP *a) |
| 657 | { | 700 | { |
| 658 | return ASN1_item_i2d_bio(&TS_RESP_it, bp, a); | 701 | return ASN1_item_i2d_bio(&TS_RESP_it, bp, a); |
| 659 | } | 702 | } |
| 703 | LCRYPTO_ALIAS(i2d_TS_RESP_bio); | ||
| 660 | #endif | 704 | #endif |
| 661 | 705 | ||
| 662 | TS_RESP * | 706 | TS_RESP * |
| @@ -664,12 +708,14 @@ d2i_TS_RESP_fp(FILE *fp, TS_RESP **a) | |||
| 664 | { | 708 | { |
| 665 | return ASN1_item_d2i_fp(&TS_RESP_it, fp, a); | 709 | return ASN1_item_d2i_fp(&TS_RESP_it, fp, a); |
| 666 | } | 710 | } |
| 711 | LCRYPTO_ALIAS(d2i_TS_RESP_fp); | ||
| 667 | 712 | ||
| 668 | int | 713 | int |
| 669 | i2d_TS_RESP_fp(FILE *fp, TS_RESP *a) | 714 | i2d_TS_RESP_fp(FILE *fp, TS_RESP *a) |
| 670 | { | 715 | { |
| 671 | return ASN1_item_i2d_fp(&TS_RESP_it, fp, a); | 716 | return ASN1_item_i2d_fp(&TS_RESP_it, fp, a); |
| 672 | } | 717 | } |
| 718 | LCRYPTO_ALIAS(i2d_TS_RESP_fp); | ||
| 673 | 719 | ||
| 674 | static const ASN1_TEMPLATE ESS_ISSUER_SERIAL_seq_tt[] = { | 720 | static const ASN1_TEMPLATE ESS_ISSUER_SERIAL_seq_tt[] = { |
| 675 | { | 721 | { |
| @@ -705,30 +751,35 @@ d2i_ESS_ISSUER_SERIAL(ESS_ISSUER_SERIAL **a, const unsigned char **in, long len) | |||
| 705 | return (ESS_ISSUER_SERIAL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 751 | return (ESS_ISSUER_SERIAL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 706 | &ESS_ISSUER_SERIAL_it); | 752 | &ESS_ISSUER_SERIAL_it); |
| 707 | } | 753 | } |
| 754 | LCRYPTO_ALIAS(d2i_ESS_ISSUER_SERIAL); | ||
| 708 | 755 | ||
| 709 | int | 756 | int |
| 710 | i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a, unsigned char **out) | 757 | i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a, unsigned char **out) |
| 711 | { | 758 | { |
| 712 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ESS_ISSUER_SERIAL_it); | 759 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ESS_ISSUER_SERIAL_it); |
| 713 | } | 760 | } |
| 761 | LCRYPTO_ALIAS(i2d_ESS_ISSUER_SERIAL); | ||
| 714 | 762 | ||
| 715 | ESS_ISSUER_SERIAL * | 763 | ESS_ISSUER_SERIAL * |
| 716 | ESS_ISSUER_SERIAL_new(void) | 764 | ESS_ISSUER_SERIAL_new(void) |
| 717 | { | 765 | { |
| 718 | return (ESS_ISSUER_SERIAL *)ASN1_item_new(&ESS_ISSUER_SERIAL_it); | 766 | return (ESS_ISSUER_SERIAL *)ASN1_item_new(&ESS_ISSUER_SERIAL_it); |
| 719 | } | 767 | } |
| 768 | LCRYPTO_ALIAS(ESS_ISSUER_SERIAL_new); | ||
| 720 | 769 | ||
| 721 | void | 770 | void |
| 722 | ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a) | 771 | ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a) |
| 723 | { | 772 | { |
| 724 | ASN1_item_free((ASN1_VALUE *)a, &ESS_ISSUER_SERIAL_it); | 773 | ASN1_item_free((ASN1_VALUE *)a, &ESS_ISSUER_SERIAL_it); |
| 725 | } | 774 | } |
| 775 | LCRYPTO_ALIAS(ESS_ISSUER_SERIAL_free); | ||
| 726 | 776 | ||
| 727 | ESS_ISSUER_SERIAL * | 777 | ESS_ISSUER_SERIAL * |
| 728 | ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *x) | 778 | ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *x) |
| 729 | { | 779 | { |
| 730 | return ASN1_item_dup(&ESS_ISSUER_SERIAL_it, x); | 780 | return ASN1_item_dup(&ESS_ISSUER_SERIAL_it, x); |
| 731 | } | 781 | } |
| 782 | LCRYPTO_ALIAS(ESS_ISSUER_SERIAL_dup); | ||
| 732 | 783 | ||
| 733 | static const ASN1_TEMPLATE ESS_CERT_ID_seq_tt[] = { | 784 | static const ASN1_TEMPLATE ESS_CERT_ID_seq_tt[] = { |
| 734 | { | 785 | { |
| @@ -764,30 +815,35 @@ d2i_ESS_CERT_ID(ESS_CERT_ID **a, const unsigned char **in, long len) | |||
| 764 | return (ESS_CERT_ID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 815 | return (ESS_CERT_ID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 765 | &ESS_CERT_ID_it); | 816 | &ESS_CERT_ID_it); |
| 766 | } | 817 | } |
| 818 | LCRYPTO_ALIAS(d2i_ESS_CERT_ID); | ||
| 767 | 819 | ||
| 768 | int | 820 | int |
| 769 | i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **out) | 821 | i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **out) |
| 770 | { | 822 | { |
| 771 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ESS_CERT_ID_it); | 823 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ESS_CERT_ID_it); |
| 772 | } | 824 | } |
| 825 | LCRYPTO_ALIAS(i2d_ESS_CERT_ID); | ||
| 773 | 826 | ||
| 774 | ESS_CERT_ID * | 827 | ESS_CERT_ID * |
| 775 | ESS_CERT_ID_new(void) | 828 | ESS_CERT_ID_new(void) |
| 776 | { | 829 | { |
| 777 | return (ESS_CERT_ID *)ASN1_item_new(&ESS_CERT_ID_it); | 830 | return (ESS_CERT_ID *)ASN1_item_new(&ESS_CERT_ID_it); |
| 778 | } | 831 | } |
| 832 | LCRYPTO_ALIAS(ESS_CERT_ID_new); | ||
| 779 | 833 | ||
| 780 | void | 834 | void |
| 781 | ESS_CERT_ID_free(ESS_CERT_ID *a) | 835 | ESS_CERT_ID_free(ESS_CERT_ID *a) |
| 782 | { | 836 | { |
| 783 | ASN1_item_free((ASN1_VALUE *)a, &ESS_CERT_ID_it); | 837 | ASN1_item_free((ASN1_VALUE *)a, &ESS_CERT_ID_it); |
| 784 | } | 838 | } |
| 839 | LCRYPTO_ALIAS(ESS_CERT_ID_free); | ||
| 785 | 840 | ||
| 786 | ESS_CERT_ID * | 841 | ESS_CERT_ID * |
| 787 | ESS_CERT_ID_dup(ESS_CERT_ID *x) | 842 | ESS_CERT_ID_dup(ESS_CERT_ID *x) |
| 788 | { | 843 | { |
| 789 | return ASN1_item_dup(&ESS_CERT_ID_it, x); | 844 | return ASN1_item_dup(&ESS_CERT_ID_it, x); |
| 790 | } | 845 | } |
| 846 | LCRYPTO_ALIAS(ESS_CERT_ID_dup); | ||
| 791 | 847 | ||
| 792 | static const ASN1_TEMPLATE ESS_SIGNING_CERT_seq_tt[] = { | 848 | static const ASN1_TEMPLATE ESS_SIGNING_CERT_seq_tt[] = { |
| 793 | { | 849 | { |
| @@ -823,30 +879,35 @@ d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a, const unsigned char **in, long len) | |||
| 823 | return (ESS_SIGNING_CERT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 879 | return (ESS_SIGNING_CERT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 824 | &ESS_SIGNING_CERT_it); | 880 | &ESS_SIGNING_CERT_it); |
| 825 | } | 881 | } |
| 882 | LCRYPTO_ALIAS(d2i_ESS_SIGNING_CERT); | ||
| 826 | 883 | ||
| 827 | int | 884 | int |
| 828 | i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, unsigned char **out) | 885 | i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, unsigned char **out) |
| 829 | { | 886 | { |
| 830 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ESS_SIGNING_CERT_it); | 887 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ESS_SIGNING_CERT_it); |
| 831 | } | 888 | } |
| 889 | LCRYPTO_ALIAS(i2d_ESS_SIGNING_CERT); | ||
| 832 | 890 | ||
| 833 | ESS_SIGNING_CERT * | 891 | ESS_SIGNING_CERT * |
| 834 | ESS_SIGNING_CERT_new(void) | 892 | ESS_SIGNING_CERT_new(void) |
| 835 | { | 893 | { |
| 836 | return (ESS_SIGNING_CERT *)ASN1_item_new(&ESS_SIGNING_CERT_it); | 894 | return (ESS_SIGNING_CERT *)ASN1_item_new(&ESS_SIGNING_CERT_it); |
| 837 | } | 895 | } |
| 896 | LCRYPTO_ALIAS(ESS_SIGNING_CERT_new); | ||
| 838 | 897 | ||
| 839 | void | 898 | void |
| 840 | ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a) | 899 | ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a) |
| 841 | { | 900 | { |
| 842 | ASN1_item_free((ASN1_VALUE *)a, &ESS_SIGNING_CERT_it); | 901 | ASN1_item_free((ASN1_VALUE *)a, &ESS_SIGNING_CERT_it); |
| 843 | } | 902 | } |
| 903 | LCRYPTO_ALIAS(ESS_SIGNING_CERT_free); | ||
| 844 | 904 | ||
| 845 | ESS_SIGNING_CERT * | 905 | ESS_SIGNING_CERT * |
| 846 | ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *x) | 906 | ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *x) |
| 847 | { | 907 | { |
| 848 | return ASN1_item_dup(&ESS_SIGNING_CERT_it, x); | 908 | return ASN1_item_dup(&ESS_SIGNING_CERT_it, x); |
| 849 | } | 909 | } |
| 910 | LCRYPTO_ALIAS(ESS_SIGNING_CERT_dup); | ||
| 850 | 911 | ||
| 851 | static const ASN1_TEMPLATE ESS_CERT_ID_V2_seq_tt[] = { | 912 | static const ASN1_TEMPLATE ESS_CERT_ID_V2_seq_tt[] = { |
| 852 | { | 913 | { |
| @@ -1013,3 +1074,4 @@ PKCS7_to_TS_TST_INFO(PKCS7 *token) | |||
| 1013 | p = tst_info_der->data; | 1074 | p = tst_info_der->data; |
| 1014 | return d2i_TS_TST_INFO(NULL, &p, tst_info_der->length); | 1075 | return d2i_TS_TST_INFO(NULL, &p, tst_info_der->length); |
| 1015 | } | 1076 | } |
| 1077 | LCRYPTO_ALIAS(PKCS7_to_TS_TST_INFO); | ||
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); | ||
diff --git a/src/lib/libcrypto/ts/ts_err.c b/src/lib/libcrypto/ts/ts_err.c index ddd532a6a7..bb8209a85c 100644 --- a/src/lib/libcrypto/ts/ts_err.c +++ b/src/lib/libcrypto/ts/ts_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_err.c,v 1.6 2022/07/12 14:42:50 kn Exp $ */ | 1 | /* $OpenBSD: ts_err.c,v 1.7 2023/07/07 07:25:21 beck Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -121,3 +121,4 @@ ERR_load_TS_strings(void) | |||
| 121 | } | 121 | } |
| 122 | #endif | 122 | #endif |
| 123 | } | 123 | } |
| 124 | LCRYPTO_ALIAS(ERR_load_TS_strings); | ||
diff --git a/src/lib/libcrypto/ts/ts_lib.c b/src/lib/libcrypto/ts/ts_lib.c index ae715fb6c9..1e94922aa1 100644 --- a/src/lib/libcrypto/ts/ts_lib.c +++ b/src/lib/libcrypto/ts/ts_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_lib.c,v 1.13 2022/11/26 16:08:54 tb Exp $ */ | 1 | /* $OpenBSD: ts_lib.c,v 1.14 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 | */ |
| @@ -89,6 +89,7 @@ TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num) | |||
| 89 | 89 | ||
| 90 | return result; | 90 | return result; |
| 91 | } | 91 | } |
| 92 | LCRYPTO_ALIAS(TS_ASN1_INTEGER_print_bio); | ||
| 92 | 93 | ||
| 93 | int | 94 | int |
| 94 | TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj) | 95 | TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj) |
| @@ -102,6 +103,7 @@ TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj) | |||
| 102 | BIO_write(bio, "\n", 1); | 103 | BIO_write(bio, "\n", 1); |
| 103 | return 1; | 104 | return 1; |
| 104 | } | 105 | } |
| 106 | LCRYPTO_ALIAS(TS_OBJ_print_bio); | ||
| 105 | 107 | ||
| 106 | int | 108 | int |
| 107 | TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions) | 109 | TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions) |
| @@ -127,6 +129,7 @@ TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions) | |||
| 127 | 129 | ||
| 128 | return 1; | 130 | return 1; |
| 129 | } | 131 | } |
| 132 | LCRYPTO_ALIAS(TS_ext_print_bio); | ||
| 130 | 133 | ||
| 131 | int | 134 | int |
| 132 | TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg) | 135 | TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg) |
| @@ -136,6 +139,7 @@ TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg) | |||
| 136 | return BIO_printf(bio, "Hash Algorithm: %s\n", | 139 | return BIO_printf(bio, "Hash Algorithm: %s\n", |
| 137 | (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i)); | 140 | (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i)); |
| 138 | } | 141 | } |
| 142 | LCRYPTO_ALIAS(TS_X509_ALGOR_print_bio); | ||
| 139 | 143 | ||
| 140 | int | 144 | int |
| 141 | TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a) | 145 | TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a) |
| @@ -151,3 +155,4 @@ TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a) | |||
| 151 | 155 | ||
| 152 | return 1; | 156 | return 1; |
| 153 | } | 157 | } |
| 158 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_print_bio); | ||
diff --git a/src/lib/libcrypto/ts/ts_req_print.c b/src/lib/libcrypto/ts/ts_req_print.c index 64a8133a58..ddcdda97a3 100644 --- a/src/lib/libcrypto/ts/ts_req_print.c +++ b/src/lib/libcrypto/ts/ts_req_print.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_req_print.c,v 1.4 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: ts_req_print.c,v 1.5 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 | */ |
| @@ -102,3 +102,4 @@ TS_REQ_print_bio(BIO *bio, TS_REQ *a) | |||
| 102 | 102 | ||
| 103 | return 1; | 103 | return 1; |
| 104 | } | 104 | } |
| 105 | LCRYPTO_ALIAS(TS_REQ_print_bio); | ||
diff --git a/src/lib/libcrypto/ts/ts_req_utils.c b/src/lib/libcrypto/ts/ts_req_utils.c index 8d9d6f3e61..f331219373 100644 --- a/src/lib/libcrypto/ts/ts_req_utils.c +++ b/src/lib/libcrypto/ts/ts_req_utils.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_req_utils.c,v 1.7 2022/07/24 08:16:47 tb Exp $ */ | 1 | /* $OpenBSD: ts_req_utils.c,v 1.8 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 | */ |
| @@ -70,12 +70,14 @@ TS_REQ_set_version(TS_REQ *a, long version) | |||
| 70 | { | 70 | { |
| 71 | return ASN1_INTEGER_set(a->version, version); | 71 | return ASN1_INTEGER_set(a->version, version); |
| 72 | } | 72 | } |
| 73 | LCRYPTO_ALIAS(TS_REQ_set_version); | ||
| 73 | 74 | ||
| 74 | long | 75 | long |
| 75 | TS_REQ_get_version(const TS_REQ *a) | 76 | TS_REQ_get_version(const TS_REQ *a) |
| 76 | { | 77 | { |
| 77 | return ASN1_INTEGER_get(a->version); | 78 | return ASN1_INTEGER_get(a->version); |
| 78 | } | 79 | } |
| 80 | LCRYPTO_ALIAS(TS_REQ_get_version); | ||
| 79 | 81 | ||
| 80 | int | 82 | int |
| 81 | TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint) | 83 | TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint) |
| @@ -93,12 +95,14 @@ TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint) | |||
| 93 | a->msg_imprint = new_msg_imprint; | 95 | a->msg_imprint = new_msg_imprint; |
| 94 | return 1; | 96 | return 1; |
| 95 | } | 97 | } |
| 98 | LCRYPTO_ALIAS(TS_REQ_set_msg_imprint); | ||
| 96 | 99 | ||
| 97 | TS_MSG_IMPRINT * | 100 | TS_MSG_IMPRINT * |
| 98 | TS_REQ_get_msg_imprint(TS_REQ *a) | 101 | TS_REQ_get_msg_imprint(TS_REQ *a) |
| 99 | { | 102 | { |
| 100 | return a->msg_imprint; | 103 | return a->msg_imprint; |
| 101 | } | 104 | } |
| 105 | LCRYPTO_ALIAS(TS_REQ_get_msg_imprint); | ||
| 102 | 106 | ||
| 103 | int | 107 | int |
| 104 | TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg) | 108 | TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg) |
| @@ -116,24 +120,28 @@ TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg) | |||
| 116 | a->hash_algo = new_alg; | 120 | a->hash_algo = new_alg; |
| 117 | return 1; | 121 | return 1; |
| 118 | } | 122 | } |
| 123 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_set_algo); | ||
| 119 | 124 | ||
| 120 | X509_ALGOR * | 125 | X509_ALGOR * |
| 121 | TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a) | 126 | TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a) |
| 122 | { | 127 | { |
| 123 | return a->hash_algo; | 128 | return a->hash_algo; |
| 124 | } | 129 | } |
| 130 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_get_algo); | ||
| 125 | 131 | ||
| 126 | int | 132 | int |
| 127 | TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len) | 133 | TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len) |
| 128 | { | 134 | { |
| 129 | return ASN1_OCTET_STRING_set(a->hashed_msg, d, len); | 135 | return ASN1_OCTET_STRING_set(a->hashed_msg, d, len); |
| 130 | } | 136 | } |
| 137 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_set_msg); | ||
| 131 | 138 | ||
| 132 | ASN1_OCTET_STRING * | 139 | ASN1_OCTET_STRING * |
| 133 | TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a) | 140 | TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a) |
| 134 | { | 141 | { |
| 135 | return a->hashed_msg; | 142 | return a->hashed_msg; |
| 136 | } | 143 | } |
| 144 | LCRYPTO_ALIAS(TS_MSG_IMPRINT_get_msg); | ||
| 137 | 145 | ||
| 138 | int | 146 | int |
| 139 | TS_REQ_set_policy_id(TS_REQ *a, const ASN1_OBJECT *policy) | 147 | TS_REQ_set_policy_id(TS_REQ *a, const ASN1_OBJECT *policy) |
| @@ -151,12 +159,14 @@ TS_REQ_set_policy_id(TS_REQ *a, const ASN1_OBJECT *policy) | |||
| 151 | a->policy_id = new_policy; | 159 | a->policy_id = new_policy; |
| 152 | return 1; | 160 | return 1; |
| 153 | } | 161 | } |
| 162 | LCRYPTO_ALIAS(TS_REQ_set_policy_id); | ||
| 154 | 163 | ||
| 155 | ASN1_OBJECT * | 164 | ASN1_OBJECT * |
| 156 | TS_REQ_get_policy_id(TS_REQ *a) | 165 | TS_REQ_get_policy_id(TS_REQ *a) |
| 157 | { | 166 | { |
| 158 | return a->policy_id; | 167 | return a->policy_id; |
| 159 | } | 168 | } |
| 169 | LCRYPTO_ALIAS(TS_REQ_get_policy_id); | ||
| 160 | 170 | ||
| 161 | int | 171 | int |
| 162 | TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce) | 172 | TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce) |
| @@ -174,12 +184,14 @@ TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce) | |||
| 174 | a->nonce = new_nonce; | 184 | a->nonce = new_nonce; |
| 175 | return 1; | 185 | return 1; |
| 176 | } | 186 | } |
| 187 | LCRYPTO_ALIAS(TS_REQ_set_nonce); | ||
| 177 | 188 | ||
| 178 | const ASN1_INTEGER * | 189 | const ASN1_INTEGER * |
| 179 | TS_REQ_get_nonce(const TS_REQ *a) | 190 | TS_REQ_get_nonce(const TS_REQ *a) |
| 180 | { | 191 | { |
| 181 | return a->nonce; | 192 | return a->nonce; |
| 182 | } | 193 | } |
| 194 | LCRYPTO_ALIAS(TS_REQ_get_nonce); | ||
| 183 | 195 | ||
| 184 | int | 196 | int |
| 185 | TS_REQ_set_cert_req(TS_REQ *a, int cert_req) | 197 | TS_REQ_set_cert_req(TS_REQ *a, int cert_req) |
| @@ -187,12 +199,14 @@ TS_REQ_set_cert_req(TS_REQ *a, int cert_req) | |||
| 187 | a->cert_req = cert_req ? 0xFF : 0x00; | 199 | a->cert_req = cert_req ? 0xFF : 0x00; |
| 188 | return 1; | 200 | return 1; |
| 189 | } | 201 | } |
| 202 | LCRYPTO_ALIAS(TS_REQ_set_cert_req); | ||
| 190 | 203 | ||
| 191 | int | 204 | int |
| 192 | TS_REQ_get_cert_req(const TS_REQ *a) | 205 | TS_REQ_get_cert_req(const TS_REQ *a) |
| 193 | { | 206 | { |
| 194 | return a->cert_req ? 1 : 0; | 207 | return a->cert_req ? 1 : 0; |
| 195 | } | 208 | } |
| 209 | LCRYPTO_ALIAS(TS_REQ_get_cert_req); | ||
| 196 | 210 | ||
| 197 | STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a) | 211 | STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a) |
| 198 | { | 212 | { |
| @@ -207,51 +221,60 @@ TS_REQ_ext_free(TS_REQ *a) | |||
| 207 | sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free); | 221 | sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free); |
| 208 | a->extensions = NULL; | 222 | a->extensions = NULL; |
| 209 | } | 223 | } |
| 224 | LCRYPTO_ALIAS(TS_REQ_ext_free); | ||
| 210 | 225 | ||
| 211 | int | 226 | int |
| 212 | TS_REQ_get_ext_count(TS_REQ *a) | 227 | TS_REQ_get_ext_count(TS_REQ *a) |
| 213 | { | 228 | { |
| 214 | return X509v3_get_ext_count(a->extensions); | 229 | return X509v3_get_ext_count(a->extensions); |
| 215 | } | 230 | } |
| 231 | LCRYPTO_ALIAS(TS_REQ_get_ext_count); | ||
| 216 | 232 | ||
| 217 | int | 233 | int |
| 218 | TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos) | 234 | TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos) |
| 219 | { | 235 | { |
| 220 | return X509v3_get_ext_by_NID(a->extensions, nid, lastpos); | 236 | return X509v3_get_ext_by_NID(a->extensions, nid, lastpos); |
| 221 | } | 237 | } |
| 238 | LCRYPTO_ALIAS(TS_REQ_get_ext_by_NID); | ||
| 222 | 239 | ||
| 223 | int | 240 | int |
| 224 | TS_REQ_get_ext_by_OBJ(TS_REQ *a, const ASN1_OBJECT *obj, int lastpos) | 241 | TS_REQ_get_ext_by_OBJ(TS_REQ *a, const ASN1_OBJECT *obj, int lastpos) |
| 225 | { | 242 | { |
| 226 | return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos); | 243 | return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos); |
| 227 | } | 244 | } |
| 245 | LCRYPTO_ALIAS(TS_REQ_get_ext_by_OBJ); | ||
| 228 | 246 | ||
| 229 | int | 247 | int |
| 230 | TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos) | 248 | TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos) |
| 231 | { | 249 | { |
| 232 | return X509v3_get_ext_by_critical(a->extensions, crit, lastpos); | 250 | return X509v3_get_ext_by_critical(a->extensions, crit, lastpos); |
| 233 | } | 251 | } |
| 252 | LCRYPTO_ALIAS(TS_REQ_get_ext_by_critical); | ||
| 234 | 253 | ||
| 235 | X509_EXTENSION * | 254 | X509_EXTENSION * |
| 236 | TS_REQ_get_ext(TS_REQ *a, int loc) | 255 | TS_REQ_get_ext(TS_REQ *a, int loc) |
| 237 | { | 256 | { |
| 238 | return X509v3_get_ext(a->extensions, loc); | 257 | return X509v3_get_ext(a->extensions, loc); |
| 239 | } | 258 | } |
| 259 | LCRYPTO_ALIAS(TS_REQ_get_ext); | ||
| 240 | 260 | ||
| 241 | X509_EXTENSION * | 261 | X509_EXTENSION * |
| 242 | TS_REQ_delete_ext(TS_REQ *a, int loc) | 262 | TS_REQ_delete_ext(TS_REQ *a, int loc) |
| 243 | { | 263 | { |
| 244 | return X509v3_delete_ext(a->extensions, loc); | 264 | return X509v3_delete_ext(a->extensions, loc); |
| 245 | } | 265 | } |
| 266 | LCRYPTO_ALIAS(TS_REQ_delete_ext); | ||
| 246 | 267 | ||
| 247 | int | 268 | int |
| 248 | TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc) | 269 | TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc) |
| 249 | { | 270 | { |
| 250 | return X509v3_add_ext(&a->extensions, ex, loc) != NULL; | 271 | return X509v3_add_ext(&a->extensions, ex, loc) != NULL; |
| 251 | } | 272 | } |
| 273 | LCRYPTO_ALIAS(TS_REQ_add_ext); | ||
| 252 | 274 | ||
| 253 | void * | 275 | void * |
| 254 | TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx) | 276 | TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx) |
| 255 | { | 277 | { |
| 256 | return X509V3_get_d2i(a->extensions, nid, crit, idx); | 278 | return X509V3_get_d2i(a->extensions, nid, crit, idx); |
| 257 | } | 279 | } |
| 280 | LCRYPTO_ALIAS(TS_REQ_get_ext_d2i); | ||
diff --git a/src/lib/libcrypto/ts/ts_rsp_print.c b/src/lib/libcrypto/ts/ts_rsp_print.c index cfff955cd6..c65d226686 100644 --- a/src/lib/libcrypto/ts/ts_rsp_print.c +++ b/src/lib/libcrypto/ts/ts_rsp_print.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_rsp_print.c,v 1.6 2022/07/24 08:16:47 tb Exp $ */ | 1 | /* $OpenBSD: ts_rsp_print.c,v 1.7 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 | */ |
| @@ -95,6 +95,7 @@ TS_RESP_print_bio(BIO *bio, TS_RESP *a) | |||
| 95 | 95 | ||
| 96 | return 1; | 96 | return 1; |
| 97 | } | 97 | } |
| 98 | LCRYPTO_ALIAS(TS_RESP_print_bio); | ||
| 98 | 99 | ||
| 99 | int | 100 | int |
| 100 | TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a) | 101 | TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a) |
| @@ -177,6 +178,7 @@ TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a) | |||
| 177 | 178 | ||
| 178 | return 1; | 179 | return 1; |
| 179 | } | 180 | } |
| 181 | LCRYPTO_ALIAS(TS_STATUS_INFO_print_bio); | ||
| 180 | 182 | ||
| 181 | static int | 183 | static int |
| 182 | TS_status_map_print(BIO *bio, struct status_map_st *a, ASN1_BIT_STRING *v) | 184 | TS_status_map_print(BIO *bio, struct status_map_st *a, ASN1_BIT_STRING *v) |
| @@ -275,6 +277,7 @@ TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a) | |||
| 275 | 277 | ||
| 276 | return 1; | 278 | return 1; |
| 277 | } | 279 | } |
| 280 | LCRYPTO_ALIAS(TS_TST_INFO_print_bio); | ||
| 278 | 281 | ||
| 279 | static int | 282 | static int |
| 280 | TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy) | 283 | TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy) |
diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c index 7ebadb1049..84a6993106 100644 --- a/src/lib/libcrypto/ts/ts_rsp_sign.c +++ b/src/lib/libcrypto/ts/ts_rsp_sign.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_rsp_sign.c,v 1.30 2022/11/26 16:08:54 tb Exp $ */ | 1 | /* $OpenBSD: ts_rsp_sign.c,v 1.31 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 | */ |
| @@ -149,6 +149,7 @@ TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data) | |||
| 149 | ctx->time_cb = cb; | 149 | ctx->time_cb = cb; |
| 150 | ctx->time_cb_data = data; | 150 | ctx->time_cb_data = data; |
| 151 | } | 151 | } |
| 152 | LCRYPTO_ALIAS(TS_RESP_CTX_set_time_cb); | ||
| 152 | 153 | ||
| 153 | /* TS_RESP_CTX management functions. */ | 154 | /* TS_RESP_CTX management functions. */ |
| 154 | 155 | ||
| @@ -169,6 +170,7 @@ TS_RESP_CTX_new(void) | |||
| 169 | 170 | ||
| 170 | return ctx; | 171 | return ctx; |
| 171 | } | 172 | } |
| 173 | LCRYPTO_ALIAS(TS_RESP_CTX_new); | ||
| 172 | 174 | ||
| 173 | void | 175 | void |
| 174 | TS_RESP_CTX_free(TS_RESP_CTX *ctx) | 176 | TS_RESP_CTX_free(TS_RESP_CTX *ctx) |
| @@ -187,6 +189,7 @@ TS_RESP_CTX_free(TS_RESP_CTX *ctx) | |||
| 187 | ASN1_INTEGER_free(ctx->micros); | 189 | ASN1_INTEGER_free(ctx->micros); |
| 188 | free(ctx); | 190 | free(ctx); |
| 189 | } | 191 | } |
| 192 | LCRYPTO_ALIAS(TS_RESP_CTX_free); | ||
| 190 | 193 | ||
| 191 | int | 194 | int |
| 192 | TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer) | 195 | TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer) |
| @@ -200,6 +203,7 @@ TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer) | |||
| 200 | CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509); | 203 | CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509); |
| 201 | return 1; | 204 | return 1; |
| 202 | } | 205 | } |
| 206 | LCRYPTO_ALIAS(TS_RESP_CTX_set_signer_cert); | ||
| 203 | 207 | ||
| 204 | int | 208 | int |
| 205 | TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key) | 209 | TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key) |
| @@ -210,6 +214,7 @@ TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key) | |||
| 210 | 214 | ||
| 211 | return 1; | 215 | return 1; |
| 212 | } | 216 | } |
| 217 | LCRYPTO_ALIAS(TS_RESP_CTX_set_signer_key); | ||
| 213 | 218 | ||
| 214 | int | 219 | int |
| 215 | TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy) | 220 | TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy) |
| @@ -224,6 +229,7 @@ err: | |||
| 224 | TSerror(ERR_R_MALLOC_FAILURE); | 229 | TSerror(ERR_R_MALLOC_FAILURE); |
| 225 | return 0; | 230 | return 0; |
| 226 | } | 231 | } |
| 232 | LCRYPTO_ALIAS(TS_RESP_CTX_set_def_policy); | ||
| 227 | 233 | ||
| 228 | int | 234 | int |
| 229 | TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs) | 235 | TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs) |
| @@ -247,6 +253,7 @@ TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs) | |||
| 247 | 253 | ||
| 248 | return 1; | 254 | return 1; |
| 249 | } | 255 | } |
| 256 | LCRYPTO_ALIAS(TS_RESP_CTX_set_certs); | ||
| 250 | 257 | ||
| 251 | int | 258 | int |
| 252 | TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy) | 259 | TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy) |
| @@ -268,6 +275,7 @@ err: | |||
| 268 | ASN1_OBJECT_free(copy); | 275 | ASN1_OBJECT_free(copy); |
| 269 | return 0; | 276 | return 0; |
| 270 | } | 277 | } |
| 278 | LCRYPTO_ALIAS(TS_RESP_CTX_add_policy); | ||
| 271 | 279 | ||
| 272 | int | 280 | int |
| 273 | TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md) | 281 | TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md) |
| @@ -285,6 +293,7 @@ err: | |||
| 285 | TSerror(ERR_R_MALLOC_FAILURE); | 293 | TSerror(ERR_R_MALLOC_FAILURE); |
| 286 | return 0; | 294 | return 0; |
| 287 | } | 295 | } |
| 296 | LCRYPTO_ALIAS(TS_RESP_CTX_add_md); | ||
| 288 | 297 | ||
| 289 | #define TS_RESP_CTX_accuracy_free(ctx) \ | 298 | #define TS_RESP_CTX_accuracy_free(ctx) \ |
| 290 | ASN1_INTEGER_free(ctx->seconds); \ | 299 | ASN1_INTEGER_free(ctx->seconds); \ |
| @@ -315,12 +324,14 @@ err: | |||
| 315 | TSerror(ERR_R_MALLOC_FAILURE); | 324 | TSerror(ERR_R_MALLOC_FAILURE); |
| 316 | return 0; | 325 | return 0; |
| 317 | } | 326 | } |
| 327 | LCRYPTO_ALIAS(TS_RESP_CTX_set_accuracy); | ||
| 318 | 328 | ||
| 319 | void | 329 | void |
| 320 | TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags) | 330 | TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags) |
| 321 | { | 331 | { |
| 322 | ctx->flags |= flags; | 332 | ctx->flags |= flags; |
| 323 | } | 333 | } |
| 334 | LCRYPTO_ALIAS(TS_RESP_CTX_add_flags); | ||
| 324 | 335 | ||
| 325 | void | 336 | void |
| 326 | TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data) | 337 | TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data) |
| @@ -328,6 +339,7 @@ TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data) | |||
| 328 | ctx->serial_cb = cb; | 339 | ctx->serial_cb = cb; |
| 329 | ctx->serial_cb_data = data; | 340 | ctx->serial_cb_data = data; |
| 330 | } | 341 | } |
| 342 | LCRYPTO_ALIAS(TS_RESP_CTX_set_serial_cb); | ||
| 331 | 343 | ||
| 332 | void | 344 | void |
| 333 | TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx, TS_extension_cb cb, void *data) | 345 | TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx, TS_extension_cb cb, void *data) |
| @@ -335,6 +347,7 @@ TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx, TS_extension_cb cb, void *data) | |||
| 335 | ctx->extension_cb = cb; | 347 | ctx->extension_cb = cb; |
| 336 | ctx->extension_cb_data = data; | 348 | ctx->extension_cb_data = data; |
| 337 | } | 349 | } |
| 350 | LCRYPTO_ALIAS(TS_RESP_CTX_set_extension_cb); | ||
| 338 | 351 | ||
| 339 | int | 352 | int |
| 340 | TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx, int status, const char *text) | 353 | TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx, int status, const char *text) |
| @@ -368,6 +381,7 @@ err: | |||
| 368 | ASN1_UTF8STRING_free(utf8_text); | 381 | ASN1_UTF8STRING_free(utf8_text); |
| 369 | return ret; | 382 | return ret; |
| 370 | } | 383 | } |
| 384 | LCRYPTO_ALIAS(TS_RESP_CTX_set_status_info); | ||
| 371 | 385 | ||
| 372 | int | 386 | int |
| 373 | TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx, int status, const char *text) | 387 | TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx, int status, const char *text) |
| @@ -381,6 +395,7 @@ TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx, int status, const char *text) | |||
| 381 | } | 395 | } |
| 382 | return ret; | 396 | return ret; |
| 383 | } | 397 | } |
| 398 | LCRYPTO_ALIAS(TS_RESP_CTX_set_status_info_cond); | ||
| 384 | 399 | ||
| 385 | int | 400 | int |
| 386 | TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure) | 401 | TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure) |
| @@ -397,18 +412,21 @@ err: | |||
| 397 | TSerror(ERR_R_MALLOC_FAILURE); | 412 | TSerror(ERR_R_MALLOC_FAILURE); |
| 398 | return 0; | 413 | return 0; |
| 399 | } | 414 | } |
| 415 | LCRYPTO_ALIAS(TS_RESP_CTX_add_failure_info); | ||
| 400 | 416 | ||
| 401 | TS_REQ * | 417 | TS_REQ * |
| 402 | TS_RESP_CTX_get_request(TS_RESP_CTX *ctx) | 418 | TS_RESP_CTX_get_request(TS_RESP_CTX *ctx) |
| 403 | { | 419 | { |
| 404 | return ctx->request; | 420 | return ctx->request; |
| 405 | } | 421 | } |
| 422 | LCRYPTO_ALIAS(TS_RESP_CTX_get_request); | ||
| 406 | 423 | ||
| 407 | TS_TST_INFO * | 424 | TS_TST_INFO * |
| 408 | TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx) | 425 | TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx) |
| 409 | { | 426 | { |
| 410 | return ctx->tst_info; | 427 | return ctx->tst_info; |
| 411 | } | 428 | } |
| 429 | LCRYPTO_ALIAS(TS_RESP_CTX_get_tst_info); | ||
| 412 | 430 | ||
| 413 | int | 431 | int |
| 414 | TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx, unsigned precision) | 432 | TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx, unsigned precision) |
| @@ -418,6 +436,7 @@ TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx, unsigned precision) | |||
| 418 | ctx->clock_precision_digits = precision; | 436 | ctx->clock_precision_digits = precision; |
| 419 | return 1; | 437 | return 1; |
| 420 | } | 438 | } |
| 439 | LCRYPTO_ALIAS(TS_RESP_CTX_set_clock_precision_digits); | ||
| 421 | 440 | ||
| 422 | /* Main entry method of the response generation. */ | 441 | /* Main entry method of the response generation. */ |
| 423 | TS_RESP * | 442 | TS_RESP * |
| @@ -488,6 +507,7 @@ end: | |||
| 488 | TS_RESP_CTX_cleanup(ctx); | 507 | TS_RESP_CTX_cleanup(ctx); |
| 489 | return response; | 508 | return response; |
| 490 | } | 509 | } |
| 510 | LCRYPTO_ALIAS(TS_RESP_create_response); | ||
| 491 | 511 | ||
| 492 | /* Initializes the variable part of the context. */ | 512 | /* Initializes the variable part of the context. */ |
| 493 | static void | 513 | static void |
diff --git a/src/lib/libcrypto/ts/ts_rsp_utils.c b/src/lib/libcrypto/ts/ts_rsp_utils.c index 2e37f26fda..4449c4a94c 100644 --- a/src/lib/libcrypto/ts/ts_rsp_utils.c +++ b/src/lib/libcrypto/ts/ts_rsp_utils.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_rsp_utils.c,v 1.9 2022/07/24 19:25:36 tb Exp $ */ | 1 | /* $OpenBSD: ts_rsp_utils.c,v 1.10 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 | */ |
| @@ -84,36 +84,42 @@ TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info) | |||
| 84 | 84 | ||
| 85 | return 1; | 85 | return 1; |
| 86 | } | 86 | } |
| 87 | LCRYPTO_ALIAS(TS_RESP_set_status_info); | ||
| 87 | 88 | ||
| 88 | TS_STATUS_INFO * | 89 | TS_STATUS_INFO * |
| 89 | TS_RESP_get_status_info(TS_RESP *a) | 90 | TS_RESP_get_status_info(TS_RESP *a) |
| 90 | { | 91 | { |
| 91 | return a->status_info; | 92 | return a->status_info; |
| 92 | } | 93 | } |
| 94 | LCRYPTO_ALIAS(TS_RESP_get_status_info); | ||
| 93 | 95 | ||
| 94 | const ASN1_UTF8STRING * | 96 | const ASN1_UTF8STRING * |
| 95 | TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *si) | 97 | TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *si) |
| 96 | { | 98 | { |
| 97 | return si->failure_info; | 99 | return si->failure_info; |
| 98 | } | 100 | } |
| 101 | LCRYPTO_ALIAS(TS_STATUS_INFO_get0_failure_info); | ||
| 99 | 102 | ||
| 100 | const STACK_OF(ASN1_UTF8STRING) * | 103 | const STACK_OF(ASN1_UTF8STRING) * |
| 101 | TS_STATUS_INFO_get0_text(const TS_STATUS_INFO *si) | 104 | TS_STATUS_INFO_get0_text(const TS_STATUS_INFO *si) |
| 102 | { | 105 | { |
| 103 | return si->text; | 106 | return si->text; |
| 104 | } | 107 | } |
| 108 | LCRYPTO_ALIAS(TS_STATUS_INFO_get0_text); | ||
| 105 | 109 | ||
| 106 | const ASN1_INTEGER * | 110 | const ASN1_INTEGER * |
| 107 | TS_STATUS_INFO_get0_status(const TS_STATUS_INFO *si) | 111 | TS_STATUS_INFO_get0_status(const TS_STATUS_INFO *si) |
| 108 | { | 112 | { |
| 109 | return si->status; | 113 | return si->status; |
| 110 | } | 114 | } |
| 115 | LCRYPTO_ALIAS(TS_STATUS_INFO_get0_status); | ||
| 111 | 116 | ||
| 112 | int | 117 | int |
| 113 | TS_STATUS_INFO_set_status(TS_STATUS_INFO *si, int i) | 118 | TS_STATUS_INFO_set_status(TS_STATUS_INFO *si, int i) |
| 114 | { | 119 | { |
| 115 | return ASN1_INTEGER_set(si->status, i); | 120 | return ASN1_INTEGER_set(si->status, i); |
| 116 | } | 121 | } |
| 122 | LCRYPTO_ALIAS(TS_STATUS_INFO_set_status); | ||
| 117 | 123 | ||
| 118 | /* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */ | 124 | /* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */ |
| 119 | void | 125 | void |
| @@ -125,30 +131,35 @@ TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info) | |||
| 125 | TS_TST_INFO_free(a->tst_info); | 131 | TS_TST_INFO_free(a->tst_info); |
| 126 | a->tst_info = tst_info; | 132 | a->tst_info = tst_info; |
| 127 | } | 133 | } |
| 134 | LCRYPTO_ALIAS(TS_RESP_set_tst_info); | ||
| 128 | 135 | ||
| 129 | PKCS7 * | 136 | PKCS7 * |
| 130 | TS_RESP_get_token(TS_RESP *a) | 137 | TS_RESP_get_token(TS_RESP *a) |
| 131 | { | 138 | { |
| 132 | return a->token; | 139 | return a->token; |
| 133 | } | 140 | } |
| 141 | LCRYPTO_ALIAS(TS_RESP_get_token); | ||
| 134 | 142 | ||
| 135 | TS_TST_INFO * | 143 | TS_TST_INFO * |
| 136 | TS_RESP_get_tst_info(TS_RESP *a) | 144 | TS_RESP_get_tst_info(TS_RESP *a) |
| 137 | { | 145 | { |
| 138 | return a->tst_info; | 146 | return a->tst_info; |
| 139 | } | 147 | } |
| 148 | LCRYPTO_ALIAS(TS_RESP_get_tst_info); | ||
| 140 | 149 | ||
| 141 | int | 150 | int |
| 142 | TS_TST_INFO_set_version(TS_TST_INFO *a, long version) | 151 | TS_TST_INFO_set_version(TS_TST_INFO *a, long version) |
| 143 | { | 152 | { |
| 144 | return ASN1_INTEGER_set(a->version, version); | 153 | return ASN1_INTEGER_set(a->version, version); |
| 145 | } | 154 | } |
| 155 | LCRYPTO_ALIAS(TS_TST_INFO_set_version); | ||
| 146 | 156 | ||
| 147 | long | 157 | long |
| 148 | TS_TST_INFO_get_version(const TS_TST_INFO *a) | 158 | TS_TST_INFO_get_version(const TS_TST_INFO *a) |
| 149 | { | 159 | { |
| 150 | return ASN1_INTEGER_get(a->version); | 160 | return ASN1_INTEGER_get(a->version); |
| 151 | } | 161 | } |
| 162 | LCRYPTO_ALIAS(TS_TST_INFO_get_version); | ||
| 152 | 163 | ||
| 153 | int | 164 | int |
| 154 | TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy) | 165 | TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy) |
| @@ -166,12 +177,14 @@ TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy) | |||
| 166 | a->policy_id = new_policy; | 177 | a->policy_id = new_policy; |
| 167 | return 1; | 178 | return 1; |
| 168 | } | 179 | } |
| 180 | LCRYPTO_ALIAS(TS_TST_INFO_set_policy_id); | ||
| 169 | 181 | ||
| 170 | ASN1_OBJECT * | 182 | ASN1_OBJECT * |
| 171 | TS_TST_INFO_get_policy_id(TS_TST_INFO *a) | 183 | TS_TST_INFO_get_policy_id(TS_TST_INFO *a) |
| 172 | { | 184 | { |
| 173 | return a->policy_id; | 185 | return a->policy_id; |
| 174 | } | 186 | } |
| 187 | LCRYPTO_ALIAS(TS_TST_INFO_get_policy_id); | ||
| 175 | 188 | ||
| 176 | int | 189 | int |
| 177 | TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint) | 190 | TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint) |
| @@ -189,12 +202,14 @@ TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint) | |||
| 189 | a->msg_imprint = new_msg_imprint; | 202 | a->msg_imprint = new_msg_imprint; |
| 190 | return 1; | 203 | return 1; |
| 191 | } | 204 | } |
| 205 | LCRYPTO_ALIAS(TS_TST_INFO_set_msg_imprint); | ||
| 192 | 206 | ||
| 193 | TS_MSG_IMPRINT * | 207 | TS_MSG_IMPRINT * |
| 194 | TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a) | 208 | TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a) |
| 195 | { | 209 | { |
| 196 | return a->msg_imprint; | 210 | return a->msg_imprint; |
| 197 | } | 211 | } |
| 212 | LCRYPTO_ALIAS(TS_TST_INFO_get_msg_imprint); | ||
| 198 | 213 | ||
| 199 | int | 214 | int |
| 200 | TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial) | 215 | TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial) |
| @@ -212,12 +227,14 @@ TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial) | |||
| 212 | a->serial = new_serial; | 227 | a->serial = new_serial; |
| 213 | return 1; | 228 | return 1; |
| 214 | } | 229 | } |
| 230 | LCRYPTO_ALIAS(TS_TST_INFO_set_serial); | ||
| 215 | 231 | ||
| 216 | const ASN1_INTEGER * | 232 | const ASN1_INTEGER * |
| 217 | TS_TST_INFO_get_serial(const TS_TST_INFO *a) | 233 | TS_TST_INFO_get_serial(const TS_TST_INFO *a) |
| 218 | { | 234 | { |
| 219 | return a->serial; | 235 | return a->serial; |
| 220 | } | 236 | } |
| 237 | LCRYPTO_ALIAS(TS_TST_INFO_get_serial); | ||
| 221 | 238 | ||
| 222 | int | 239 | int |
| 223 | TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime) | 240 | TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime) |
| @@ -235,12 +252,14 @@ TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime) | |||
| 235 | a->time = new_time; | 252 | a->time = new_time; |
| 236 | return 1; | 253 | return 1; |
| 237 | } | 254 | } |
| 255 | LCRYPTO_ALIAS(TS_TST_INFO_set_time); | ||
| 238 | 256 | ||
| 239 | const ASN1_GENERALIZEDTIME * | 257 | const ASN1_GENERALIZEDTIME * |
| 240 | TS_TST_INFO_get_time(const TS_TST_INFO *a) | 258 | TS_TST_INFO_get_time(const TS_TST_INFO *a) |
| 241 | { | 259 | { |
| 242 | return a->time; | 260 | return a->time; |
| 243 | } | 261 | } |
| 262 | LCRYPTO_ALIAS(TS_TST_INFO_get_time); | ||
| 244 | 263 | ||
| 245 | int | 264 | int |
| 246 | TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy) | 265 | TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy) |
| @@ -258,12 +277,14 @@ TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy) | |||
| 258 | a->accuracy = new_accuracy; | 277 | a->accuracy = new_accuracy; |
| 259 | return 1; | 278 | return 1; |
| 260 | } | 279 | } |
| 280 | LCRYPTO_ALIAS(TS_TST_INFO_set_accuracy); | ||
| 261 | 281 | ||
| 262 | TS_ACCURACY * | 282 | TS_ACCURACY * |
| 263 | TS_TST_INFO_get_accuracy(TS_TST_INFO *a) | 283 | TS_TST_INFO_get_accuracy(TS_TST_INFO *a) |
| 264 | { | 284 | { |
| 265 | return a->accuracy; | 285 | return a->accuracy; |
| 266 | } | 286 | } |
| 287 | LCRYPTO_ALIAS(TS_TST_INFO_get_accuracy); | ||
| 267 | 288 | ||
| 268 | int | 289 | int |
| 269 | TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds) | 290 | TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds) |
| @@ -281,12 +302,14 @@ TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds) | |||
| 281 | a->seconds = new_seconds; | 302 | a->seconds = new_seconds; |
| 282 | return 1; | 303 | return 1; |
| 283 | } | 304 | } |
| 305 | LCRYPTO_ALIAS(TS_ACCURACY_set_seconds); | ||
| 284 | 306 | ||
| 285 | const ASN1_INTEGER * | 307 | const ASN1_INTEGER * |
| 286 | TS_ACCURACY_get_seconds(const TS_ACCURACY *a) | 308 | TS_ACCURACY_get_seconds(const TS_ACCURACY *a) |
| 287 | { | 309 | { |
| 288 | return a->seconds; | 310 | return a->seconds; |
| 289 | } | 311 | } |
| 312 | LCRYPTO_ALIAS(TS_ACCURACY_get_seconds); | ||
| 290 | 313 | ||
| 291 | int | 314 | int |
| 292 | TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis) | 315 | TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis) |
| @@ -306,12 +329,14 @@ TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis) | |||
| 306 | a->millis = new_millis; | 329 | a->millis = new_millis; |
| 307 | return 1; | 330 | return 1; |
| 308 | } | 331 | } |
| 332 | LCRYPTO_ALIAS(TS_ACCURACY_set_millis); | ||
| 309 | 333 | ||
| 310 | const ASN1_INTEGER * | 334 | const ASN1_INTEGER * |
| 311 | TS_ACCURACY_get_millis(const TS_ACCURACY *a) | 335 | TS_ACCURACY_get_millis(const TS_ACCURACY *a) |
| 312 | { | 336 | { |
| 313 | return a->millis; | 337 | return a->millis; |
| 314 | } | 338 | } |
| 339 | LCRYPTO_ALIAS(TS_ACCURACY_get_millis); | ||
| 315 | 340 | ||
| 316 | int | 341 | int |
| 317 | TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros) | 342 | TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros) |
| @@ -331,12 +356,14 @@ TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros) | |||
| 331 | a->micros = new_micros; | 356 | a->micros = new_micros; |
| 332 | return 1; | 357 | return 1; |
| 333 | } | 358 | } |
| 359 | LCRYPTO_ALIAS(TS_ACCURACY_set_micros); | ||
| 334 | 360 | ||
| 335 | const ASN1_INTEGER * | 361 | const ASN1_INTEGER * |
| 336 | TS_ACCURACY_get_micros(const TS_ACCURACY *a) | 362 | TS_ACCURACY_get_micros(const TS_ACCURACY *a) |
| 337 | { | 363 | { |
| 338 | return a->micros; | 364 | return a->micros; |
| 339 | } | 365 | } |
| 366 | LCRYPTO_ALIAS(TS_ACCURACY_get_micros); | ||
| 340 | 367 | ||
| 341 | int | 368 | int |
| 342 | TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering) | 369 | TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering) |
| @@ -344,12 +371,14 @@ TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering) | |||
| 344 | a->ordering = ordering ? 0xFF : 0x00; | 371 | a->ordering = ordering ? 0xFF : 0x00; |
| 345 | return 1; | 372 | return 1; |
| 346 | } | 373 | } |
| 374 | LCRYPTO_ALIAS(TS_TST_INFO_set_ordering); | ||
| 347 | 375 | ||
| 348 | int | 376 | int |
| 349 | TS_TST_INFO_get_ordering(const TS_TST_INFO *a) | 377 | TS_TST_INFO_get_ordering(const TS_TST_INFO *a) |
| 350 | { | 378 | { |
| 351 | return a->ordering ? 1 : 0; | 379 | return a->ordering ? 1 : 0; |
| 352 | } | 380 | } |
| 381 | LCRYPTO_ALIAS(TS_TST_INFO_get_ordering); | ||
| 353 | 382 | ||
| 354 | int | 383 | int |
| 355 | TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce) | 384 | TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce) |
| @@ -367,12 +396,14 @@ TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce) | |||
| 367 | a->nonce = new_nonce; | 396 | a->nonce = new_nonce; |
| 368 | return 1; | 397 | return 1; |
| 369 | } | 398 | } |
| 399 | LCRYPTO_ALIAS(TS_TST_INFO_set_nonce); | ||
| 370 | 400 | ||
| 371 | const ASN1_INTEGER * | 401 | const ASN1_INTEGER * |
| 372 | TS_TST_INFO_get_nonce(const TS_TST_INFO *a) | 402 | TS_TST_INFO_get_nonce(const TS_TST_INFO *a) |
| 373 | { | 403 | { |
| 374 | return a->nonce; | 404 | return a->nonce; |
| 375 | } | 405 | } |
| 406 | LCRYPTO_ALIAS(TS_TST_INFO_get_nonce); | ||
| 376 | 407 | ||
| 377 | int | 408 | int |
| 378 | TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa) | 409 | TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa) |
| @@ -390,12 +421,14 @@ TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa) | |||
| 390 | a->tsa = new_tsa; | 421 | a->tsa = new_tsa; |
| 391 | return 1; | 422 | return 1; |
| 392 | } | 423 | } |
| 424 | LCRYPTO_ALIAS(TS_TST_INFO_set_tsa); | ||
| 393 | 425 | ||
| 394 | GENERAL_NAME * | 426 | GENERAL_NAME * |
| 395 | TS_TST_INFO_get_tsa(TS_TST_INFO *a) | 427 | TS_TST_INFO_get_tsa(TS_TST_INFO *a) |
| 396 | { | 428 | { |
| 397 | return a->tsa; | 429 | return a->tsa; |
| 398 | } | 430 | } |
| 431 | LCRYPTO_ALIAS(TS_TST_INFO_get_tsa); | ||
| 399 | 432 | ||
| 400 | STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a) | 433 | STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a) |
| 401 | { | 434 | { |
| @@ -410,51 +443,60 @@ TS_TST_INFO_ext_free(TS_TST_INFO *a) | |||
| 410 | sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free); | 443 | sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free); |
| 411 | a->extensions = NULL; | 444 | a->extensions = NULL; |
| 412 | } | 445 | } |
| 446 | LCRYPTO_ALIAS(TS_TST_INFO_ext_free); | ||
| 413 | 447 | ||
| 414 | int | 448 | int |
| 415 | TS_TST_INFO_get_ext_count(TS_TST_INFO *a) | 449 | TS_TST_INFO_get_ext_count(TS_TST_INFO *a) |
| 416 | { | 450 | { |
| 417 | return X509v3_get_ext_count(a->extensions); | 451 | return X509v3_get_ext_count(a->extensions); |
| 418 | } | 452 | } |
| 453 | LCRYPTO_ALIAS(TS_TST_INFO_get_ext_count); | ||
| 419 | 454 | ||
| 420 | int | 455 | int |
| 421 | TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos) | 456 | TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos) |
| 422 | { | 457 | { |
| 423 | return X509v3_get_ext_by_NID(a->extensions, nid, lastpos); | 458 | return X509v3_get_ext_by_NID(a->extensions, nid, lastpos); |
| 424 | } | 459 | } |
| 460 | LCRYPTO_ALIAS(TS_TST_INFO_get_ext_by_NID); | ||
| 425 | 461 | ||
| 426 | int | 462 | int |
| 427 | TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, const ASN1_OBJECT *obj, int lastpos) | 463 | TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, const ASN1_OBJECT *obj, int lastpos) |
| 428 | { | 464 | { |
| 429 | return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos); | 465 | return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos); |
| 430 | } | 466 | } |
| 467 | LCRYPTO_ALIAS(TS_TST_INFO_get_ext_by_OBJ); | ||
| 431 | 468 | ||
| 432 | int | 469 | int |
| 433 | TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos) | 470 | TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos) |
| 434 | { | 471 | { |
| 435 | return X509v3_get_ext_by_critical(a->extensions, crit, lastpos); | 472 | return X509v3_get_ext_by_critical(a->extensions, crit, lastpos); |
| 436 | } | 473 | } |
| 474 | LCRYPTO_ALIAS(TS_TST_INFO_get_ext_by_critical); | ||
| 437 | 475 | ||
| 438 | X509_EXTENSION * | 476 | X509_EXTENSION * |
| 439 | TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc) | 477 | TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc) |
| 440 | { | 478 | { |
| 441 | return X509v3_get_ext(a->extensions, loc); | 479 | return X509v3_get_ext(a->extensions, loc); |
| 442 | } | 480 | } |
| 481 | LCRYPTO_ALIAS(TS_TST_INFO_get_ext); | ||
| 443 | 482 | ||
| 444 | X509_EXTENSION * | 483 | X509_EXTENSION * |
| 445 | TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc) | 484 | TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc) |
| 446 | { | 485 | { |
| 447 | return X509v3_delete_ext(a->extensions, loc); | 486 | return X509v3_delete_ext(a->extensions, loc); |
| 448 | } | 487 | } |
| 488 | LCRYPTO_ALIAS(TS_TST_INFO_delete_ext); | ||
| 449 | 489 | ||
| 450 | int | 490 | int |
| 451 | TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc) | 491 | TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc) |
| 452 | { | 492 | { |
| 453 | return X509v3_add_ext(&a->extensions, ex, loc) != NULL; | 493 | return X509v3_add_ext(&a->extensions, ex, loc) != NULL; |
| 454 | } | 494 | } |
| 495 | LCRYPTO_ALIAS(TS_TST_INFO_add_ext); | ||
| 455 | 496 | ||
| 456 | void * | 497 | void * |
| 457 | TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx) | 498 | TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx) |
| 458 | { | 499 | { |
| 459 | return X509V3_get_d2i(a->extensions, nid, crit, idx); | 500 | return X509V3_get_d2i(a->extensions, nid, crit, idx); |
| 460 | } | 501 | } |
| 502 | LCRYPTO_ALIAS(TS_TST_INFO_get_ext_d2i); | ||
diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c index dc467d8604..69236f68ab 100644 --- a/src/lib/libcrypto/ts/ts_rsp_verify.c +++ b/src/lib/libcrypto/ts/ts_rsp_verify.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_rsp_verify.c,v 1.29 2022/11/26 16:08:54 tb Exp $ */ | 1 | /* $OpenBSD: ts_rsp_verify.c,v 1.30 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 | */ |
| @@ -230,6 +230,7 @@ err: | |||
| 230 | 230 | ||
| 231 | return ret; | 231 | return ret; |
| 232 | } | 232 | } |
| 233 | LCRYPTO_ALIAS(TS_RESP_verify_signature); | ||
| 233 | 234 | ||
| 234 | /* | 235 | /* |
| 235 | * The certificate chain is returned in chain. Caller is responsible for | 236 | * The certificate chain is returned in chain. Caller is responsible for |
| @@ -485,6 +486,7 @@ TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response) | |||
| 485 | err: | 486 | err: |
| 486 | return ret; | 487 | return ret; |
| 487 | } | 488 | } |
| 489 | LCRYPTO_ALIAS(TS_RESP_verify_response); | ||
| 488 | 490 | ||
| 489 | /* | 491 | /* |
| 490 | * Tries to extract a TS_TST_INFO structure from the PKCS7 token and | 492 | * Tries to extract a TS_TST_INFO structure from the PKCS7 token and |
| @@ -502,6 +504,7 @@ TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token) | |||
| 502 | } | 504 | } |
| 503 | return ret; | 505 | return ret; |
| 504 | } | 506 | } |
| 507 | LCRYPTO_ALIAS(TS_RESP_verify_token); | ||
| 505 | 508 | ||
| 506 | /* | 509 | /* |
| 507 | * Verifies whether the 'token' contains a valid time stamp token | 510 | * Verifies whether the 'token' contains a valid time stamp token |
diff --git a/src/lib/libcrypto/ts/ts_verify_ctx.c b/src/lib/libcrypto/ts/ts_verify_ctx.c index a7b90f9e4c..5a2d95c680 100644 --- a/src/lib/libcrypto/ts/ts_verify_ctx.c +++ b/src/lib/libcrypto/ts/ts_verify_ctx.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_verify_ctx.c,v 1.13 2023/04/25 17:52:54 tb Exp $ */ | 1 | /* $OpenBSD: ts_verify_ctx.c,v 1.14 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 2003. | 3 | * project 2003. |
| 4 | */ | 4 | */ |
| @@ -74,6 +74,7 @@ TS_VERIFY_CTX_new(void) | |||
| 74 | 74 | ||
| 75 | return ctx; | 75 | return ctx; |
| 76 | } | 76 | } |
| 77 | LCRYPTO_ALIAS(TS_VERIFY_CTX_new); | ||
| 77 | 78 | ||
| 78 | void | 79 | void |
| 79 | TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx) | 80 | TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx) |
| @@ -84,6 +85,7 @@ TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx) | |||
| 84 | TS_VERIFY_CTX_cleanup(ctx); | 85 | TS_VERIFY_CTX_cleanup(ctx); |
| 85 | free(ctx); | 86 | free(ctx); |
| 86 | } | 87 | } |
| 88 | LCRYPTO_ALIAS(TS_VERIFY_CTX_free); | ||
| 87 | 89 | ||
| 88 | void | 90 | void |
| 89 | TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx) | 91 | TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx) |
| @@ -107,6 +109,7 @@ TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx) | |||
| 107 | 109 | ||
| 108 | memset(ctx, 0, sizeof(*ctx)); | 110 | memset(ctx, 0, sizeof(*ctx)); |
| 109 | } | 111 | } |
| 112 | LCRYPTO_ALIAS(TS_VERIFY_CTX_cleanup); | ||
| 110 | 113 | ||
| 111 | /* | 114 | /* |
| 112 | * XXX: The following accessors demonstrate the amount of care and thought that | 115 | * XXX: The following accessors demonstrate the amount of care and thought that |
| @@ -127,6 +130,7 @@ TS_VERIFY_CTX_add_flags(TS_VERIFY_CTX *ctx, int flags) | |||
| 127 | 130 | ||
| 128 | return ctx->flags; | 131 | return ctx->flags; |
| 129 | } | 132 | } |
| 133 | LCRYPTO_ALIAS(TS_VERIFY_CTX_add_flags); | ||
| 130 | 134 | ||
| 131 | int | 135 | int |
| 132 | TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int flags) | 136 | TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int flags) |
| @@ -135,6 +139,7 @@ TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int flags) | |||
| 135 | 139 | ||
| 136 | return ctx->flags; | 140 | return ctx->flags; |
| 137 | } | 141 | } |
| 142 | LCRYPTO_ALIAS(TS_VERIFY_CTX_set_flags); | ||
| 138 | 143 | ||
| 139 | BIO * | 144 | BIO * |
| 140 | TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *bio) | 145 | TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *bio) |
| @@ -143,6 +148,7 @@ TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *bio) | |||
| 143 | 148 | ||
| 144 | return ctx->data; | 149 | return ctx->data; |
| 145 | } | 150 | } |
| 151 | LCRYPTO_ALIAS(TS_VERIFY_CTX_set_data); | ||
| 146 | 152 | ||
| 147 | X509_STORE * | 153 | X509_STORE * |
| 148 | TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *store) | 154 | TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *store) |
| @@ -151,6 +157,7 @@ TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *store) | |||
| 151 | 157 | ||
| 152 | return ctx->store; | 158 | return ctx->store; |
| 153 | } | 159 | } |
| 160 | LCRYPTO_ALIAS(TS_VERIFY_CTX_set_store); | ||
| 154 | 161 | ||
| 155 | STACK_OF(X509) * | 162 | STACK_OF(X509) * |
| 156 | TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs) | 163 | TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs) |
| @@ -159,6 +166,7 @@ TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs) | |||
| 159 | 166 | ||
| 160 | return ctx->certs; | 167 | return ctx->certs; |
| 161 | } | 168 | } |
| 169 | LCRYPTO_ALIAS(TS_VERIFY_CTX_set_certs); | ||
| 162 | 170 | ||
| 163 | unsigned char * | 171 | unsigned char * |
| 164 | TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, unsigned char *imprint, | 172 | TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, unsigned char *imprint, |
| @@ -171,6 +179,7 @@ TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, unsigned char *imprint, | |||
| 171 | 179 | ||
| 172 | return ctx->imprint; | 180 | return ctx->imprint; |
| 173 | } | 181 | } |
| 182 | LCRYPTO_ALIAS(TS_VERIFY_CTX_set_imprint); | ||
| 174 | 183 | ||
| 175 | TS_VERIFY_CTX * | 184 | TS_VERIFY_CTX * |
| 176 | TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx) | 185 | TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx) |
| @@ -224,3 +233,4 @@ err: | |||
| 224 | TS_VERIFY_CTX_free(ret); | 233 | TS_VERIFY_CTX_free(ret); |
| 225 | return NULL; | 234 | return NULL; |
| 226 | } | 235 | } |
| 236 | LCRYPTO_ALIAS(TS_REQ_to_TS_VERIFY_CTX); | ||
