diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-05-30 16:24:05 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-05-31 14:50:22 +0200 |
| commit | 9726339ab6cbb1a70fc1e4daecb7b094730a3576 (patch) | |
| tree | 67d27f5bfa6783d4441cc30719248081deb74a8d | |
| parent | 1a115a830c68348f3ece73a3eb6fe3c57982de29 (diff) | |
| download | gnutls-9726339ab6cbb1a70fc1e4daecb7b094730a3576.tar.gz | |
Separated use of GNUTLS_PRIVKEY_FLAG_PROVABLE and GNUTLS_PRIVKEY_SIGN_FLAG_REPRODUCIBLE
For simplicity, rename GNUTLS_PRIVKEY_SIGN_FLAG_REPRODUCIBLE to GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | lib/includes/gnutls/abstract.h | 4 | ||||
| -rw-r--r-- | lib/privkey.c | 2 | ||||
| -rw-r--r-- | lib/x509/privkey.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h index 2182a96597..5acc6bc555 100644 --- a/lib/includes/gnutls/abstract.h +++ b/lib/includes/gnutls/abstract.h @@ -268,7 +268,7 @@ int gnutls_privkey_status(gnutls_privkey_t key); * gnutls_privkey_flags: * @GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA: Make an RSA signature on the hashed data as in the TLS protocol. * @GNUTLS_PRIVKEY_SIGN_FLAG_RSA_PSS: Make an RSA signature on the hashed data with the PSS padding. - * @GNUTLS_PRIVKEY_SIGN_FLAG_REPRODUCIBLE: Make an RSA-PSS signature on the hashed data with reproducible parameters (zero salt). + * @GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE: Make an RSA-PSS signature on the hashed data with reproducible parameters (zero salt). * @GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE: When importing a private key, automatically * release it when the structure it was imported is released. * @GNUTLS_PRIVKEY_IMPORT_COPY: Copy required values during import. @@ -289,7 +289,7 @@ typedef enum gnutls_privkey_flags { GNUTLS_PRIVKEY_FLAG_PROVABLE = 1 << 5, GNUTLS_PRIVKEY_FLAG_EXPORT_COMPAT = 1 << 6, GNUTLS_PRIVKEY_SIGN_FLAG_RSA_PSS = 1 << 7, - GNUTLS_PRIVKEY_SIGN_FLAG_REPRODUCIBLE = GNUTLS_PRIVKEY_FLAG_PROVABLE /* save a flag, they are not overlapping */ + GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE = 1 << 8 } gnutls_privkey_flags_t; int gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey, diff --git a/lib/privkey.c b/lib/privkey.c index e92ce49763..2cde9e7339 100644 --- a/lib/privkey.c +++ b/lib/privkey.c @@ -386,7 +386,7 @@ _gnutls_privkey_update_sign_params(gnutls_privkey_t key, salt_size = params->salt_size; } - if (!(flags & GNUTLS_PRIVKEY_SIGN_FLAG_REPRODUCIBLE)) + if (!(flags & GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE)) salt_size = _gnutls_find_rsa_pss_salt_size(bits, me, salt_size); } diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 6015b7610b..48fb5c9e6c 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -1605,7 +1605,7 @@ gnutls_x509_privkey_generate2(gnutls_x509_privkey_t key, goto cleanup; } - if (flags & GNUTLS_PRIVKEY_FLAG_PROVABLE) + if (flags & GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE) key->params.sign.salt_size = 0; else { key->params.sign.salt_size = |