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

putty: 0.71 -> 0.73, fixing CVE-2019-17069 #71270

Merged
merged 1 commit into from Oct 27, 2019

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Oct 16, 2019

Motivation for this change

https://nvd.nist.gov/vuln/detail/CVE-2019-17069

Technically 0.73 fixes CVE-2019-17068 as well, but I'm fairly convinced that only 0.72 was ever vulnerable to that.

I'll attempt to patch for 19.09 so no automatic backport please...

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nix-review passes on NixOS
diff LGTM
executables seem to work
leaf package

[3 built, 2 copied (11.5 MiB), 1.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/71270
1 package were build:
putty

@jonringer
Copy link
Contributor

@GrahamcOfBorg build putty

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

fails to build on darwin

mv -f $depbase.Tpo $depbase.Po
./../unix/uxpty.c:16:10: fatal error: 'utmp.h' file not found
#include <utmp.h>
         ^~~~~~~~
1 error generated.
make[1]: *** [Makefile:1906: unix/uxpty.o] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-putty-0.73.drv-0/putty-0.73/unix'
make: *** [Makefile:1409: all] Error 2
builder for '/nix/store/h69qx5d5nqsfidxdap5gfmm39i8i5g6w-putty-0.73.drv' failed with exit code 2
error: build of '/nix/store/h69qx5d5nqsfidxdap5gfmm39i8i5g6w-putty-0.73.drv' failed

you may have to pass a gccstdenv to get this to build on darwin. I can't find utmp.h anywhere else

@risicle
Copy link
Contributor Author

risicle commented Oct 17, 2019

Cool. Thanks for checking - I'll have to look at it at the weekend...

fixing CVE-2019-17069

the AM subsitutions appear to be very old - they break 0.73's build and
modern releases seem to do without them fine
@risicle
Copy link
Contributor Author

risicle commented Oct 18, 2019

@jonringer it was easier than that - I just had to give it darwin.apple_sdk.libs.utmp.

@jonringer
Copy link
Contributor

@GrahamcOfBorg build putty

@mmahut mmahut merged commit 1235e6a into NixOS:master Oct 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants