diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-07-25 11:37:04 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-03 11:57:52 +0200 |
| commit | 66cb33d888428312c5f11f3e9e1d1b9adeb431e8 (patch) | |
| tree | 379981337bcab60ddf3506357d5ef1b5b51cbfba /src | |
| parent | 958f45aae0c8f4f5f2f9798ad883051caa1acbc9 (diff) | |
| download | gnutls-66cb33d888428312c5f11f3e9e1d1b9adeb431e8.tar.gz | |
x509.h: Renamed SPKI related functions
This better reflects their purpose as providers of information
for subject public key. In addition use 'const' for fields that
should be left intact.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/certtool-common.c | 17 | ||||
| -rw-r--r-- | src/certtool.c | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/certtool-common.c b/src/certtool-common.c index 6ab2238429..8691fcfe88 100644 --- a/src/certtool-common.c +++ b/src/certtool-common.c @@ -1128,15 +1128,23 @@ static void privkey_info_int(FILE *outfile, common_info_st * cinfo, ret = gnutls_x509_spki_init(&spki); if (ret < 0) { fprintf(stderr, "spki_init: %s\n", gnutls_strerror(ret)); + return; } - ret = gnutls_x509_privkey_get_pk_algorithm3(key, spki, &bits); + fprintf(outfile, "\tPublic Key Algorithm: "); - key_type = ret; + key_type = gnutls_x509_privkey_get_pk_algorithm2(key, &bits); cprint = gnutls_pk_algorithm_get_name(key_type); fprintf(outfile, "%s\n", cprint ? cprint : "Unknown"); - if (spki && key_type == GNUTLS_PK_RSA_PSS) { + + if (key_type == GNUTLS_PK_RSA_PSS) { + ret = gnutls_x509_privkey_get_spki(key, spki, 0); + if (ret < 0) { + fprintf(stderr, "spki_get: %s\n", gnutls_strerror(ret)); + goto spki_skip; + } + ret = gnutls_x509_spki_get_digest_algorithm(spki); if (ret < 0) { fprintf(stderr, "spki_get_digest_algorithm: %s\n", @@ -1145,6 +1153,7 @@ static void privkey_info_int(FILE *outfile, common_info_st * cinfo, fprintf(outfile, "\t\tHash Algorithm: %s\n", gnutls_digest_get_name(ret)); } + ret = gnutls_x509_spki_get_salt_size(spki); if (ret < 0) { fprintf(stderr, "spki_get_salt_size: %s\n", @@ -1152,6 +1161,8 @@ static void privkey_info_int(FILE *outfile, common_info_st * cinfo, } else fprintf(outfile, "\t\tSalt Length: %d\n", ret); } + + spki_skip: gnutls_x509_spki_deinit(spki); fprintf(outfile, "\tKey Security Level: %s (%u bits)\n\n", gnutls_sec_param_get_name(gnutls_x509_privkey_sec_param diff --git a/src/certtool.c b/src/certtool.c index d6220c6a60..c92095a497 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -699,7 +699,7 @@ generate_certificate(gnutls_privkey_t * ret_key, gnutls_x509_spki_set_pk_algorithm(spki, GNUTLS_PK_RSA_PSS); gnutls_x509_spki_set_digest_algorithm(spki, get_dig(crt)); - result = gnutls_x509_crt_set_pk_algorithm(crt, spki, 0); + result = gnutls_x509_crt_set_spki(crt, spki, 0); gnutls_x509_spki_deinit(spki); if (result < 0) { fprintf(stderr, "error setting signing algorithm: %s\n", |