From: Matt Caswell <matt@openssl.org>
Date: Thu, 5 Sep 2019 13:57:06 +0000 (+0100)
Subject: Use simple names in core_names.h
X-Git-Tag: openssl-3.0.0-alpha1~1415
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=20bf3d8b22f8c1a3529034007d3618fd1fc4fa16;p=oweals%2Fopenssl.git

Use simple names in core_names.h

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9753)
---

diff --git a/doc/man3/EVP_PKEY_CTX_ctrl.pod b/doc/man3/EVP_PKEY_CTX_ctrl.pod
index 18b984162e..13ea570865 100644
--- a/doc/man3/EVP_PKEY_CTX_ctrl.pod
+++ b/doc/man3/EVP_PKEY_CTX_ctrl.pod
@@ -163,7 +163,7 @@ The parameters currently supported by the default provider are:
 
 =over 4
 
-=item "exchange-pad" (B<OSSL_EXCHANGE_PARAM_PAD>) <uint>
+=item "pad" (B<OSSL_EXCHANGE_PARAM_PAD>) <uint>
 
 Sets the DH padding mode.
 If B<OSSL_EXCHANGE_PARAM_PAD> is 1 then the  shared secret is padded with zeroes
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h
index 5a75aaf280..27b4588ce1 100644
--- a/include/openssl/core_names.h
+++ b/include/openssl/core_names.h
@@ -130,21 +130,21 @@ extern "C" {
 
 /* PKEY parameters */
 /* Diffie-Hellman/DSA Parameters */
-#define OSSL_PKEY_PARAM_FFC_P        "ffc-p"
-#define OSSL_PKEY_PARAM_FFC_G        "ffc-g"
-#define OSSL_PKEY_PARAM_FFC_Q        "ffc-q"
+#define OSSL_PKEY_PARAM_FFC_P        "p"
+#define OSSL_PKEY_PARAM_FFC_G        "g"
+#define OSSL_PKEY_PARAM_FFC_Q        "q"
 
 /* Diffie-Hellman Keys */
-#define OSSL_PKEY_PARAM_DH_PUB_KEY   "dh-pub"
-#define OSSL_PKEY_PARAM_DH_PRIV_KEY  "dh-priv"
+#define OSSL_PKEY_PARAM_DH_PUB_KEY   "pub"
+#define OSSL_PKEY_PARAM_DH_PRIV_KEY  "priv"
 
 /* DSA Keys */
-#define OSSL_PKEY_PARAM_DSA_PUB_KEY  "dsa-pub"
-#define OSSL_PKEY_PARAM_DSA_PRIV_KEY "dsa-priv"
+#define OSSL_PKEY_PARAM_DSA_PUB_KEY  "pub"
+#define OSSL_PKEY_PARAM_DSA_PRIV_KEY "priv"
 
 /* Key Exchange parameters */
 
-#define OSSL_EXCHANGE_PARAM_PAD      "exchange-pad" /* uint */
+#define OSSL_EXCHANGE_PARAM_PAD      "pad" /* uint */
 
 /* Signature parameters */
 #define OSSL_SIGNATURE_PARAM_DIGEST         "digest"