=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/key.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- src/usr.bin/ssh/Attic/key.c 2003/07/09 13:58:19 1.54 +++ src/usr.bin/ssh/Attic/key.c 2003/11/10 16:23:41 1.55 @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: key.c,v 1.54 2003/07/09 13:58:19 avsm Exp $"); +RCSID("$OpenBSD: key.c,v 1.55 2003/11/10 16:23:41 jakob Exp $"); #include @@ -143,8 +143,9 @@ } xfree(k); } + int -key_equal(Key *a, Key *b) +key_equal(const Key *a, const Key *b) { if (a == NULL || b == NULL || a->type != b->type) return 0; @@ -170,7 +171,8 @@ } u_char* -key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) +key_fingerprint_raw(const Key *k, enum fp_type dgst_type, + u_int *dgst_raw_length) { const EVP_MD *md = NULL; EVP_MD_CTX ctx; @@ -292,7 +294,7 @@ } char * -key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) +key_fingerprint(const Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) { char *retval = NULL; u_char *dgst_raw; @@ -490,7 +492,7 @@ } int -key_write(Key *key, FILE *f) +key_write(const Key *key, FILE *f) { int n, success = 0; u_int len, bits = 0; @@ -522,8 +524,8 @@ return success; } -char * -key_type(Key *k) +const char * +key_type(const Key *k) { switch (k->type) { case KEY_RSA1: @@ -539,8 +541,8 @@ return "unknown"; } -char * -key_ssh_name(Key *k) +const char * +key_ssh_name(const Key *k) { switch (k->type) { case KEY_RSA: @@ -554,7 +556,7 @@ } u_int -key_size(Key *k) +key_size(const Key *k) { switch (k->type) { case KEY_RSA1: @@ -611,7 +613,7 @@ } Key * -key_from_private(Key *k) +key_from_private(const Key *k) { Key *n = NULL; switch (k->type) { @@ -676,7 +678,7 @@ } Key * -key_from_blob(u_char *blob, u_int blen) +key_from_blob(const u_char *blob, u_int blen) { Buffer b; char *ktype; @@ -726,7 +728,7 @@ } int -key_to_blob(Key *key, u_char **blobp, u_int *lenp) +key_to_blob(const Key *key, u_char **blobp, u_int *lenp) { Buffer b; int len; @@ -768,9 +770,9 @@ int key_sign( - Key *key, + const Key *key, u_char **sigp, u_int *lenp, - u_char *data, u_int datalen) + const u_char *data, u_int datalen) { switch (key->type) { case KEY_DSA: @@ -792,9 +794,9 @@ */ int key_verify( - Key *key, - u_char *signature, u_int signaturelen, - u_char *data, u_int datalen) + const Key *key, + const u_char *signature, u_int signaturelen, + const u_char *data, u_int datalen) { if (signaturelen == 0) return -1; @@ -815,7 +817,7 @@ /* Converts a private to a public key */ Key * -key_demote(Key *k) +key_demote(const Key *k) { Key *pk;