Document OSSL_SERIALIZER_PUBKEY_TO_DER_PQ and friends

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11071)

diff --git a/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod b/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod
index 8cc7cfbf30be88f66a8a1f146066bd03c5ebd1fe..f95753aa219ce320f0a149ca55b61edd5996d49c 100644 (file)
--- a/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod
+++ b/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod
@@ -10,6 +10,9 @@ OSSL_SERIALIZER_CTX_set_passphrase_ui,
 OSSL_SERIALIZER_PUBKEY_TO_PEM_PQ,
 OSSL_SERIALIZER_PrivateKey_TO_PEM_PQ,
 OSSL_SERIALIZER_Parameters_TO_PEM_PQ,
+OSSL_SERIALIZER_PUBKEY_TO_DER_PQ,
+OSSL_SERIALIZER_PrivateKey_TO_DER_PQ,
+OSSL_SERIALIZER_Parameters_TO_DER_PQ,
 OSSL_SERIALIZER_PUBKEY_TO_TEXT_PQ,
 OSSL_SERIALIZER_PrivateKey_TO_TEXT_PQ,
 OSSL_SERIALIZER_Parameters_TO_TEXT_PQ
@@ -38,6 +41,10 @@ OSSL_SERIALIZER_Parameters_TO_TEXT_PQ
  #define OSSL_SERIALIZER_PrivateKey_TO_PEM_PQ "format=pem,type=private"
  #define OSSL_SERIALIZER_Parameters_TO_PEM_PQ "format=pem,type=parameters"
 
+ #define OSSL_SERIALIZER_PUBKEY_TO_DER_PQ "format=der,type=public"
+ #define OSSL_SERIALIZER_PrivateKey_TO_DER_PQ "format=der,type=private"
+ #define OSSL_SERIALIZER_Parameters_TO_DER_PQ "format=der,type=parameters"
+
  #define OSSL_SERIALIZER_PUBKEY_TO_TEXT_PQ "format=text,type=public"
  #define OSSL_SERIALIZER_PrivateKey_TO_TEXT_PQ "format=text,type=private"
  #define OSSL_SERIALIZER_Parameters_TO_TEXT_PQ "format=text,type=parameters"
@@ -84,11 +91,14 @@ through an internal B<OSSL_PASSPHRASE_CALLBACK> function.
 The macros B<OSSL_SERIALIZER_PUBKEY_TO_PEM_PQ>,
 B<OSSL_SERIALIZER_PrivateKey_TO_PEM_PQ>,
 B<OSSL_SERIALIZER_Parameters_TO_PEM_PQ>,
+B<OSSL_SERIALIZER_PUBKEY_TO_DER_PQ>,
+B<OSSL_SERIALIZER_PrivateKey_TO_DER_PQ>,
+B<OSSL_SERIALIZER_Parameters_TO_DER_PQ>,
 B<OSSL_SERIALIZER_PUBKEY_TO_TEXT_PQ>,
 B<OSSL_SERIALIZER_PrivateKey_TO_TEXT_PQ>,
 B<OSSL_SERIALIZER_Parameters_TO_TEXT_PQ> are convenience macros with
 property queries to serialize the B<EVP_PKEY> as a public key, private
-key or parameters to B<PEM>, or to text.
+key or parameters to B<PEM>, to B<DER>, or to text.
 
 =head1 RETURN VALUES
 

diff --git a/util/other.syms b/util/other.syms
index 78d436f73a700a0854110e8d3b167165a53f6dca..378dda3659c353fa087324e5992fc33386317949 100644 (file)
--- a/util/other.syms
+++ b/util/other.syms
@@ -384,6 +384,9 @@ OSSL_PARAM_utf8_string                  define
 OSSL_PARAM_get_TYPE                     generic
 OSSL_PARAM_END                          define
 OSSL_PARAM_set_TYPE                     generic
+OSSL_SERIALIZER_PUBKEY_TO_DER_PQ        define
+OSSL_SERIALIZER_PrivateKey_TO_DER_PQ    define
+OSSL_SERIALIZER_Parameters_TO_DER_PQ    define
 OSSL_SERIALIZER_PUBKEY_TO_PEM_PQ        define
 OSSL_SERIALIZER_PrivateKey_TO_PEM_PQ    define
 OSSL_SERIALIZER_Parameters_TO_PEM_PQ    define