d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing code needed for the detection of IPSec packet replays. [1]

Browse Source 
Correctly identify the user running opiepasswd(1) when the login name
differs from the account name. [2]

Security:	FreeBSD-SA-06:11.ipsec [1]
Security:	FreeBSD-SA-06:12.opie [2]
This commit is contained in:
cperciva 2006-03-22 16:00:42 +00:00
parent d663b33f93
commit e66460b894
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/opie/opiepasswd.c
View File

@ -118,11 +118,18 @@ int main FUNCTION((argc, argv), int argc AND char *argv[])
struct opie opie; struct opie opie;
int rval, n = 499, i, mode = MODE_DEFAULT, force = 0; int rval, n = 499, i, mode = MODE_DEFAULT, force = 0;
char seed[OPIE_SEED_MAX+1]; char seed[OPIE_SEED_MAX+1];
char *username;
uid_t ruid;
struct passwd *pp; struct passwd *pp;
memset(seed, 0, sizeof(seed)); memset(seed, 0, sizeof(seed));
if (!(pp = getpwnam(getlogin()))) { ruid = getuid();
username = getlogin();
pp = getpwnam(username);
if (username == NULL || pp == NULL || pp->pw_uid != ruid)
pp = getpwuid(ruid);
if (pp == NULL) {
fprintf(stderr, "Who are you?"); fprintf(stderr, "Who are you?");
return 1; return 1;
} }

17
sys/netipsec/xform_esp.c
View File

@ -555,6 +555,23 @@ esp_input_cb(struct cryptop *crp)
*/ */
m->m_flags |= M_DECRYPTED; m->m_flags |= M_DECRYPTED;
/*
* Update replay sequence number, if appropriate.
*/
if (sav->replay) {
u_int32_t seq;
m_copydata(m, skip + offsetof(struct newesp, esp_seq),
sizeof (seq), (caddr_t) &seq);
if (ipsec_updatereplay(ntohl(seq), sav)) {
DPRINTF(("%s: packet replay check for %s\n", __func__,
ipsec_logsastr(sav)));
espstat.esps_replay++;
error = ENOBUFS;
goto bad;
}
}
/* Determine the ESP header length */ /* Determine the ESP header length */
if (sav->flags & SADB_X_EXT_OLD) if (sav->flags & SADB_X_EXT_OLD)
hlen = sizeof (struct esp) + sav->ivlen; hlen = sizeof (struct esp) + sav->ivlen;