← Back to branch summary

~ubuntu-branches/ubuntu/dapper/openssh/dapper

« back to all changes in this revision

Viewing changes to authfile.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2005-10-31 07:46:44 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20051031074644-poik7e4un4723tr4
Tags: 1:4.2p1-5ubuntu1
Resynchronise with Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
authfile.c
36
36
 */
37
37
 
38
38
#include "includes.h"
39
 
RCSID("$OpenBSD: authfile.c,v 1.60 2004/12/11 01:48:56 dtucker Exp $");
 
39
RCSID("$OpenBSD: authfile.c,v 1.61 2005/06/17 02:44:32 djm Exp $");
40
40
 
41
41
#include <openssl/err.h>
42
42
#include <openssl/evp.h>
52
52
#include "authfile.h"
53
53
#include "rsa.h"
54
54
#include "misc.h"
 
55
#include "atomicio.h"
55
56
 
56
57
/* Version identification string for SSH v1 identity files. */
57
58
static const char authfile_id_string[] =
147
148
                buffer_free(&encrypted);
148
149
                return 0;
149
150
        }
150
 
        if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) !=
151
 
            buffer_len(&encrypted)) {
 
151
        if (atomicio(vwrite, fd, buffer_ptr(&encrypted),
 
152
            buffer_len(&encrypted)) != buffer_len(&encrypted)) {
152
153
                error("write to key file %s failed: %s", filename,
153
154
                    strerror(errno));
154
155
                buffer_free(&encrypted);
236
237
        Key *pub;
237
238
        struct stat st;
238
239
        char *cp;
239
 
        int i;
 
240
        u_int i;
240
241
        size_t len;
241
242
 
242
243
        if (fstat(fd, &st) < 0) {
253
254
        buffer_init(&buffer);
254
255
        cp = buffer_append_space(&buffer, len);
255
256
 
256
 
        if (read(fd, cp, (size_t) len) != (size_t) len) {
 
257
        if (atomicio(read, fd, cp, len) != len) {
257
258
                debug("Read from key file %.200s failed: %.100s", filename,
258
259
                    strerror(errno));
259
260
                buffer_free(&buffer);
322
323
key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
323
324
    char **commentp)
324
325
{
325
 
        int i, check1, check2, cipher_type;
 
326
        u_int i;
 
327
        int check1, check2, cipher_type;
326
328
        size_t len;
327
329
        Buffer buffer, decrypted;
328
330
        u_char *cp;
347
349
        buffer_init(&buffer);
348
350
        cp = buffer_append_space(&buffer, len);
349
351
 
350
 
        if (read(fd, cp, (size_t) len) != (size_t) len) {
 
352
        if (atomicio(read, fd, cp, len) != len) {
351
353
                debug("Read from key file %.200s failed: %.100s", filename,
352
354
                    strerror(errno));
353
355
                buffer_free(&buffer);