Page MenuHomeFreeBSD
Differential D9078

sysutils/zap: Update to version 0.6.3
ClosedPublic
Actions

Authored by jrm on Jan 7 2017, 3:13 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 1 2025, 8:33 AM
Unknown Object (File)
Feb 22 2025, 1:30 PM
Unknown Object (File)
Feb 20 2025, 6:31 PM
Unknown Object (File)
Jan 26 2025, 8:09 AM
Unknown Object (File)
Dec 1 2024, 12:13 PM
Unknown Object (File)
Nov 14 2024, 1:29 PM
Unknown Object (File)
Nov 14 2024, 9:59 AM
Unknown Object (File)
Nov 9 2024, 1:25 PM
View All 73 Files
Subscribers
mat

Details

Reviewers
swills
AMDmi3
Commits
rP430764: sysutils/zap: Update to version 0.6.3.
Summary

sysutils/zap: Update to version 0.6.3

  • Fix problem calling basic sed with unsupported a|b
Test Plan

portlint -C: OK
testport: OK (poudriere: 11.0-RELEASE-p1, amd64)

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 6617
Build 6835: arc lint + arc unit

Event Timeline

jrm updated this revision to Diff 23695.Jan 7 2017, 3:13 AM
jrm retitled this revision from to sysutils/zap: Update to version 0.6.3.
jrm updated this object.
jrm edited the test plan for this revision. (Show Details)
jrm added reviewers: swills, AMDmi3.
Herald added a subscriber: mat. · View Herald TranscriptJan 7 2017, 3:13 AM
swills accepted this revision.Jan 7 2017, 3:15 AM
swills edited edge metadata.

Approved

This revision is now accepted and ready to land.Jan 7 2017, 3:15 AM
Closed by commit rP430764: sysutils/zap: Update to version 0.6.3. (authored by jrm). · Explain WhyJan 7 2017, 3:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
sysutils/
zap/
2 lines
6 lines

Diff 23695

View Options

sysutils/zap/Makefile

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#include <netipsec/key.h> #include <netipsec/key.h>
#include <netipsec/key_debug.h> #include <netipsec/key_debug.h>
#include <opencrypto/cryptodev.h> #include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h> #include <opencrypto/xform.h>
VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(int, esp_enable) = 1;
VNET_DEFINE_STATIC(int, esp_ctr_compatibility) = 1;
#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility)
VNET_PCPUSTAT_DEFINE(struct espstat, espstat); VNET_PCPUSTAT_DEFINE(struct espstat, espstat);
VNET_PCPUSTAT_SYSINIT(espstat); VNET_PCPUSTAT_SYSINIT(espstat);
#ifdef VIMAGE #ifdef VIMAGE
VNET_PCPUSTAT_SYSUNINIT(espstat); VNET_PCPUSTAT_SYSUNINIT(espstat);
#endif /* VIMAGE */ #endif /* VIMAGE */
SYSCTL_DECL(_net_inet_esp); SYSCTL_DECL(_net_inet_esp);
SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable, SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, ""); CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, "");
SYSCTL_INT(_net_inet_esp, OID_AUTO, ctr_compatibility,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_ctr_compatibility), 0,
"Align AES-CTR encrypted transmitted frames to blocksize");
SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats, SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats,
struct espstat, espstat, struct espstat, espstat,
"ESP statistics (struct espstat, netipsec/esp_var.h"); "ESP statistics (struct espstat, netipsec/esp_var.h");
static int esp_input_cb(struct cryptop *op); static int esp_input_cb(struct cryptop *op);
static int esp_output_cb(struct cryptop *crp); static int esp_output_cb(struct cryptop *crp);
size_t size_t
▲ Show 20 Lines • Show All 548 Lines • ▼ Show 20 Linesesp_output(struct mbuf *m, struct secpolicy *sp, struct secasvar *sav,
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;
else else
hlen = sizeof (struct newesp) + sav->ivlen; hlen = sizeof (struct newesp) + sav->ivlen;
rlen = m->m_pkthdr.len - skip; /* Raw payload length. */ rlen = m->m_pkthdr.len - skip; /* Raw payload length. */
/* /*
* RFC4303 2.4 Requires 4 byte alignment. * RFC4303 2.4 Requires 4 byte alignment.
* Old versions of FreeBSD can't decrypt partial blocks encrypted
* with AES-CTR. Align payload to native_blocksize (16 bytes)
* in order to preserve compatibility.
*/ */
blks = MAX(4, espx->blocksize); /* Cipher blocksize */ if (SAV_ISCTR(sav) && V_esp_ctr_compatibility)
blks = MAX(4, espx->native_blocksize); /* Cipher blocksize */
else
blks = MAX(4, espx->blocksize);
/* XXX clamp padding length a la KAME??? */ /* XXX clamp padding length a la KAME??? */
padding = ((blks - ((rlen + 2) % blks)) % blks) + 2; padding = ((blks - ((rlen + 2) % blks)) % blks) + 2;
alen = xform_ah_authsize(esph); alen = xform_ah_authsize(esph);
ESPSTAT_INC(esps_output); ESPSTAT_INC(esps_output);
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines
View Options

sysutils/zap/distinfo

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#include <netipsec/key.h> #include <netipsec/key.h>
#include <netipsec/key_debug.h> #include <netipsec/key_debug.h>
#include <opencrypto/cryptodev.h> #include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h> #include <opencrypto/xform.h>
VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(int, esp_enable) = 1;
VNET_DEFINE_STATIC(int, esp_ctr_compatibility) = 1;
#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility)
VNET_PCPUSTAT_DEFINE(struct espstat, espstat); VNET_PCPUSTAT_DEFINE(struct espstat, espstat);
VNET_PCPUSTAT_SYSINIT(espstat); VNET_PCPUSTAT_SYSINIT(espstat);
#ifdef VIMAGE #ifdef VIMAGE
VNET_PCPUSTAT_SYSUNINIT(espstat); VNET_PCPUSTAT_SYSUNINIT(espstat);
#endif /* VIMAGE */ #endif /* VIMAGE */
SYSCTL_DECL(_net_inet_esp); SYSCTL_DECL(_net_inet_esp);
SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable, SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, ""); CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, "");
SYSCTL_INT(_net_inet_esp, OID_AUTO, ctr_compatibility,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_ctr_compatibility), 0,
"Align AES-CTR encrypted transmitted frames to blocksize");
SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats, SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats,
struct espstat, espstat, struct espstat, espstat,
"ESP statistics (struct espstat, netipsec/esp_var.h"); "ESP statistics (struct espstat, netipsec/esp_var.h");
static int esp_input_cb(struct cryptop *op); static int esp_input_cb(struct cryptop *op);
static int esp_output_cb(struct cryptop *crp); static int esp_output_cb(struct cryptop *crp);
size_t size_t
▲ Show 20 Lines • Show All 548 Lines • ▼ Show 20 Linesesp_output(struct mbuf *m, struct secpolicy *sp, struct secasvar *sav,
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;
else else
hlen = sizeof (struct newesp) + sav->ivlen; hlen = sizeof (struct newesp) + sav->ivlen;
rlen = m->m_pkthdr.len - skip; /* Raw payload length. */ rlen = m->m_pkthdr.len - skip; /* Raw payload length. */
/* /*
* RFC4303 2.4 Requires 4 byte alignment. * RFC4303 2.4 Requires 4 byte alignment.
* Old versions of FreeBSD can't decrypt partial blocks encrypted
* with AES-CTR. Align payload to native_blocksize (16 bytes)
* in order to preserve compatibility.
*/ */
blks = MAX(4, espx->blocksize); /* Cipher blocksize */ if (SAV_ISCTR(sav) && V_esp_ctr_compatibility)
blks = MAX(4, espx->native_blocksize); /* Cipher blocksize */
else
blks = MAX(4, espx->blocksize);
/* XXX clamp padding length a la KAME??? */ /* XXX clamp padding length a la KAME??? */
padding = ((blks - ((rlen + 2) % blks)) % blks) + 2; padding = ((blks - ((rlen + 2) % blks)) % blks) + 2;
alen = xform_ah_authsize(esph); alen = xform_ah_authsize(esph);
ESPSTAT_INC(esps_output); ESPSTAT_INC(esps_output);
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines