DROPBEAR_ prefix for include guards to avoid collisions

This commit is contained in:
Thorsten Horstmann 2015-02-24 20:43:01 +08:00
parent 9abcc7b909
commit fdb7ffa864
38 changed files with 111 additions and 111 deletions

View File

@ -21,8 +21,8 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _AGENTFWD_H_
#define _AGENTFWD_H_
#ifndef DROPBEAR_AGENTFWD_H_
#define DROPBEAR_AGENTFWD_H_
#include "includes.h"
#include "chansession.h"
@ -60,4 +60,4 @@ void svr_agentset(struct ChanSess *chansess);
#endif /* ENABLE_SVR_AGENTFWD */
#endif /* _AGENTFWD_H_ */
#endif /* DROPBEAR_AGENTFWD_H_ */

6
algo.h
View File

@ -22,9 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _ALGO_H_
#ifndef DROPBEAR_ALGO_H_
#define _ALGO_H_
#define DROPBEAR_ALGO_H_
#include "includes.h"
#include "buffer.h"
@ -134,4 +134,4 @@ enum {
DROPBEAR_COMP_ZLIB_DELAY,
};
#endif /* _ALGO_H_ */
#endif /* DROPBEAR_ALGO_H_ */

6
auth.h
View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _AUTH_H_
#define _AUTH_H_
#ifndef DROPBEAR_AUTH_H_
#define DROPBEAR_AUTH_H_
#include "includes.h"
#include "signkey.h"
@ -137,4 +137,4 @@ struct PubKeyOptions {
};
#endif
#endif /* _AUTH_H_ */
#endif /* DROPBEAR_AUTH_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _BIGNUM_H_
#define _BIGNUM_H_
#ifndef DROPBEAR_BIGNUM_H_
#define DROPBEAR_BIGNUM_H_
#include "includes.h"
#include "dbutil.h"
@ -35,4 +35,4 @@ void bytes_to_mp(mp_int *mp, const unsigned char* bytes, unsigned int len);
void hash_process_mp(const struct ltc_hash_descriptor *hash_desc,
hash_state *hs, mp_int *mp);
#endif /* _BIGNUM_H_ */
#endif /* DROPBEAR_BIGNUM_H_ */

View File

@ -22,9 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _BUFFER_H_
#ifndef DROPBEAR_BUFFER_H_
#define _BUFFER_H_
#define DROPBEAR_BUFFER_H_
#include "includes.h"
@ -65,4 +65,4 @@ void buf_putmpint(buffer* buf, mp_int * mp);
int buf_getmpint(buffer* buf, mp_int* mp);
unsigned int buf_getint(buffer* buf);
#endif /* _BUFFER_H_ */
#endif /* DROPBEAR_BUFFER_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _CHANNEL_H_
#define _CHANNEL_H_
#ifndef DROPBEAR_CHANNEL_H_
#define DROPBEAR_CHANNEL_H_
#include "includes.h"
#include "buffer.h"
@ -137,4 +137,4 @@ void send_msg_request_success();
void send_msg_request_failure();
#endif /* _CHANNEL_H_ */
#endif /* DROPBEAR_CHANNEL_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _CHANSESSION_H_
#define _CHANSESSION_H_
#ifndef DROPBEAR_CHANSESSION_H_
#define DROPBEAR_CHANSESSION_H_
#include "loginrec.h"
#include "channel.h"
@ -103,4 +103,4 @@ struct SigMap {
extern const struct SigMap signames[];
#endif /* _CHANSESSION_H_ */
#endif /* DROPBEAR_CHANSESSION_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _CIRCBUFFER_H_
#define _CIRCBUFFER_H_
#ifndef DROPBEAR_CIRCBUFFER_H_
#define DROPBEAR_CIRCBUFFER_H_
struct circbuf {
unsigned int size;

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _COMPAT_H_
#define _COMPAT_H_
#ifndef DROPBEAR_COMPAT_H_
#define DROPBEAR_COMPAT_H_
#include "includes.h"
@ -49,8 +49,8 @@ void setusershell();
void endusershell();
#endif
#ifndef _PATH_DEVNULL
#define _PATH_DEVNULL "/dev/null"
#ifndef DROPBEAR_PATH_DEVNULL
#define DROPBEAR_PATH_DEVNULL "/dev/null"
#endif
#endif /* _COMPAT_H_ */
#endif /* DROPBEAR_COMPAT_H_ */

View File

@ -1,9 +1,9 @@
#ifndef _CRYPTO_DESC_H
#define _CRYPTO_DESC_H
#ifndef DROPBEAR_CRYPTO_DESC_H
#define DROPBEAR_CRYPTO_DESC_H
void crypto_init();
extern int dropbear_ltc_prng;
#endif /* _CRYPTO_DESC_H */
#endif /* DROPBEAR_CRYPTO_DESC_H */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _RANDOM_H_
#define _RANDOM_H_
#ifndef DROPBEAR_RANDOM_H_
#define DROPBEAR_RANDOM_H_
#include "includes.h"
@ -32,4 +32,4 @@ void genrandom(unsigned char* buf, unsigned int len);
void addrandom(char * buf, unsigned int len);
void gen_random_mpint(mp_int *max, mp_int *rand);
#endif /* _RANDOM_H_ */
#endif /* DROPBEAR_RANDOM_H_ */

View File

@ -22,9 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _DBUTIL_H_
#ifndef DROPBEAR_DBUTIL_H_
#define _DBUTIL_H_
#define DROPBEAR_DBUTIL_H_
#include "includes.h"
#include "buffer.h"
@ -112,4 +112,4 @@ time_t monotonic_now();
char * expand_tilde(const char *inpath);
#endif /* _DBUTIL_H_ */
#endif /* DROPBEAR_DBUTIL_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _DEBUG_H_
#define _DEBUG_H_
#ifndef DROPBEAR_DEBUG_H_
#define DROPBEAR_DEBUG_H_
#include "includes.h"

6
dss.h
View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _DSS_H_
#define _DSS_H_
#ifndef DROPBEAR_DSS_H_
#define DROPBEAR_DSS_H_
#include "includes.h"
#include "buffer.h"
@ -53,4 +53,4 @@ void dss_key_free(dropbear_dss_key *key);
#endif /* DROPBEAR_DSS */
#endif /* _DSS_H_ */
#endif /* DROPBEAR_DSS_H_ */

6
ecc.h
View File

@ -1,5 +1,5 @@
#ifndef _DROPBEAR_ECC_H
#define _DROPBEAR_ECC_H
#ifndef DROPBEAR_DROPBEAR_ECC_H
#define DROPBEAR_DROPBEAR_ECC_H
#include "includes.h"
#include "options.h"
@ -33,4 +33,4 @@ mp_int * dropbear_ecc_shared_secret(ecc_key *pub_key, ecc_key *priv_key);
#endif
#endif /* _DROPBEAR_ECC_H */
#endif /* DROPBEAR_DROPBEAR_ECC_H */

View File

@ -1,5 +1,5 @@
#ifndef _ECDSA_H_
#define _ECDSA_H_
#ifndef DROPBEAR_ECDSA_H_
#define DROPBEAR_ECDSA_H_
#include "includes.h"
#include "buffer.h"
@ -32,4 +32,4 @@ int signkey_is_ecdsa(enum signkey_type type);
#endif
#endif /* _ECDSA_H_ */
#endif /* DROPBEAR_ECDSA_H_ */

View File

@ -39,8 +39,8 @@
* that ai_family is AF_INET. Don't use it for another purpose.
*/
#ifndef _FAKE_RFC2553_H
#define _FAKE_RFC2553_H
#ifndef DROPBEAR_FAKE_RFC2553_H
#define DROPBEAR_FAKE_RFC2553_H
#include "includes.h"
#include <sys/types.h>

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _GENDSS_H_
#define _GENDSS_H_
#ifndef DROPBEAR_GENDSS_H_
#define DROPBEAR_GENDSS_H_
#include "dss.h"
@ -33,4 +33,4 @@ dropbear_dss_key * gen_dss_priv_key(unsigned int size);
#endif /* DROPBEAR_DSS */
#endif /* _GENDSS_H_ */
#endif /* DROPBEAR_GENDSS_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _GENRSA_H_
#define _GENRSA_H_
#ifndef DROPBEAR_GENRSA_H_
#define DROPBEAR_GENRSA_H_
#include "rsa.h"
@ -33,4 +33,4 @@ dropbear_rsa_key * gen_rsa_priv_key(unsigned int size);
#endif /* DROPBEAR_RSA */
#endif /* _GENRSA_H_ */
#endif /* DROPBEAR_GENRSA_H_ */

View File

@ -1,5 +1,5 @@
#ifndef _GENSIGNKEY_H
#define _GENSIGNKEY_H
#ifndef DROPBEAR_GENSIGNKEY_H
#define DROPBEAR_GENSIGNKEY_H
#include "signkey.h"

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _INCLUDES_H_
#define _INCLUDES_H_
#ifndef DROPBEAR_INCLUDES_H_
#define DROPBEAR_INCLUDES_H_
#include "config.h"
@ -177,4 +177,4 @@ typedef u_int32_t uint32_t;
# define UNUSED(x) x
#endif
#endif /* _INCLUDES_H_ */
#endif /* DROPBEAR_INCLUDES_H_ */

6
kex.h
View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _KEX_H_
#define _KEX_H_
#ifndef DROPBEAR_KEX_H_
#define DROPBEAR_KEX_H_
#include "includes.h"
#include "algo.h"
@ -113,4 +113,4 @@ int curve25519_donna(unsigned char *out, const unsigned char *secret, const unsi
#define MAX_KEXHASHBUF 2000
#endif /* _KEX_H_ */
#endif /* DROPBEAR_KEX_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _KEYIMPORT_H_
#define _KEYIMPORT_H_
#ifndef DROPBEAR_KEYIMPORT_H_
#define DROPBEAR_KEYIMPORT_H_
#include "includes.h"
#include "signkey.h"
@ -39,4 +39,4 @@ int import_write(const char *filename, sign_key *key, char *passphrase,
sign_key *import_read(const char *filename, char *passphrase, int filetype);
int import_encrypted(const char* filename, int filetype);
#endif /* _KEYIMPORT_H_ */
#endif /* DROPBEAR_KEYIMPORT_H_ */

6
list.h
View File

@ -1,5 +1,5 @@
#ifndef _DROPBEAR_LIST_H
#define _DROPBEAR_LIST_H
#ifndef DROPBEAR_DROPBEAR_LIST_H
#define DROPBEAR_DROPBEAR_LIST_H
struct _m_list;
@ -25,4 +25,4 @@ void list_append(m_list *list, void *item);
void * list_remove(m_list_elem *elem);
#endif /* _DROPBEAR_LIST_H */
#endif /* DROPBEAR_DROPBEAR_LIST_H */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _LISTENER_H
#define _LISTENER_H
#ifndef DROPBEAR_LISTENER_H
#define DROPBEAR_LISTENER_H
#define MAX_LISTENERS 20
#define LISTENER_EXTEND_SIZE 1
@ -60,4 +60,4 @@ struct Listener * get_listener(int type, void* typedata,
void remove_listener(struct Listener* listener);
#endif /* _LISTENER_H */
#endif /* DROPBEAR_LISTENER_H */

View File

@ -1,5 +1,5 @@
#ifndef _HAVE_LOGINREC_H_
#define _HAVE_LOGINREC_H_
#ifndef DROPBEAR_HAVE_LOGINREC_H_
#define DROPBEAR_HAVE_LOGINREC_H_
/*
* Copyright (c) 2000 Andre Lucas. All rights reserved.
@ -182,4 +182,4 @@ char *line_fullname(char *dst, const char *src, size_t dstsize);
char *line_stripname(char *dst, const char *src, size_t dstsize);
char *line_abbrevname(char *dst, const char *src, size_t dstsize);
#endif /* _HAVE_LOGINREC_H_ */
#endif /* DROPBEAR_HAVE_LOGINREC_H_ */

View File

@ -1,5 +1,5 @@
#ifndef _LTC_PRNG_H_DROPBEAR
#define _LTC_PRNG_H_DROPBEAR
#ifndef DROPBEAR_LTC_PRNG_H_DROPBEAR
#define DROPBEAR_LTC_PRNG_H_DROPBEAR
#include "options.h"
#include "includes.h"
@ -10,4 +10,4 @@ extern const struct ltc_prng_descriptor dropbear_prng_desc;
#endif /* DROPBEAR_LTC_PRNG */
#endif /* _LTC_PRNG_H_DROPBEAR */
#endif /* DROPBEAR_LTC_PRNG_H_DROPBEAR */

View File

@ -2,8 +2,8 @@
* Copyright (c) 2002,2003 Matt Johnston
* All rights reserved. See LICENSE for the license. */
#ifndef _OPTIONS_H_
#define _OPTIONS_H_
#ifndef DROPBEAR_OPTIONS_H_
#define DROPBEAR_OPTIONS_H_
/* Define compile-time options below - the "#ifndef DROPBEAR_XXX .... #endif"
* parts are to allow for commandline -DDROPBEAR_XXX options etc. */
@ -289,7 +289,7 @@ much traffic. */
/* This is used by the scp binary when used as a client binary. If you're
* not using the Dropbear client, you'll need to change it */
#define _PATH_SSH_PROGRAM "/usr/bin/dbclient"
#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"
/* Whether to log commands executed by a client. This only logs the
* (single) command sent to the server, not what a user did in a
@ -337,4 +337,4 @@ be overridden at runtime with -I. 0 disables idle timeouts */
* in sysoptions.h */
#include "sysoptions.h"
#endif /* _OPTIONS_H_ */
#endif /* DROPBEAR_OPTIONS_H_ */

View File

@ -22,9 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _PACKET_H_
#ifndef DROPBEAR_PACKET_H_
#define _PACKET_H_
#define DROPBEAR_PACKET_H_
#include "includes.h"
@ -46,4 +46,4 @@ typedef struct PacketType {
#define INIT_READBUF 128
#endif /* _PACKET_H_ */
#endif /* DROPBEAR_PACKET_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _QUEUE_H_
#define _QUEUE_H_
#ifndef DROPBEAR_QUEUE_H_
#define DROPBEAR_QUEUE_H_
struct Link {

6
rsa.h
View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _RSA_H_
#define _RSA_H_
#ifndef DROPBEAR_RSA_H_
#define DROPBEAR_RSA_H_
#include "includes.h"
#include "buffer.h"
@ -55,4 +55,4 @@ void rsa_key_free(dropbear_rsa_key *key);
#endif /* DROPBEAR_RSA */
#endif /* _RSA_H_ */
#endif /* DROPBEAR_RSA_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _RUNOPTS_H_
#define _RUNOPTS_H_
#ifndef DROPBEAR_RUNOPTS_H_
#define DROPBEAR_RUNOPTS_H_
#include "includes.h"
#include "signkey.h"
@ -170,4 +170,4 @@ void parse_ciphers_macs();
void print_version(void);
#endif /* _RUNOPTS_H_ */
#endif /* DROPBEAR_RUNOPTS_H_ */

View File

@ -22,9 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _SERVICE_H_
#define _SERVICE_H_
#ifndef DROPBEAR_SERVICE_H_
#define DROPBEAR_SERVICE_H_
void recv_msg_service_request(); /* Server */
#endif /* _SERVICE_H_ */
#endif /* DROPBEAR_SERVICE_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _SESSION_H_
#define _SESSION_H_
#ifndef DROPBEAR_SESSION_H_
#define DROPBEAR_SESSION_H_
#include "includes.h"
#include "options.h"
@ -309,4 +309,4 @@ extern struct serversession svr_ses;
extern struct clientsession cli_ses;
#endif /* DROPBEAR_CLIENT */
#endif /* _SESSION_H_ */
#endif /* DROPBEAR_SESSION_H_ */

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _SIGNKEY_H_
#define _SIGNKEY_H_
#ifndef DROPBEAR_SIGNKEY_H_
#define DROPBEAR_SIGNKEY_H_
#include "buffer.h"
#include "dss.h"
@ -101,4 +101,4 @@ int cmp_base64_key(const unsigned char* keyblob, unsigned int keybloblen,
void** signkey_key_ptr(sign_key *key, enum signkey_type type);
#endif /* _SIGNKEY_H_ */
#endif /* DROPBEAR_SIGNKEY_H_ */

View File

@ -21,8 +21,8 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _TCPFWD_H
#define _TCPFWD_H
#ifndef DROPBEAR_TCPFWD_H
#define DROPBEAR_TCPFWD_H
#include "channel.h"
#include "list.h"

View File

@ -22,8 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _TERMCODES_H_
#define _TERMCODES_H_
#ifndef DROPBEAR_TERMCODES_H_
#define DROPBEAR_TERMCODES_H_
#define TERMCODE_NONE 0
#define TERMCODE_CONTROL 1
@ -43,4 +43,4 @@ struct TermCode {
extern const struct TermCode termcodes[];
#endif /* _TERMCODES_H_ */
#endif /* DROPBEAR_TERMCODES_H_ */

View File

@ -21,8 +21,8 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. */
#ifndef _X11FWD_H_
#define _X11FWD_H_
#ifndef DROPBEAR__X11FWD_H_
#define DROPBEAR__X11FWD_H_
#ifndef DISABLE_X11FWD
#include "includes.h"
@ -34,4 +34,4 @@ void x11setauth(struct ChanSess *chansess);
void x11cleanup(struct ChanSess *chansess);
#endif /* DROPBEAR_X11FWD */
#endif /* _X11FWD_H_ */
#endif /* DROPBEAR__X11FWD_H_ */