FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
| #!/usr/bin/perl | |
| # | |
| # Brad's el-ghetto do-our-storage-stacks-lie?-script | |
| # | |
| sub usage { | |
| die <<'END'; | |
| Usage: diskchecker.pl -s <server[:port]> verify <file> | |
| diskchecker.pl -s <server[:port]> create <file> <size_in_MB> | |
| diskchecker.pl -l [port] |
Locate the section for your github remote in the .git/config file. It looks like this:
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git@github.com:joyent/node.git
Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:
This is a local copy of the commands from:
This guide serves as a reference of collected information necessary for strict management of PGP keys. This includes keeping a master key that always remains
| for dir in `find . -maxdepth 1 -type d | tail -n +2`; do cd $dir ; echo "pulling $dir" ; git pull || ( echo "failed in '$dir' - cd to original dir." && cd - 1>/dev/null ; exit 1 ) ; cd - 1>/dev/null ; done |
This may have seemed like a great idea in 2013, but the repeated "set/clear bits", a.k.a. clamping phases at each level of the hierarchy slowly subtract key strength.
Don't use this as described. Check out Ristretto.
Semi-private keys are an expansion of the traditional idea
I want to be extremely clear about three things. First, this is my personal opinion – insert full standard disclaimer. Second, this is not a condemnation of everyone at RSA, present and past. I assume most of them are pretty okay, and that the problem is confined to a few specific points in the company. However, “unknown problem people making major decisions at RSA” is a bit unwieldy, so I will just say RSA. Third, I'm not calling for a total boycott on RSA. I work almost literally across the street from them and I don’t want to get beat up by roving gangs of cryptographers at the local Chipotle.
RSA's denial published last night is utter codswallop that denies pretty much everything in the world except the actual allegations put forth by Reuters and hinted at for months by [other sources](http://li
List of people who have cancelled either their session (e.g. talk, panel participation or seminar) at RSA Conference 2014.
| Date | Name | Job title | More info |
|---|---|---|---|
| 2014-01-20 | Roel Schouwenberg | Senior Researcher, Kaspersky Lab | Tweet |
| 2014-01-09 | Jim Manico | Global Board Member, OWASP and VP of Security Architecture, WhiteHat Security | Tweet |
| 2014-01-09 | Eoin Keary | Global Board Member, OWASP and Director, BBC Risk Advisory | Tweet |
| 2014-01-07 | Chris Palmer | Software Security Engineer, Google | [Tweet](https://twitte |
| So this happened: phrack changed it's format and posted a nice analysis of the | |
| (nowadays missing) hacker community and societal behaviour of hackers in | |
| general: http://phrack.org/papers/fall_of_groups.html | |
| This article reflects a lot of thoughts I've had over the last couple of | |
| months. In a very positive way. | |
| Yea sure, the scene we grew up in changed to what has now become a bullshit | |
| business like any other. Originality is scarce and every time I see SQLi or |
| #!/usr/bin/env python2 | |
| """ | |
| Author: takeshix <takeshix@adversec.com> | |
| PoC code for CVE-2014-0160. Original PoC by Jared Stafford (jspenguin@jspenguin.org). | |
| Supportes all versions of TLS and has STARTTLS support for SMTP,POP3,IMAP,FTP and XMPP. | |
| """ | |
| import sys,struct,socket | |
| from argparse import ArgumentParser |
