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 enable password handling #481

Merged
merged 6 commits into from
Sep 28, 2017
Merged

Update enable password handling #481

merged 6 commits into from
Sep 28, 2017

Conversation

arifogel
Copy link
Member

Includes part of #466

@@ -8341,6 +8342,11 @@ SHA1
'sha1' -> pushMode ( M_SHA1 )
;

SHA512_PASSWORD
:
'$sha512$' [0-9]+ '$' ~'$'+ '$' F_NonWhitespace+ -> pushMode ( M_Seed )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest defining fragments for Base 64. Something like this modulo antlr repeating syntax {}

F_B64Char
:
    [a-zA-Z0-9+/]
;

F_B64CharQuad
:
    F_B64Char{4}
;

F_B64FinalQuad
:
    F_B64CharQuad
    | F_B64Char{2} '=' '='
    | F_B64Char{3} '='
;

F_B64
:
    F_B64CharQuad* F_B64FinalQuad
;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the pattern is
$ sha512 $ number $ base64 $ base64 space

for the sha512 token

followed by [woldj4] whatever that is.

@@ -495,6 +495,11 @@ variable_interface_name
NAME | NEWLINE | TAG | TRACK | VARIABLE )
;

variable_password
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"i think i have to get rid of variable_password" -- you.

@dhalperi
Copy link
Member

Approved with a question.

@dhalperi dhalperi self-requested a review September 28, 2017 22:04
@arifogel arifogel merged commit 8b81637 into master Sep 28, 2017
@arifogel arifogel deleted the ari-fix-cisco-misc branch October 7, 2017 20:15
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.

None yet

3 participants