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

Add nasl functions for checking ssl/tls secure renegotiation and performing re-handshake (backport #889) #910

Merged
merged 2 commits into from
Oct 25, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 25, 2021

This is an automatic backport of pull request #889 done by Mergify.
Cherry-pick of 641ab33 has failed:

On branch mergify/bp/stable/pr-889
Your branch is up to date with 'origin/stable'.

You are currently cherry-picking commit 641ab331.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   misc/network.c
	modified:   misc/network.h
	modified:   nasl/nasl_init.c
	modified:   nasl/nasl_socket.c
	modified:   nasl/nasl_socket.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

… performing re-handshake. (#889)

Add: Add nasl functions for checking ssl/tls secure renegotiation and performing re-handshake. (#889)
(cherry picked from commit 641ab33)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner October 25, 2021 08:04
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Oct 25, 2021
@jjnicola jjnicola enabled auto-merge (squash) October 25, 2021 09:49
@jjnicola jjnicola added conflicts-resolved Conflicts in this pull request were solved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Oct 25, 2021
@jjnicola jjnicola merged commit 1ab8528 into stable Oct 25, 2021
@jjnicola jjnicola deleted the mergify/bp/stable/pr-889 branch October 25, 2021 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved Conflicts in this pull request were solved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants