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