Added support for reporting usage metrics.

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

diff --git a/openssh/authfd.c b/openssh/authfd.c
index 4c4552d527f0deab67941c2b2a814ae2249a58e9..d6366ee36c748dbdfeca54ffd18bf64312a00006 100644 (file)
--- a/openssh/authfd.c
+++ b/openssh/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.56 2002/06/25 16:22:42 markus Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.45 2001/09/19 19:35:30 stevesk Exp $");
 
 #include <openssl/evp.h>
 
@@ -59,7 +59,7 @@ int   decode_reply(int type);
 /* macro to check for "agent failure" message */
 #define agent_failed(x) \
     ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \
-    (x == SSH2_AGENT_FAILURE))
+     (x == SSH2_AGENT_FAILURE))
 
 /* Returns the number of the authentication fd, or -1 if there is none. */
 
@@ -144,7 +144,7 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply
                        error("Error reading response from authentication socket.");
                        return 0;
                }
-               buffer_append(reply, buf, l);
+               buffer_append(reply, (char *) buf, l);
                len -= l;
        }
        return 1;
@@ -207,26 +207,6 @@ ssh_close_authentication_connection(AuthenticationConnection *auth)
        xfree(auth);
 }
 
-/* Lock/unlock agent */
-int
-ssh_lock_agent(AuthenticationConnection *auth, int lock, const char *password)
-{
-       int type;
-       Buffer msg;
-
-       buffer_init(&msg);
-       buffer_put_char(&msg, lock ? SSH_AGENTC_LOCK : SSH_AGENTC_UNLOCK);
-       buffer_put_cstring(&msg, password);
-
-       if (ssh_request_reply(auth, &msg, &msg) == 0) {
-               buffer_free(&msg);
-               return 0;
-       }
-       type = buffer_get_char(&msg);
-       buffer_free(&msg);
-       return decode_reply(type);
-}
-
 /*
  * Returns the first authentication identity held by the agent.
  */
@@ -237,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;
@@ -306,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);
@@ -364,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) {
@@ -394,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;
@@ -439,6 +419,8 @@ ssh_agent_sign(AuthenticationConnection *auth,
 static void
 ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
 {
+       buffer_clear(b);
+       buffer_put_char(b, SSH_AGENTC_ADD_RSA_IDENTITY);
        buffer_put_int(b, BN_num_bits(key->n));
        buffer_put_bignum(b, key->n);
        buffer_put_bignum(b, key->e);
@@ -453,8 +435,10 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
 static void
 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);
@@ -480,28 +464,19 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
  */
 
 int
-ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
-    const char *comment, u_int life)
+ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
 {
        Buffer msg;
-       int type, constrained = (life != 0);
+       int type;
 
        buffer_init(&msg);
 
        switch (key->type) {
        case KEY_RSA1:
-               type = constrained ?
-                   SSH_AGENTC_ADD_RSA_ID_CONSTRAINED :
-                   SSH_AGENTC_ADD_RSA_IDENTITY;
-               buffer_put_char(&msg, type);
                ssh_encode_identity_rsa1(&msg, key->rsa, comment);
                break;
        case KEY_RSA:
        case KEY_DSA:
-               type = constrained ?
-                   SSH2_AGENTC_ADD_ID_CONSTRAINED :
-                   SSH2_AGENTC_ADD_IDENTITY;
-               buffer_put_char(&msg, type);
                ssh_encode_identity_ssh2(&msg, key, comment);
                break;
        default:
@@ -509,12 +484,6 @@ ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
                return 0;
                break;
        }
-       if (constrained) {
-               if (life != 0) {
-                       buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
-                       buffer_put_int(&msg, life);
-               }
-       }
        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                buffer_free(&msg);
                return 0;
@@ -524,12 +493,6 @@ ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
        return decode_reply(type);
 }
 
-int
-ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
-{
-       return ssh_add_identity_constrained(auth, key, comment, 0);
-}
-
 /*
  * Removes an identity from the authentication server.  This call is not
  * meant to be used by normal applications.
@@ -569,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;
@@ -578,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;