Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MITM to Machine-in-the-Middle #3175

Merged
merged 9 commits into from
Feb 27, 2025
Merged

Update MITM to Machine-in-the-Middle #3175

merged 9 commits into from
Feb 27, 2025

Conversation

sushi2k
Copy link
Collaborator

@sushi2k sushi2k commented Feb 23, 2025

This PR updates the term "Man-in-the-Middle" to "Machine-in-the-Middle" across the MASTG.

This change is part of a broader effort to remove gendered language from our documentation, following feedback we received some time ago. Our style guide now explicitly states that we should use gender-neutral terminology, and "man-in-the-middle" was one of the remaining terms that needed updating.

When evaluating alternatives, our primary goal was to maintain clear communication while also keeping the familiar acronym (MITM). We considered options like "adversary-in-the-middle" and "person-in-the-middle," but we wanted to preserve the "M" in MITM for consistency. Ultimately, we settled on "Machine-in-the-Middle" because, in most cases, even if an attack is orchestrated by a person, it is executed through a machine that intercepts communication.

To ensure clarity, we will continue to reference the original term but only in the definition of the MITM term.

@cpholguera cpholguera changed the title update mitm to machine-in-the-middle Update MITM to Machine-in-the-Middle Feb 23, 2025
@titze
Copy link
Collaborator

titze commented Feb 24, 2025

What is the reason for this change? I think MITM is a longstanding abbreviation, I wonder where the "machine" comes from?

@cpholguera
Copy link
Collaborator

@titze We made this change as part of a broader effort to remove gendered language from our documentation, following feedback we received some time ago. Our style guide now explicitly states that we should use gender-neutral terminology, and "man-in-the-middle" was one of the remaining terms that needed updating.

When evaluating alternatives, our primary goal was to maintain clear communication while also keeping the familiar acronym (MITM). We considered options like "adversary-in-the-middle" and "person-in-the-middle," but we wanted to preserve the "M" in MITM for consistency. Ultimately, we settled on "Machine-in-the-Middle" because, in most cases, even if an attack is orchestrated by a person, it is executed through a machine that intercepts communication. Also, to clarify, we didn't create the term, it is already being used in the community.

To ensure clarity, we will continue to reference the original term but only in the definition of the MITM term.

@titze
Copy link
Collaborator

titze commented Feb 25, 2025

@cpholguera thanks for the clarification!

Should we add a glossary somewhere, explaining this (maybe there are more cases like this)? I feel the classic definition of MITM is so widely used, that it will at least somewhat confuse people. Especially since it seems that machine-in-the-middle is used in some literature to clearly indicate that this is not a person, but some automated machine.

@cpholguera cpholguera merged commit fcd8d76 into master Feb 27, 2025
5 of 6 checks passed
@cpholguera cpholguera deleted the mitim-update branch February 27, 2025 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants