summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-01-17 17:51:24 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-01-18 15:04:49 +0000
commit137096a7ead3738a0035b9e760b7c3f74b7555a3 (patch)
tree1e1da10e1044bd833d02c551710a93846fb3835e /include
parent3c441c2eb7688837ca2884f2be0c0abd1095abb5 (diff)
Defines and strings for special salt length values, add tests
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2236)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/rsa.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index b9179b36ff..8ad4cdaf1e 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -94,6 +94,14 @@ extern "C" {
# define EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, len) \
RSA_pkey_ctx_ctrl(ctx, (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
EVP_PKEY_CTRL_RSA_PSS_SALTLEN, len, NULL)
+/* Salt length matches digest */
+# define RSA_PSS_SALTLEN_DIGEST -1
+/* Verify only: auto detect salt length */
+# define RSA_PSS_SALTLEN_AUTO -2
+/* Set salt length to maximum possible */
+# define RSA_PSS_SALTLEN_MAX -3
+/* Old compatible max salt length for sign only */
+# define RSA_PSS_SALTLEN_MAX_SIGN -2
# define EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(ctx, len) \
EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN, \