]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
Merge branch 'wip/dueno/hpke2' into 'master'
authorDaiki Ueno <ueno@gnu.org>
Mon, 27 Apr 2026 08:48:14 +0000 (17:48 +0900)
committerDaiki Ueno <ueno@gnu.org>
Mon, 27 Apr 2026 08:48:14 +0000 (17:48 +0900)
Minor cleanup of HPKE API

See merge request gnutls/gnutls!2097

1  2 
NEWS
doc/Makefile.am
tests/Makefile.am

diff --cc NEWS
index b466730fff0accdcb1af180e729a18ed57616534,e4fa100ac58ea75be75380b3aa30a88adcc13ed9..7c4527d402072f5c69af41432068ac1d7225e78c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -44,12 -46,8 +46,9 @@@ gnutls_hpke_encap: New functio
  gnutls_hpke_seal: New function
  gnutls_hpke_decap: New function
  gnutls_hpke_open: New function
- gnutls_hpke_context_set_ikme: New function
- gnutls_hpke_generate_keypair: New function
- gnutls_hpke_get_seq: New function
- gnutls_hpke_set_seq: New function
+ gnutls_hpke_derive_keypair: New function
  gnutls_hpke_export: New function
 +gnutls_pkcs11_obj_get_pk_algorithm: New function
  
  * Version 3.8.12 (released 2026-02-09)
  
diff --cc doc/Makefile.am
index b7fbe6d88391e533810eef7048e74ad15a8ed91c,ecf3e6be7b6a599e3fef1125a11becb39fefb0db..cede2dfbc095155ee6fed27045c6f1e56568305d
@@@ -242,10 -241,10 +242,10 @@@ DISTCLEANFILES 
  
  API_FILES=gnutls-api.texi socket-api.texi x509-api.texi pkcs12-api.texi \
        tpm-api.texi pkcs11-api.texi abstract-api.texi compat-api.texi \
-       dtls-api.texi crypto-api.texi ocsp-api.texi tpm-api.texi dane-api.texi \
+       dtls-api.texi crypto-api.texi ocsp-api.texi dane-api.texi \
        pkcs7-api.texi hpke-api.texi
  
 -MAINTAINERCLEANFILES += stamp_enums stamp_functions functions enums
 +MAINTAINERCLEANFILES += stamp_enums stamp_functions stamp_error_codes
  
  gnutls_TEXINFOS += $(API_FILES)
  
Simple merge