diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2011-08-13 11:26:03 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2011-08-13 11:26:03 +0200 |
commit | 74d755873d24b692300dbd8ea9b91c4c4f03c368 (patch) | |
tree | b636ea423c06d691065691037c7b0a0660a9e8c4 | |
parent | 30ec1e0b057948b07b70ea1136a16ea5e731d87c (diff) | |
download | libssh-74d755873d24b692300dbd8ea9b91c4c4f03c368.tar.gz libssh-74d755873d24b692300dbd8ea9b91c4c4f03c368.tar.xz libssh-74d755873d24b692300dbd8ea9b91c4c4f03c368.zip |
pki: Use const.
-rw-r--r-- | include/libssh/libssh.h | 6 | ||||
-rw-r--r-- | include/libssh/pki.h | 7 | ||||
-rw-r--r-- | src/pki.c | 14 |
3 files changed, 14 insertions, 13 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index 8e606d5..d0c02bf 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -419,11 +419,11 @@ LIBSSH_API enum ssh_keytypes_e ssh_privatekey_type(ssh_private_key privatekey); LIBSSH_API ssh_key ssh_key_new(void); LIBSSH_API void ssh_key_free (ssh_key key); -LIBSSH_API enum ssh_keytypes_e ssh_key_type(ssh_key key); +LIBSSH_API enum ssh_keytypes_e ssh_key_type(const ssh_key key); LIBSSH_API const char *ssh_key_type_to_char(enum ssh_keytypes_e type); LIBSSH_API enum ssh_keytypes_e ssh_key_type_from_name(const char *name); -LIBSSH_API int ssh_key_is_public(ssh_key k); -LIBSSH_API int ssh_key_is_private(ssh_key k); +LIBSSH_API int ssh_key_is_public(const ssh_key k); +LIBSSH_API int ssh_key_is_private(const ssh_key k); LIBSSH_API int ssh_pki_import_privkey_base64(ssh_session session, const char *b64_key, diff --git a/include/libssh/pki.h b/include/libssh/pki.h index 49f8a5e..81414aa 100644 --- a/include/libssh/pki.h +++ b/include/libssh/pki.h @@ -48,7 +48,7 @@ struct ssh_key_struct { void ssh_key_clean (ssh_key key); -ssh_key ssh_pki_publickey_from_privatekey(ssh_key privkey); +ssh_key ssh_pki_publickey_from_privatekey(const ssh_key privkey); ssh_string ssh_pki_do_sign(ssh_session session, ssh_buffer sigbuf, ssh_key privatekey); @@ -61,7 +61,7 @@ enum ssh_keytypes_e pki_privatekey_type_from_string(const char *privkey); ssh_key pki_private_key_from_base64(ssh_session session, const char *b64_key, const char *passphrase); -ssh_key pki_publickey_from_privatekey(ssh_key privkey); +ssh_key pki_publickey_from_privatekey(const ssh_key privkey); int pki_pubkey_build_dss(ssh_key key, ssh_string p, ssh_string q, @@ -70,7 +70,8 @@ int pki_pubkey_build_dss(ssh_key key, int pki_pubkey_build_rsa(ssh_key key, ssh_string e, ssh_string n); -struct signature_struct *pki_do_sign(ssh_key privatekey, + +struct signature_struct *pki_do_sign(const ssh_key privatekey, const unsigned char *hash); #endif /* PKI_H_ */ @@ -107,7 +107,7 @@ void ssh_key_free (ssh_key key){ * @returns one of SSH_KEYTYPE_RSA,SSH_KEYTYPE_DSS,SSH_KEYTYPE_RSA1 * @returns SSH_KEYTYPE_UNKNOWN if the type is unknown */ -enum ssh_keytypes_e ssh_key_type(ssh_key key){ +enum ssh_keytypes_e ssh_key_type(const ssh_key key){ if (key == NULL) { return SSH_KEYTYPE_UNKNOWN; } @@ -176,7 +176,7 @@ enum ssh_keytypes_e ssh_key_type_from_name(const char *name) { * * @return 1 if it is a public key, 0 if not. */ -int ssh_key_is_public(ssh_key k) { +int ssh_key_is_public(const ssh_key k) { if (k == NULL) { return 0; } @@ -191,7 +191,7 @@ int ssh_key_is_public(ssh_key k) { * * @return 1 if it is a private key, 0 if not. */ -int ssh_key_is_private(ssh_key k) { +int ssh_key_is_private(const ssh_key k) { if (k == NULL) { return 0; } @@ -281,7 +281,7 @@ int ssh_pki_import_privkey_file(ssh_session session, } /* temporary function to migrate seemlessly to ssh_key */ -ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key) { +ssh_public_key ssh_pki_convert_key_to_publickey(const ssh_key key) { ssh_public_key pub; if(key == NULL) { @@ -302,7 +302,7 @@ ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key) { return pub; } -ssh_private_key ssh_pki_convert_key_to_privatekey(ssh_key key) { +ssh_private_key ssh_pki_convert_key_to_privatekey(const ssh_key key) { ssh_private_key privkey; privkey = malloc(sizeof(struct ssh_private_key_struct)); @@ -508,7 +508,7 @@ fail: * * @return A public key, NULL on error. */ -ssh_key ssh_pki_publickey_from_privatekey(ssh_key privkey) { +ssh_key ssh_pki_publickey_from_privatekey(const ssh_key privkey) { return pki_publickey_from_privatekey(privkey); } @@ -516,7 +516,7 @@ ssh_key ssh_pki_publickey_from_privatekey(ssh_key privkey) { * This function signs the session id (known as H) as a string then * the content of sigbuf */ ssh_string ssh_pki_do_sign(ssh_session session, ssh_buffer sigbuf, - ssh_key privatekey) { + const ssh_key privatekey) { struct ssh_crypto_struct *crypto = session->current_crypto ? session->current_crypto : session->next_crypto; unsigned char hash[SHA_DIGEST_LEN + 1] = {0}; |