mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 01:48:00 +00:00
ff2ffa539c
The test in the Pageant list box code for whether we should display the bit count of a key was done by checking specifically for ssh_rsa or ssh_dsa, which of course meant that it didn't catch the certified versions of those keys. Now there's yet another footling ssh_keyalg method that asks the question 'is it worth displaying the bit count?', to which RSA and DSA answer yes, and the opensshcert family delegates to its base key type, so that RSA and DSA certified keys also answer yes. (This isn't the same as ssh_key_public_bits(alg, blob) >= 0. All supported public key algorithms _can_ display a bit count if called on. But only in RSA and DSA is it configurable, and therefore worth bothering to print in the list box.) Also in this commit, I've fixed a bug in the certificate implementation of public_bits, which was passing a wrongly formatted public blob to the underlying key. (Done by factoring out the code from opensshcert_new_shared which constructed the _correct_ public blob, and reusing it in public_bits to do the same job.)
23 lines
519 B
C
23 lines
519 B
C
#include "misc.h"
|
|
#include "ssh.h"
|
|
|
|
unsigned nullkey_supported_flags(const ssh_keyalg *self)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
const char *nullkey_alternate_ssh_id(const ssh_keyalg *self, unsigned flags)
|
|
{
|
|
/* There are no alternate ids */
|
|
return self->ssh_id;
|
|
}
|
|
|
|
ssh_key *nullkey_base_key(ssh_key *key)
|
|
{
|
|
/* When a key is not certified, it is its own base */
|
|
return key;
|
|
}
|
|
|
|
bool nullkey_variable_size_no(const ssh_keyalg *self) { return false; }
|
|
bool nullkey_variable_size_yes(const ssh_keyalg *self) { return true; }
|