lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

pki: Use const.

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-13 11:26:03 +02:00
parent 30ec1e0b05
commit 74d755873d
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libssh/libssh.h
View File

@@ -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 ssh_key ssh_key_new(void);
LIBSSH_API void ssh_key_free (ssh_key key); 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 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 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_public(const ssh_key k);
LIBSSH_API int ssh_key_is_private(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, LIBSSH_API int ssh_pki_import_privkey_base64(ssh_session session,
const char *b64_key, const char *b64_key,

7
include/libssh/pki.h
View File

@@ -48,7 +48,7 @@ struct ssh_key_struct {
void ssh_key_clean (ssh_key key); 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_string ssh_pki_do_sign(ssh_session session, ssh_buffer sigbuf,
ssh_key privatekey); 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, ssh_key pki_private_key_from_base64(ssh_session session,
const char *b64_key, const char *b64_key,
const char *passphrase); 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, int pki_pubkey_build_dss(ssh_key key,
ssh_string p, ssh_string p,
ssh_string q, ssh_string q,
@@ -70,7 +70,8 @@ int pki_pubkey_build_dss(ssh_key key,
int pki_pubkey_build_rsa(ssh_key key, int pki_pubkey_build_rsa(ssh_key key,
ssh_string e, ssh_string e,
ssh_string n); 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); const unsigned char *hash);
#endif /* PKI_H_ */ #endif /* PKI_H_ */

14
src/pki.c
View File

@@ -107,7 +107,7 @@ void ssh_key_free (ssh_key key){
* @returns one of SSH_KEYTYPE_RSA,SSH_KEYTYPE_DSS,SSH_KEYTYPE_RSA1 * @returns one of SSH_KEYTYPE_RSA,SSH_KEYTYPE_DSS,SSH_KEYTYPE_RSA1
* @returns SSH_KEYTYPE_UNKNOWN if the type is unknown * @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) { if (key == NULL) {
return SSH_KEYTYPE_UNKNOWN; 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. * @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) { if (k == NULL) {
return 0; 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. * @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) { if (k == NULL) {
return 0; return 0;
} }
@@ -281,7 +281,7 @@ int ssh_pki_import_privkey_file(ssh_session session,
} }
/* temporary function to migrate seemlessly to ssh_key */ /* 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; ssh_public_key pub;
if(key == NULL) { if(key == NULL) {
@@ -302,7 +302,7 @@ ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key) {
return pub; 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; ssh_private_key privkey;
privkey = malloc(sizeof(struct ssh_private_key_struct)); privkey = malloc(sizeof(struct ssh_private_key_struct));
@@ -508,7 +508,7 @@ fail:
* *
* @return A public key, NULL on error. * @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); 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 * This function signs the session id (known as H) as a string then
* the content of sigbuf */ * the content of sigbuf */
ssh_string ssh_pki_do_sign(ssh_session session, ssh_buffer 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 : struct ssh_crypto_struct *crypto = session->current_crypto ? session->current_crypto :
session->next_crypto; session->next_crypto;
unsigned char hash[SHA_DIGEST_LEN + 1] = {0}; unsigned char hash[SHA_DIGEST_LEN + 1] = {0};