diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/Makefile | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 128 | ||||
-rw-r--r-- | src/lib/libcrypto/opensslfeatures.h | 2 |
3 files changed, 135 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 04d51055b5..4ddb49c680 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.36 2019/09/09 16:49:03 jsing Exp $ | 1 | # $OpenBSD: Makefile,v 1.37 2019/11/02 13:38:04 jsing Exp $ |
2 | 2 | ||
3 | LIB= crypto | 3 | LIB= crypto |
4 | LIBREBUILD=y | 4 | LIBREBUILD=y |
@@ -97,6 +97,11 @@ SRCS+= chacha.c | |||
97 | # cmac/ | 97 | # cmac/ |
98 | SRCS+= cmac.c cm_ameth.c cm_pmeth.c | 98 | SRCS+= cmac.c cm_ameth.c cm_pmeth.c |
99 | 99 | ||
100 | # cms/ | ||
101 | SRCS+= cms_asn1.c cms_att.c cms_cd.c cms_dd.c cms_enc.c cms_env.c cms_err.c | ||
102 | SRCS+= cms_ess.c cms_io.c cms_kari.c cms_lcl.h cms_lib.c cms_pwri.c cms_sd.c | ||
103 | SRCS+= cms_smime.c | ||
104 | |||
100 | # comp/ | 105 | # comp/ |
101 | SRCS+= comp_lib.c comp_err.c c_rle.c c_zlib.c | 106 | SRCS+= comp_lib.c comp_err.c c_rle.c c_zlib.c |
102 | 107 | ||
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 4ec01fe9c8..ac7f603482 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -306,6 +306,7 @@ BIO_meth_set_write | |||
306 | BIO_method_name | 306 | BIO_method_name |
307 | BIO_method_type | 307 | BIO_method_type |
308 | BIO_new | 308 | BIO_new |
309 | BIO_new_CMS | ||
309 | BIO_new_NDEF | 310 | BIO_new_NDEF |
310 | BIO_new_PKCS7 | 311 | BIO_new_PKCS7 |
311 | BIO_new_accept | 312 | BIO_new_accept |
@@ -558,6 +559,118 @@ CMAC_Final | |||
558 | CMAC_Init | 559 | CMAC_Init |
559 | CMAC_Update | 560 | CMAC_Update |
560 | CMAC_resume | 561 | CMAC_resume |
562 | CMS_ContentInfo_free | ||
563 | CMS_ContentInfo_it | ||
564 | CMS_ContentInfo_new | ||
565 | CMS_ContentInfo_print_ctx | ||
566 | CMS_EncryptedData_decrypt | ||
567 | CMS_EncryptedData_encrypt | ||
568 | CMS_EncryptedData_set1_key | ||
569 | CMS_EnvelopedData_create | ||
570 | CMS_ReceiptRequest_create0 | ||
571 | CMS_ReceiptRequest_free | ||
572 | CMS_ReceiptRequest_get0_values | ||
573 | CMS_ReceiptRequest_it | ||
574 | CMS_ReceiptRequest_new | ||
575 | CMS_RecipientEncryptedKey_cert_cmp | ||
576 | CMS_RecipientEncryptedKey_get0_id | ||
577 | CMS_RecipientInfo_decrypt | ||
578 | CMS_RecipientInfo_encrypt | ||
579 | CMS_RecipientInfo_get0_pkey_ctx | ||
580 | CMS_RecipientInfo_kari_decrypt | ||
581 | CMS_RecipientInfo_kari_get0_alg | ||
582 | CMS_RecipientInfo_kari_get0_ctx | ||
583 | CMS_RecipientInfo_kari_get0_orig_id | ||
584 | CMS_RecipientInfo_kari_get0_reks | ||
585 | CMS_RecipientInfo_kari_orig_id_cmp | ||
586 | CMS_RecipientInfo_kari_set0_pkey | ||
587 | CMS_RecipientInfo_kekri_get0_id | ||
588 | CMS_RecipientInfo_kekri_id_cmp | ||
589 | CMS_RecipientInfo_ktri_cert_cmp | ||
590 | CMS_RecipientInfo_ktri_get0_algs | ||
591 | CMS_RecipientInfo_ktri_get0_signer_id | ||
592 | CMS_RecipientInfo_set0_key | ||
593 | CMS_RecipientInfo_set0_password | ||
594 | CMS_RecipientInfo_set0_pkey | ||
595 | CMS_RecipientInfo_type | ||
596 | CMS_SharedInfo_encode | ||
597 | CMS_SignedData_init | ||
598 | CMS_SignerInfo_cert_cmp | ||
599 | CMS_SignerInfo_get0_algs | ||
600 | CMS_SignerInfo_get0_md_ctx | ||
601 | CMS_SignerInfo_get0_pkey_ctx | ||
602 | CMS_SignerInfo_get0_signature | ||
603 | CMS_SignerInfo_get0_signer_id | ||
604 | CMS_SignerInfo_set1_signer_cert | ||
605 | CMS_SignerInfo_sign | ||
606 | CMS_SignerInfo_verify | ||
607 | CMS_SignerInfo_verify_content | ||
608 | CMS_add0_CertificateChoices | ||
609 | CMS_add0_RevocationInfoChoice | ||
610 | CMS_add0_cert | ||
611 | CMS_add0_crl | ||
612 | CMS_add0_recipient_key | ||
613 | CMS_add0_recipient_password | ||
614 | CMS_add1_ReceiptRequest | ||
615 | CMS_add1_cert | ||
616 | CMS_add1_crl | ||
617 | CMS_add1_recipient_cert | ||
618 | CMS_add1_signer | ||
619 | CMS_add_simple_smimecap | ||
620 | CMS_add_smimecap | ||
621 | CMS_add_standard_smimecap | ||
622 | CMS_compress | ||
623 | CMS_data | ||
624 | CMS_dataFinal | ||
625 | CMS_dataInit | ||
626 | CMS_data_create | ||
627 | CMS_decrypt | ||
628 | CMS_decrypt_set1_key | ||
629 | CMS_decrypt_set1_password | ||
630 | CMS_decrypt_set1_pkey | ||
631 | CMS_digest_create | ||
632 | CMS_digest_verify | ||
633 | CMS_encrypt | ||
634 | CMS_final | ||
635 | CMS_get0_RecipientInfos | ||
636 | CMS_get0_SignerInfos | ||
637 | CMS_get0_content | ||
638 | CMS_get0_eContentType | ||
639 | CMS_get0_signers | ||
640 | CMS_get0_type | ||
641 | CMS_get1_ReceiptRequest | ||
642 | CMS_get1_certs | ||
643 | CMS_get1_crls | ||
644 | CMS_is_detached | ||
645 | CMS_set1_eContentType | ||
646 | CMS_set1_signers_certs | ||
647 | CMS_set_detached | ||
648 | CMS_sign | ||
649 | CMS_sign_receipt | ||
650 | CMS_signed_add1_attr | ||
651 | CMS_signed_add1_attr_by_NID | ||
652 | CMS_signed_add1_attr_by_OBJ | ||
653 | CMS_signed_add1_attr_by_txt | ||
654 | CMS_signed_delete_attr | ||
655 | CMS_signed_get0_data_by_OBJ | ||
656 | CMS_signed_get_attr | ||
657 | CMS_signed_get_attr_by_NID | ||
658 | CMS_signed_get_attr_by_OBJ | ||
659 | CMS_signed_get_attr_count | ||
660 | CMS_stream | ||
661 | CMS_uncompress | ||
662 | CMS_unsigned_add1_attr | ||
663 | CMS_unsigned_add1_attr_by_NID | ||
664 | CMS_unsigned_add1_attr_by_OBJ | ||
665 | CMS_unsigned_add1_attr_by_txt | ||
666 | CMS_unsigned_delete_attr | ||
667 | CMS_unsigned_get0_data_by_OBJ | ||
668 | CMS_unsigned_get_attr | ||
669 | CMS_unsigned_get_attr_by_NID | ||
670 | CMS_unsigned_get_attr_by_OBJ | ||
671 | CMS_unsigned_get_attr_count | ||
672 | CMS_verify | ||
673 | CMS_verify_receipt | ||
561 | COMP_CTX_free | 674 | COMP_CTX_free |
562 | COMP_CTX_new | 675 | COMP_CTX_new |
563 | COMP_compress_block | 676 | COMP_compress_block |
@@ -1211,6 +1324,7 @@ ERR_load_ASN1_strings | |||
1211 | ERR_load_BIO_strings | 1324 | ERR_load_BIO_strings |
1212 | ERR_load_BN_strings | 1325 | ERR_load_BN_strings |
1213 | ERR_load_BUF_strings | 1326 | ERR_load_BUF_strings |
1327 | ERR_load_CMS_strings | ||
1214 | ERR_load_COMP_strings | 1328 | ERR_load_COMP_strings |
1215 | ERR_load_CONF_strings | 1329 | ERR_load_CONF_strings |
1216 | ERR_load_CRYPTO_strings | 1330 | ERR_load_CRYPTO_strings |
@@ -1981,6 +2095,7 @@ PEM_do_header | |||
1981 | PEM_get_EVP_CIPHER_INFO | 2095 | PEM_get_EVP_CIPHER_INFO |
1982 | PEM_proc_type | 2096 | PEM_proc_type |
1983 | PEM_read | 2097 | PEM_read |
2098 | PEM_read_CMS | ||
1984 | PEM_read_DHparams | 2099 | PEM_read_DHparams |
1985 | PEM_read_DSAPrivateKey | 2100 | PEM_read_DSAPrivateKey |
1986 | PEM_read_DSA_PUBKEY | 2101 | PEM_read_DSA_PUBKEY |
@@ -2003,6 +2118,7 @@ PEM_read_X509_CERT_PAIR | |||
2003 | PEM_read_X509_CRL | 2118 | PEM_read_X509_CRL |
2004 | PEM_read_X509_REQ | 2119 | PEM_read_X509_REQ |
2005 | PEM_read_bio | 2120 | PEM_read_bio |
2121 | PEM_read_bio_CMS | ||
2006 | PEM_read_bio_DHparams | 2122 | PEM_read_bio_DHparams |
2007 | PEM_read_bio_DSAPrivateKey | 2123 | PEM_read_bio_DSAPrivateKey |
2008 | PEM_read_bio_DSA_PUBKEY | 2124 | PEM_read_bio_DSA_PUBKEY |
@@ -2026,6 +2142,7 @@ PEM_read_bio_X509_CERT_PAIR | |||
2026 | PEM_read_bio_X509_CRL | 2142 | PEM_read_bio_X509_CRL |
2027 | PEM_read_bio_X509_REQ | 2143 | PEM_read_bio_X509_REQ |
2028 | PEM_write | 2144 | PEM_write |
2145 | PEM_write_CMS | ||
2029 | PEM_write_DHparams | 2146 | PEM_write_DHparams |
2030 | PEM_write_DSAPrivateKey | 2147 | PEM_write_DSAPrivateKey |
2031 | PEM_write_DSA_PUBKEY | 2148 | PEM_write_DSA_PUBKEY |
@@ -2052,6 +2169,8 @@ PEM_write_X509_REQ | |||
2052 | PEM_write_X509_REQ_NEW | 2169 | PEM_write_X509_REQ_NEW |
2053 | PEM_write_bio | 2170 | PEM_write_bio |
2054 | PEM_write_bio_ASN1_stream | 2171 | PEM_write_bio_ASN1_stream |
2172 | PEM_write_bio_CMS | ||
2173 | PEM_write_bio_CMS_stream | ||
2055 | PEM_write_bio_DHparams | 2174 | PEM_write_bio_DHparams |
2056 | PEM_write_bio_DSAPrivateKey | 2175 | PEM_write_bio_DSAPrivateKey |
2057 | PEM_write_bio_DSA_PUBKEY | 2176 | PEM_write_bio_DSA_PUBKEY |
@@ -2411,9 +2530,11 @@ SM4_encrypt | |||
2411 | SM4_set_key | 2530 | SM4_set_key |
2412 | SMIME_crlf_copy | 2531 | SMIME_crlf_copy |
2413 | SMIME_read_ASN1 | 2532 | SMIME_read_ASN1 |
2533 | SMIME_read_CMS | ||
2414 | SMIME_read_PKCS7 | 2534 | SMIME_read_PKCS7 |
2415 | SMIME_text | 2535 | SMIME_text |
2416 | SMIME_write_ASN1 | 2536 | SMIME_write_ASN1 |
2537 | SMIME_write_CMS | ||
2417 | SMIME_write_PKCS7 | 2538 | SMIME_write_PKCS7 |
2418 | SSLeay | 2539 | SSLeay |
2419 | SSLeay_version | 2540 | SSLeay_version |
@@ -3241,6 +3362,9 @@ d2i_AUTHORITY_KEYID | |||
3241 | d2i_AutoPrivateKey | 3362 | d2i_AutoPrivateKey |
3242 | d2i_BASIC_CONSTRAINTS | 3363 | d2i_BASIC_CONSTRAINTS |
3243 | d2i_CERTIFICATEPOLICIES | 3364 | d2i_CERTIFICATEPOLICIES |
3365 | d2i_CMS_ContentInfo | ||
3366 | d2i_CMS_ReceiptRequest | ||
3367 | d2i_CMS_bio | ||
3244 | d2i_CRL_DIST_POINTS | 3368 | d2i_CRL_DIST_POINTS |
3245 | d2i_DHparams | 3369 | d2i_DHparams |
3246 | d2i_DHparams_bio | 3370 | d2i_DHparams_bio |
@@ -3447,6 +3571,10 @@ i2d_AUTHORITY_INFO_ACCESS | |||
3447 | i2d_AUTHORITY_KEYID | 3571 | i2d_AUTHORITY_KEYID |
3448 | i2d_BASIC_CONSTRAINTS | 3572 | i2d_BASIC_CONSTRAINTS |
3449 | i2d_CERTIFICATEPOLICIES | 3573 | i2d_CERTIFICATEPOLICIES |
3574 | i2d_CMS_ContentInfo | ||
3575 | i2d_CMS_ReceiptRequest | ||
3576 | i2d_CMS_bio | ||
3577 | i2d_CMS_bio_stream | ||
3450 | i2d_CRL_DIST_POINTS | 3578 | i2d_CRL_DIST_POINTS |
3451 | i2d_DHparams | 3579 | i2d_DHparams |
3452 | i2d_DHparams_bio | 3580 | i2d_DHparams_bio |
diff --git a/src/lib/libcrypto/opensslfeatures.h b/src/lib/libcrypto/opensslfeatures.h index 688d478dfd..ad41283413 100644 --- a/src/lib/libcrypto/opensslfeatures.h +++ b/src/lib/libcrypto/opensslfeatures.h | |||
@@ -34,7 +34,7 @@ | |||
34 | /* #define OPENSSL_NO_CAST */ | 34 | /* #define OPENSSL_NO_CAST */ |
35 | /* #define OPENSSL_NO_CHACHA */ | 35 | /* #define OPENSSL_NO_CHACHA */ |
36 | /* #define OPENSSL_NO_CMAC */ | 36 | /* #define OPENSSL_NO_CMAC */ |
37 | #define OPENSSL_NO_CMS | 37 | /* #define OPENSSL_NO_CMS */ |
38 | #define OPENSSL_NO_COMP /* XXX */ | 38 | #define OPENSSL_NO_COMP /* XXX */ |
39 | /* #define OPENSSL_NO_CRYPTO_MDEBUG */ | 39 | /* #define OPENSSL_NO_CRYPTO_MDEBUG */ |
40 | /* #define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE */ | 40 | /* #define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE */ |