crypto.h		crypto.h
	/*		/*
	* This file is part of the SSH Library		* This file is part of the SSH Library
	*		*
	* Copyright (c) 2003 by Aris Adamantiadis		* Copyright (c) 2003,2009 by Aris Adamantiadis
	*		*
	* The SSH Library is free software; you can redistribute it and/or modify		* The SSH Library is free software; you can redistribute it and/or modify
	* it under the terms of the GNU Lesser General Public License as published by		* it under the terms of the GNU Lesser General Public License as published by
	* the Free Software Foundation; either version 2.1 of the License, or (at your		* the Free Software Foundation; either version 2.1 of the License, or (at your
	* option) any later version.		* option) any later version.
	*		*
	* The SSH Library is distributed in the hope that it will be useful, but		* The SSH Library is distributed in the hope that it will be useful, but
	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILI TY		* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILI TY
	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public		* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
	* License for more details.		* License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public License		* You should have received a copy of the GNU Lesser General Public License
	* along with the SSH Library; see the file COPYING. If not, write to		* along with the SSH Library; see the file COPYING. If not, write to
	* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,		* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
	* MA 02111-1307, USA.		* MA 02111-1307, USA.
	*/		*/
	/*		/*
	* crypto.h is an include file for internal structures of libssh		* crypto.h is an include file for internal cryptographic structures of lib
	* It hasn't to be into the final development set of files (and btw		ssh
	* the filename would cause problems on most systems).
	*/		*/
			#ifndef _CRYPTO_H_
			#define _CRYPTO_H_
			#include "config.h"
			#ifdef HAVE_LIBGCRYPT
			#include <gcrypt.h>
			#endif
			#include "libssh/wrapper.h"
	#ifdef cbc_encrypt		#ifdef cbc_encrypt
	#undef cbc_encrypt		#undef cbc_encrypt
	#endif		#endif
	#ifdef cbc_decrypt		#ifdef cbc_decrypt
	#undef cbc_decrypt		#undef cbc_decrypt
	#endif		#endif
	#ifdef GCRYPT		struct ssh_crypto_struct {
	#include <gcrypt.h>		bignum e,f,x,k,y;
	#endif		unsigned char session_id[SHA_DIGEST_LEN];
			unsigned char encryptIV[SHA_DIGEST_LEN*2];
			unsigned char decryptIV[SHA_DIGEST_LEN*2];
			unsigned char decryptkey[SHA_DIGEST_LEN*2];
			unsigned char encryptkey[SHA_DIGEST_LEN*2];
			unsigned char encryptMAC[SHA_DIGEST_LEN];
			unsigned char decryptMAC[SHA_DIGEST_LEN];
			unsigned char hmacbuf[EVP_MAX_MD_SIZE];
			struct crypto_struct *in_cipher, *out_cipher; /* the cipher structures/
			objects */
			ssh_string server_pubkey;
			const char *server_pubkey_type;
			int do_compress_out; /* idem */
			int do_compress_in; /* don't set them, set the option instead */
			void *compress_out_ctx; /* don't touch it */
			void *compress_in_ctx; /* really, don't */
			};
	struct crypto_struct {		struct crypto_struct {
	const char *name; /* ssh name of the algorithm */		const char *name; /* ssh name of the algorithm */
	unsigned int blocksize; /* blocksize of the algo */		unsigned int blocksize; /* blocksize of the algo */
	unsigned int keylen; /* length of the key structure */		unsigned int keylen; /* length of the key structure */
	#ifdef HAVE_LIBGCRYPT		#ifdef HAVE_LIBGCRYPT
	gcry_cipher_hd_t *key;		gcry_cipher_hd_t *key;
	#elif defined HAVE_LIBCRYPTO		#elif defined HAVE_LIBCRYPTO
	void *key; /* a key buffer allocated for the algo */		void *key; /* a key buffer allocated for the algo */
	#endif		#endif
	skipping to change at line 69		skipping to change at line 95
	int (*set_encrypt_key)(struct crypto_struct *cipher, void *key);		int (*set_encrypt_key)(struct crypto_struct *cipher, void *key);
	int (*set_decrypt_key)(struct crypto_struct *cipher, void *key);		int (*set_decrypt_key)(struct crypto_struct *cipher, void *key);
	void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out,		void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out,
	unsigned long len, void *IV);		unsigned long len, void *IV);
	void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out,		void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out,
	unsigned long len, void *IV);		unsigned long len, void *IV);
	#endif		#endif
	};		};
	/* vim: set ts=2 sw=2 et cindent: */		/* vim: set ts=2 sw=2 et cindent: */
			#endif /* _CRYPTO_H_ */
End of changes. 5 change blocks.
	7 lines changed or deleted		35 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/