Added support for reporting usage metrics.

[gssapi-openssh.git] / openssh / authfd.c

diff --git a/openssh/authfd.c b/openssh/authfd.c
index f3050d64db29e9bbed21f2d5c67fb258d09594eb..d6366ee36c748dbdfeca54ffd18bf64312a00006 100644 (file)
--- a/openssh/authfd.c
+++ b/openssh/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.49 2002/03/21 22:44:05 rees Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.45 2001/09/19 19:35:30 stevesk Exp $");
 
 #include <openssl/evp.h>
 
@@ -217,7 +217,7 @@ ssh_get_num_identities(AuthenticationConnection *auth, int version)
        int type, code1 = 0, code2 = 0;
        Buffer request;
 
-       switch (version) {
+       switch(version){
        case 1:
                code1 = SSH_AGENTC_REQUEST_RSA_IDENTITIES;
                code2 = SSH_AGENT_RSA_IDENTITIES_ANSWER;
@@ -286,7 +286,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
         * Get the next entry from the packet.  These will abort with a fatal
         * error if the packet is too short or contains corrupt data.
         */
-       switch (version) {
+       switch(version){
        case 1:
                key = key_new(KEY_RSA1);
                bits = buffer_get_int(&auth->identities);
@@ -344,7 +344,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
        buffer_put_bignum(&buffer, key->rsa->e);
        buffer_put_bignum(&buffer, key->rsa->n);
        buffer_put_bignum(&buffer, challenge);
-       buffer_append(&buffer, session_id, 16);
+       buffer_append(&buffer, (char *) session_id, 16);
        buffer_put_int(&buffer, response_type);
 
        if (ssh_request_reply(auth, &buffer, &buffer) == 0) {
@@ -374,8 +374,8 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
 int
 ssh_agent_sign(AuthenticationConnection *auth,
     Key *key,
-    u_char **sigp, u_int *lenp,
-    u_char *data, u_int datalen)
+    u_char **sigp, int *lenp,
+    u_char *data, int datalen)
 {
        extern int datafellows;
        Buffer msg;
@@ -438,7 +438,7 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
        buffer_clear(b);
        buffer_put_char(b, SSH2_AGENTC_ADD_IDENTITY);
        buffer_put_cstring(b, key_ssh_name(key));
-       switch (key->type) {
+       switch(key->type){
        case KEY_RSA:
                buffer_put_bignum2(b, key->rsa->n);
                buffer_put_bignum2(b, key->rsa->e);
@@ -532,7 +532,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
 }
 
 int
-ssh_update_card(AuthenticationConnection *auth, int add, const char *reader_id, const char *pin)
+ssh_update_card(AuthenticationConnection *auth, int add, const char *reader_id)
 {
        Buffer msg;
        int type;
@@ -541,7 +541,6 @@ ssh_update_card(AuthenticationConnection *auth, int add, const char *reader_id,
        buffer_put_char(&msg, add ? SSH_AGENTC_ADD_SMARTCARD_KEY :
            SSH_AGENTC_REMOVE_SMARTCARD_KEY);
        buffer_put_cstring(&msg, reader_id);
-       buffer_put_cstring(&msg, pin);
        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                buffer_free(&msg);
                return 0;