summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/hidden
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/hidden')
-rw-r--r--src/lib/libcrypto/hidden/crypto_namespace.h6
-rw-r--r--src/lib/libcrypto/hidden/openssl/asn1t.h5
-rw-r--r--src/lib/libcrypto/hidden/openssl/bio.h3
-rw-r--r--src/lib/libcrypto/hidden/openssl/mlkem.h41
-rw-r--r--src/lib/libcrypto/hidden/openssl/pem.h4
-rw-r--r--src/lib/libcrypto/hidden/openssl/x509.h4
-rw-r--r--src/lib/libcrypto/hidden/openssl/x509_vfy.h3
7 files changed, 33 insertions, 33 deletions
diff --git a/src/lib/libcrypto/hidden/crypto_namespace.h b/src/lib/libcrypto/hidden/crypto_namespace.h
index 741ad08549..43c8718ed0 100644
--- a/src/lib/libcrypto/hidden/crypto_namespace.h
+++ b/src/lib/libcrypto/hidden/crypto_namespace.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: crypto_namespace.h,v 1.4 2024/07/11 21:31:52 miod Exp $ */ 1/* $OpenBSD: crypto_namespace.h,v 1.5 2025/08/18 16:00:05 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> 3 * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org>
4 * 4 *
@@ -45,7 +45,11 @@
45# define LCRYPTO_UNUSED(x) 45# define LCRYPTO_UNUSED(x)
46# define LCRYPTO_USED(x) 46# define LCRYPTO_USED(x)
47# define LCRYPTO_ALIAS1(pre,x) 47# define LCRYPTO_ALIAS1(pre,x)
48#ifdef _MSC_VER
49# define LCRYPTO_ALIAS(x)
50#else
48# define LCRYPTO_ALIAS(x) asm("") 51# define LCRYPTO_ALIAS(x) asm("")
52#endif /* _MSC_VER */
49#endif 53#endif
50 54
51#endif /* _LIBCRYPTO_CRYPTO_NAMESPACE_H_ */ 55#endif /* _LIBCRYPTO_CRYPTO_NAMESPACE_H_ */
diff --git a/src/lib/libcrypto/hidden/openssl/asn1t.h b/src/lib/libcrypto/hidden/openssl/asn1t.h
index 17bcb4e453..8f5f09b09f 100644
--- a/src/lib/libcrypto/hidden/openssl/asn1t.h
+++ b/src/lib/libcrypto/hidden/openssl/asn1t.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1t.h,v 1.5 2024/07/08 17:01:54 beck Exp $ */ 1/* $OpenBSD: asn1t.h,v 1.6 2025/08/22 14:07:34 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -30,6 +30,9 @@ LCRYPTO_USED(ASN1_item_ex_free);
30LCRYPTO_USED(ASN1_item_ex_d2i); 30LCRYPTO_USED(ASN1_item_ex_d2i);
31LCRYPTO_USED(ASN1_item_ex_i2d); 31LCRYPTO_USED(ASN1_item_ex_i2d);
32#if defined(LIBRESSL_NAMESPACE) 32#if defined(LIBRESSL_NAMESPACE)
33extern LCRYPTO_USED(ASN1_BOOLEAN_it);
34extern LCRYPTO_USED(ASN1_TBOOLEAN_it);
35extern LCRYPTO_USED(ASN1_FBOOLEAN_it);
33extern LCRYPTO_USED(ASN1_SEQUENCE_it); 36extern LCRYPTO_USED(ASN1_SEQUENCE_it);
34extern LCRYPTO_USED(BIGNUM_it); 37extern LCRYPTO_USED(BIGNUM_it);
35extern LCRYPTO_USED(LONG_it); 38extern LCRYPTO_USED(LONG_it);
diff --git a/src/lib/libcrypto/hidden/openssl/bio.h b/src/lib/libcrypto/hidden/openssl/bio.h
index 03da75a795..69651cf3cb 100644
--- a/src/lib/libcrypto/hidden/openssl/bio.h
+++ b/src/lib/libcrypto/hidden/openssl/bio.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio.h,v 1.8 2024/07/09 06:14:59 beck Exp $ */ 1/* $OpenBSD: bio.h,v 1.9 2025/07/16 15:59:26 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -103,7 +103,6 @@ LCRYPTO_USED(BIO_s_socket);
103LCRYPTO_USED(BIO_s_connect); 103LCRYPTO_USED(BIO_s_connect);
104LCRYPTO_USED(BIO_s_accept); 104LCRYPTO_USED(BIO_s_accept);
105LCRYPTO_USED(BIO_s_fd); 105LCRYPTO_USED(BIO_s_fd);
106LCRYPTO_USED(BIO_s_log);
107LCRYPTO_USED(BIO_s_bio); 106LCRYPTO_USED(BIO_s_bio);
108LCRYPTO_USED(BIO_s_null); 107LCRYPTO_USED(BIO_s_null);
109LCRYPTO_USED(BIO_f_null); 108LCRYPTO_USED(BIO_f_null);
diff --git a/src/lib/libcrypto/hidden/openssl/mlkem.h b/src/lib/libcrypto/hidden/openssl/mlkem.h
index 8cd80eb3af..e5f1fc0634 100644
--- a/src/lib/libcrypto/hidden/openssl/mlkem.h
+++ b/src/lib/libcrypto/hidden/openssl/mlkem.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: mlkem.h,v 1.4 2024/12/20 15:10:31 tb Exp $ */ 1/* $OpenBSD: mlkem.h,v 1.6 2025/08/19 21:37:08 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2024 Bob Beck <beck@obtuse.com> 3 * Copyright (c) 2025 Bob Beck <beck@openbsd.org>
4 * 4 *
5 * Permission to use, copy, modify, and distribute this software for any 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 6 * purpose with or without fee is hereby granted, provided that the above
@@ -18,9 +18,6 @@
18#ifndef _LIBCRYPTO_MLKEM_H 18#ifndef _LIBCRYPTO_MLKEM_H
19#define _LIBCRYPTO_MLKEM_H 19#define _LIBCRYPTO_MLKEM_H
20 20
21/* Undo when making public */
22#ifdef LIBRESSL_HAS_MLKEM
23
24#ifndef _MSC_VER 21#ifndef _MSC_VER
25#include_next <openssl/mlkem.h> 22#include_next <openssl/mlkem.h>
26#else 23#else
@@ -28,22 +25,22 @@
28#endif 25#endif
29#include "crypto_namespace.h" 26#include "crypto_namespace.h"
30 27
31LCRYPTO_USED(MLKEM768_generate_key); 28LCRYPTO_USED(MLKEM_private_key_new);
32LCRYPTO_USED(MLKEM768_public_from_private); 29LCRYPTO_USED(MLKEM_private_key_free);
33LCRYPTO_USED(MLKEM768_encap); 30LCRYPTO_USED(MLKEM_private_key_ciphertext_length);
34LCRYPTO_USED(MLKEM768_decap); 31LCRYPTO_USED(MLKEM_private_key_encoded_length);
35LCRYPTO_USED(MLKEM768_marshal_public_key); 32LCRYPTO_USED(MLKEM_public_key_new);
36LCRYPTO_USED(MLKEM768_parse_public_key); 33LCRYPTO_USED(MLKEM_public_key_free);
37LCRYPTO_USED(MLKEM768_private_key_from_seed); 34LCRYPTO_USED(MLKEM_public_key_ciphertext_length);
38LCRYPTO_USED(MLKEM768_parse_private_key); 35LCRYPTO_USED(MLKEM_public_key_encoded_length);
39LCRYPTO_USED(MLKEM1024_generate_key); 36LCRYPTO_USED(MLKEM_generate_key);
40LCRYPTO_USED(MLKEM1024_public_from_private); 37LCRYPTO_USED(MLKEM_private_key_from_seed);
41LCRYPTO_USED(MLKEM1024_encap); 38LCRYPTO_USED(MLKEM_public_from_private);
42LCRYPTO_USED(MLKEM1024_decap); 39LCRYPTO_USED(MLKEM_encap);
43LCRYPTO_USED(MLKEM1024_marshal_public_key); 40LCRYPTO_USED(MLKEM_decap);
44LCRYPTO_USED(MLKEM1024_parse_public_key); 41LCRYPTO_USED(MLKEM_marshal_public_key);
45LCRYPTO_USED(MLKEM1024_private_key_from_seed); 42LCRYPTO_USED(MLKEM_parse_public_key);
46LCRYPTO_USED(MLKEM1024_parse_private_key); 43LCRYPTO_USED(MLKEM_marshal_private_key);
47#endif /* LIBRESSL_HAS_MLKEM */ 44LCRYPTO_USED(MLKEM_parse_private_key);
48 45
49#endif /* _LIBCRYPTO_MLKEM_H */ 46#endif /* _LIBCRYPTO_MLKEM_H */
diff --git a/src/lib/libcrypto/hidden/openssl/pem.h b/src/lib/libcrypto/hidden/openssl/pem.h
index 5838f07f4d..233fd8859b 100644
--- a/src/lib/libcrypto/hidden/openssl/pem.h
+++ b/src/lib/libcrypto/hidden/openssl/pem.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem.h,v 1.2 2023/07/07 19:37:54 beck Exp $ */ 1/* $OpenBSD: pem.h,v 1.3 2025/07/16 15:59:26 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -33,12 +33,10 @@ LCRYPTO_USED(PEM_bytes_read_bio);
33LCRYPTO_USED(PEM_ASN1_read_bio); 33LCRYPTO_USED(PEM_ASN1_read_bio);
34LCRYPTO_USED(PEM_ASN1_write_bio); 34LCRYPTO_USED(PEM_ASN1_write_bio);
35LCRYPTO_USED(PEM_X509_INFO_read_bio); 35LCRYPTO_USED(PEM_X509_INFO_read_bio);
36LCRYPTO_USED(PEM_X509_INFO_write_bio);
37LCRYPTO_USED(PEM_read); 36LCRYPTO_USED(PEM_read);
38LCRYPTO_USED(PEM_write); 37LCRYPTO_USED(PEM_write);
39LCRYPTO_USED(PEM_ASN1_read); 38LCRYPTO_USED(PEM_ASN1_read);
40LCRYPTO_USED(PEM_ASN1_write); 39LCRYPTO_USED(PEM_ASN1_write);
41LCRYPTO_USED(PEM_X509_INFO_read);
42LCRYPTO_USED(PEM_SignInit); 40LCRYPTO_USED(PEM_SignInit);
43LCRYPTO_USED(PEM_SignUpdate); 41LCRYPTO_USED(PEM_SignUpdate);
44LCRYPTO_USED(PEM_SignFinal); 42LCRYPTO_USED(PEM_SignFinal);
diff --git a/src/lib/libcrypto/hidden/openssl/x509.h b/src/lib/libcrypto/hidden/openssl/x509.h
index e6104cd451..5e78f7af97 100644
--- a/src/lib/libcrypto/hidden/openssl/x509.h
+++ b/src/lib/libcrypto/hidden/openssl/x509.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.h,v 1.15 2025/03/09 15:17:22 tb Exp $ */ 1/* $OpenBSD: x509.h,v 1.16 2025/07/16 15:59:26 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -401,8 +401,6 @@ LCRYPTO_USED(i2d_X509_CRL);
401LCRYPTO_USED(X509_CRL_add0_revoked); 401LCRYPTO_USED(X509_CRL_add0_revoked);
402LCRYPTO_USED(X509_CRL_get0_by_serial); 402LCRYPTO_USED(X509_CRL_get0_by_serial);
403LCRYPTO_USED(X509_CRL_get0_by_cert); 403LCRYPTO_USED(X509_CRL_get0_by_cert);
404LCRYPTO_USED(X509_PKEY_new);
405LCRYPTO_USED(X509_PKEY_free);
406LCRYPTO_USED(NETSCAPE_SPKI_new); 404LCRYPTO_USED(NETSCAPE_SPKI_new);
407LCRYPTO_USED(NETSCAPE_SPKI_free); 405LCRYPTO_USED(NETSCAPE_SPKI_free);
408LCRYPTO_USED(d2i_NETSCAPE_SPKI); 406LCRYPTO_USED(d2i_NETSCAPE_SPKI);
diff --git a/src/lib/libcrypto/hidden/openssl/x509_vfy.h b/src/lib/libcrypto/hidden/openssl/x509_vfy.h
index cc0991518f..d0c46b655e 100644
--- a/src/lib/libcrypto/hidden/openssl/x509_vfy.h
+++ b/src/lib/libcrypto/hidden/openssl/x509_vfy.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_vfy.h,v 1.10 2025/03/09 15:20:20 tb Exp $ */ 1/* $OpenBSD: x509_vfy.h,v 1.11 2025/10/24 11:33:38 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -122,6 +122,7 @@ LCRYPTO_USED(X509_VERIFY_PARAM_set1_name);
122LCRYPTO_USED(X509_VERIFY_PARAM_set_flags); 122LCRYPTO_USED(X509_VERIFY_PARAM_set_flags);
123LCRYPTO_USED(X509_VERIFY_PARAM_clear_flags); 123LCRYPTO_USED(X509_VERIFY_PARAM_clear_flags);
124LCRYPTO_USED(X509_VERIFY_PARAM_get_flags); 124LCRYPTO_USED(X509_VERIFY_PARAM_get_flags);
125LCRYPTO_USED(X509_VERIFY_PARAM_get_hostflags);
125LCRYPTO_USED(X509_VERIFY_PARAM_set_purpose); 126LCRYPTO_USED(X509_VERIFY_PARAM_set_purpose);
126LCRYPTO_USED(X509_VERIFY_PARAM_set_trust); 127LCRYPTO_USED(X509_VERIFY_PARAM_set_trust);
127LCRYPTO_USED(X509_VERIFY_PARAM_set_depth); 128LCRYPTO_USED(X509_VERIFY_PARAM_set_depth);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-20 00:13:20 +0000