aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/crypt/airpdcap.c4
-rw-r--r--epan/wslua/init_wslua.c2
-rw-r--r--epan/wslua/wslua_tvb.c4
-rwxr-xr-xtools/ncp2222.py2
-rw-r--r--ui/recent.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index 33c3cad759..b047104a59 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -325,7 +325,7 @@ Ideally, it would be best to maintain an expanding list of SA keys. Perhaps we c
that they apply to. Then, whenever we need to decrypt a packet, we can determine which key to use based on whether
it is broadcast or unicast and within what packet number range it falls.
-Either that, or store two versions of encrypted packets - the orginal packet and it's successfully
+Either that, or store two versions of encrypted packets - the orginal packet and its successfully
decrypted version. Then Wireshark wouldn't have to decrypt packets on the fly if they were already successfully decrypted.
*/
@@ -429,7 +429,7 @@ AirPDcapDecryptWPABroadcastKey(const EAPOL_RSN_KEY *pEAPKey, guint8 *decryption
sa->validKey = TRUE;
sa->wpa.key_ver = key_version;
- /* Since this is a GTK and it's size is only 32 bytes (vs. the 64 byte size of a PTK), we fake it and put it in at a 32-byte offset so the */
+ /* Since this is a GTK and its size is only 32 bytes (vs. the 64 byte size of a PTK), we fake it and put it in at a 32-byte offset so the */
/* AirPDcapRsnaMng() function will extract the right piece of the GTK for decryption. (The first 16 bytes of the GTK are used for decryption.) */
memset(sa->wpa.ptk, 0, sizeof(sa->wpa.ptk));
memcpy(sa->wpa.ptk+32, szEncryptedKey, key_len);
diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index 2233aa0b05..37736340be 100644
--- a/epan/wslua/init_wslua.c
+++ b/epan/wslua/init_wslua.c
@@ -360,7 +360,7 @@ int wslua_init(register_cb cb, gpointer client_data) {
lua_newtable (L);
lua_dissectors_table_ref = luaL_ref(L, LUA_REGISTRYINDEX);
- /* set running_superuser variable to it's propper value */
+ /* set running_superuser variable to its proper value */
WSLUA_REG_GLOBAL_BOOL(L,"running_superuser",started_with_special_privs());
/* special constant used by PDU reassembly handling */
diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c
index 93a8f944c3..06f44e1dd6 100644
--- a/epan/wslua/wslua_tvb.c
+++ b/epan/wslua/wslua_tvb.c
@@ -316,14 +316,14 @@ int ByteArray_register(lua_State* L) {
* Tvb & TvbRange
*
* a Tvb represents a tvbuff_t in Lua.
- * a TvbRange represents a range in a tvb (tvb,offset,length) it's main purpose is to do bounds checking,
+ * a TvbRange represents a range in a tvb (tvb,offset,length) its main purpose is to do bounds checking,
* it helps too simplifing argument passing to Tree. In wireshark terms this is worthless nothing
* not already done by the TVB itself. In lua's terms is necessary to avoid abusing TRY{}CATCH(){}
* via preemptive bounds checking.
*
* These lua objects refers to structures in wireshak that are freed independently from Lua's garbage collector.
* To avoid using a pointer from Lua to Wireshark's that is already freed, we maintain a list of the pointers with
- * a marker that track's it's expiry.
+ * a marker that track's its expiry.
*
* All pointers are marked as expired when the dissection of the current frame is finished or when the garbage
* collector tries to free the object referring to the pointer, whichever comes first.
diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index 1e64122dd2..f1bc4f2ef2 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -3394,7 +3394,7 @@ RemoveOpenRights = bitfield8("remove_open_rights", "Remove Open Rights", [
bf_boolean8(0x40, "remove_open_rights_write_thru", "Write Through"),
])
RenameFlag = bitfield8("rename_flag", "Rename Flag", [
- bf_boolean8(0x01, "rename_flag_ren", "Rename to Myself allows file to be renamed to it's original name"),
+ bf_boolean8(0x01, "rename_flag_ren", "Rename to Myself allows file to be renamed to its original name"),
bf_boolean8(0x02, "rename_flag_comp", "Compatibility allows files that are marked read only to be opened with read/write access"),
bf_boolean8(0x04, "rename_flag_no", "Name Only renames only the specified name space entry name"),
])
diff --git a/ui/recent.c b/ui/recent.c
index d8af54b353..80860a60cf 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -157,7 +157,7 @@ write_recent_geom(gpointer key _U_, gpointer value, gpointer rf)
* the window name is the key, and the geometry struct is the value */
static GHashTable *window_geom_hash = NULL;
-/* save the window and it's current geometry into the geometry hashtable */
+/* save the window and its current geometry into the geometry hashtable */
void
window_geom_save(const gchar *name, window_geometry_t *geom)
{