mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-03-22 14:39:24 -05:00
Move prototypes for base64_decode_atom(), base64_lines(), and base64_encode()
from import.c to ssh.h, so that the implementation can see them. This necessitates ssh.h's including <stdio.h>. Also remove a spare prototype for base64_encode_atom() from import.c. [originally from svn r2481]
This commit is contained in:
parent
9671370f14
commit
a6c994ca94
5
import.c
5
import.c
@ -122,11 +122,6 @@ int export_ssh2(char *filename, int type,
|
|||||||
(c) == '+' || (c) == '/' || (c) == '=' \
|
(c) == '+' || (c) == '/' || (c) == '=' \
|
||||||
)
|
)
|
||||||
|
|
||||||
extern int base64_decode_atom(char *atom, unsigned char *out);
|
|
||||||
extern int base64_lines(int datalen);
|
|
||||||
extern void base64_encode_atom(unsigned char *data, int n, char *out);
|
|
||||||
extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Read an ASN.1/BER identifier and length pair.
|
* Read an ASN.1/BER identifier and length pair.
|
||||||
*
|
*
|
||||||
|
6
ssh.h
6
ssh.h
@ -1,3 +1,4 @@
|
|||||||
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "puttymem.h"
|
#include "puttymem.h"
|
||||||
@ -316,7 +317,10 @@ int rsakey_pubblob(char *filename, void **blob, int *bloblen);
|
|||||||
|
|
||||||
int saversakey(char *filename, struct RSAKey *key, char *passphrase);
|
int saversakey(char *filename, struct RSAKey *key, char *passphrase);
|
||||||
|
|
||||||
void base64_encode_atom(unsigned char *data, int n, char *out);
|
extern int base64_decode_atom(char *atom, unsigned char *out);
|
||||||
|
extern int base64_lines(int datalen);
|
||||||
|
extern void base64_encode_atom(unsigned char *data, int n, char *out);
|
||||||
|
extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl);
|
||||||
|
|
||||||
/* ssh2_load_userkey can return this as an error */
|
/* ssh2_load_userkey can return this as an error */
|
||||||
extern struct ssh2_userkey ssh2_wrong_passphrase;
|
extern struct ssh2_userkey ssh2_wrong_passphrase;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user