along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net_packet.c,v 1.1.2.25 2002/11/14 22:09:03 guus Exp $
+ $Id: net_packet.c,v 1.1.2.27 2003/04/18 21:18:36 guus Exp $
*/
#include "config.h"
int keylifetime = 0;
int keyexpires = 0;
+EVP_CIPHER_CTX packet_ctx;
#define MAX_SEQNO 1073741824
vpn_packet_t *outpkt = pkt[0];
int outlen, outpad;
long int complen = MTU + 12;
- EVP_CIPHER_CTX ctx;
char hmac[EVP_MAX_MD_SIZE];
+ int i;
cp();
if(myself->cipher) {
outpkt = pkt[nextpkt++];
- EVP_DecryptInit(&ctx, myself->cipher, myself->key,
+ EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key,
myself->key + myself->cipher->key_len);
- EVP_DecryptUpdate(&ctx, (char *) &outpkt->seqno, &outlen,
+ EVP_DecryptUpdate(&packet_ctx, (char *) &outpkt->seqno, &outlen,
(char *) &inpkt->seqno, inpkt->len);
- EVP_DecryptFinal(&ctx, (char *) &outpkt->seqno + outlen, &outpad);
-
+ EVP_DecryptFinal_ex(&packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
+
outpkt->len = outlen + outpad;
inpkt = outpkt;
}
inpkt->len -= sizeof(inpkt->seqno);
inpkt->seqno = ntohl(inpkt->seqno);
- if(inpkt->seqno <= n->received_seqno) {
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG,
- _("Got late or replayed packet from %s (%s), seqno %d"),
- n->name, n->hostname, inpkt->seqno);
- return;
+ if(inpkt->seqno != n->received_seqno + 1) {
+ if(inpkt->seqno >= n->received_seqno + sizeof(n->late) * 8) {
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_WARNING, _("Lost %d packets from %s (%s)"),
+ inpkt->seqno - n->received_seqno - 1, n->name, n->hostname);
+
+ memset(n->late, 0, sizeof(n->late));
+ } else if (inpkt->seqno <= n->received_seqno) {
+ if(inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8 || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
+ syslog(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
+ n->name, n->hostname, inpkt->seqno, n->received_seqno, n->late[(inpkt->seqno / 8) % sizeof(n->late)]);
+ } else
+ for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
+ n->late[(inpkt->seqno / 8) % sizeof(n->late)] |= 1 << i % 8;
+ }
}
-
+
n->received_seqno = inpkt->seqno;
-
+ n->late[(n->received_seqno / 8) % sizeof(n->late)] &= ~(1 << n->received_seqno % 8);
+
if(n->received_seqno > MAX_SEQNO)
keyexpires = 0;
int origlen;
int outlen, outpad;
long int complen = MTU + 12;
- EVP_CIPHER_CTX ctx;
vpn_packet_t *copy;
static int priority = 0;
int origpriority;
if(n->cipher) {
outpkt = pkt[nextpkt++];
- EVP_EncryptInit(&ctx, n->cipher, n->key, n->key + n->cipher->key_len);
- EVP_EncryptUpdate(&ctx, (char *) &outpkt->seqno, &outlen,
+ EVP_EncryptInit_ex(&packet_ctx, n->cipher, NULL, n->key, n->key + n->cipher->key_len);
+ EVP_EncryptUpdate(&packet_ctx, (char *) &outpkt->seqno, &outlen,
(char *) &inpkt->seqno, inpkt->len);
- EVP_EncryptFinal(&ctx, (char *) &outpkt->seqno + outlen, &outpad);
+ EVP_EncryptFinal_ex(&packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
outpkt->len = outlen + outpad;
inpkt = outpkt;