Commit Graph

2419 Commits

Author SHA1 Message Date
christos
85e90c0ff3 regen 2013-02-05 19:21:27 +00:00
christos
44ce355adb regen! 2013-02-05 19:18:41 +00:00
christos
340218d9b9 import 1.0.1d for http://www.openssl.org/news/secadv_20130204.txt 2013-02-05 19:04:09 +00:00
tteras
fde1259d48 Fix source port selection 2013-02-05 11:36:17 +00:00
tteras
0849876e12 From Ian West <ian@niw.com.au>: Fix double free of the radius info on
config reload.
2013-02-05 06:22:29 +00:00
manu
00e5ebee00 Pull multiple free bua fix from upstream:
http://git.openssl.org/gitweb/?p=openssl.git;a=patch;h=d21bf10dea6588b632a65b4fe594e04f288aad83;hp=d47c01a31a67ff4370b1883a58cabd0279752bb4

Multiple copies of the ENGINE will cause problems when it is cleaned up as
the methods are stored in static structures which will be overwritten and
freed up more than once.

Set static methods to NULL when the ENGINE is freed so it can be reloaded.
2013-02-04 01:44:47 +00:00
christos
469af362c9 use the version in the source tree, instead of the build host 2013-02-01 21:02:48 +00:00
tteras
b889f6fc93 Fix handling of deletion notification. 2013-01-24 06:47:50 +00:00
christos
387f092185 print only the version as the full version confuses pkgconfig. 2013-01-22 13:51:45 +00:00
apb
5950e8a8de FILESBUILD_<filename>=yes can replace both
CLEANFILES+=<filename> and realall: <filename>
2013-01-19 21:57:55 +00:00
christos
4aa8d00fa6 add a dependency to realall from Takeshi Nakayama 2013-01-19 21:05:46 +00:00
christos
98c3902e37 Add pkgconfig gluons 2013-01-18 18:09:55 +00:00
christos
9109786ace #!/bin/sh 2013-01-18 17:56:11 +00:00
tteras
b607d37b51 Fix errors from automake 1.13 2013-01-08 12:42:31 +00:00
tteras
252bdda2a4 Don't derefence the directory symlink which we might be recreating. 2013-01-08 12:38:40 +00:00
martin
1c77afcb0e Compile bignum.c with -O1 only on ia64 to avoid a gcc bug 2012-12-27 14:16:16 +00:00
tteras
c577d46f00 From Götz Babin-Ebell <g.babin-ebell@novamedia.de>: Smarter X.509 subject
name compare.
2012-12-24 14:50:04 +00:00
tteras
411eef5f44 From Götz Babin-Ebell <g.babin-ebell@novamedia.de:
Require OpenSSL 0.9.8s or higher
2012-12-24 08:46:27 +00:00
christos
fb2eb83f75 make sure that our hpn patches are up-to-date 2012-12-12 18:19:25 +00:00
christos
2649c70094 update to 6.1
This is primarily a bugfix release.

Features:

 * sshd(8): This release turns on pre-auth sandboxing sshd by default for
   new installs, by setting UsePrivilegeSeparation=sandbox in sshd_config.
 * ssh-keygen(1): Add options to specify starting line number and number of
   lines to process when screening moduli candidates, allowing processing
   of different parts of a candidate moduli file in parallel
 * sshd(8): The Match directive now supports matching on the local (listen)
   address and port upon which the incoming connection was received via
   LocalAddress and LocalPort clauses.
 * sshd(8): Extend sshd_config Match directive to allow setting AcceptEnv
   and {Allow,Deny}{Users,Groups}
 * Add support for RFC6594 SSHFP DNS records for ECDSA key types. bz#1978
 * ssh-keygen(1): Allow conversion of RSA1 keys to public PEM and PKCS8
 * sshd(8): Allow the sshd_config PermitOpen directive to accept "none" as
   an argument to refuse all port-forwarding requests.
 * sshd(8): Support "none" as an argument for AuthorizedPrincipalsFile
 * ssh-keyscan(1): Look for ECDSA keys by default. bz#1971
 * sshd(8): Add "VersionAddendum" to sshd_config to allow server operators
   to append some arbitrary text to the server SSH protocol banner.

Bugfixes:

 * ssh(1)/sshd(8): Don't spin in accept() in situations of file
   descriptor exhaustion. Instead back off for a while.
 * ssh(1)/sshd(8): Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs as
   they were removed from the specification. bz#2023,
 * sshd(8): Handle long comments in config files better. bz#2025
 * ssh(1): Delay setting tty_flag so RequestTTY options are correctly
   picked up. bz#1995
 * sshd(8): Fix handling of /etc/nologin incorrectly being applied to root
   on platforms that use login_cap.
2012-12-12 17:42:39 +00:00
christos
03f1b832fc From ftp.openbsd.org 2012-12-12 16:52:23 +00:00
agc
28853c6d2d Make the mp_digit type an "unsigned long" so that it works for ILP32 and
LP64.

Fixes problems showing up on regression tests on i386 (which work fine on
amd64) i.e. turn:

	t_netpgpverify (1/1): 2 test cases
	    netpgpverify_dsa: [0.309746s] Failed: atf-check failed; see the output of the test for details
	    netpgpverify_rsa: [0.183148s] Passed.
	[0.495102s]

	Failed test cases:
	    t_netpgpverify:netpgpverify_dsa

	Summary for 1 test programs:
	    1 passed test cases.
	    1 failed test cases.
	    0 expected failed test cases.
	    0 skipped test cases.

into:

	t_netpgpverify (1/1): 2 test cases
	    netpgpverify_dsa: [0.236076s] Passed.
	    netpgpverify_rsa: [0.154680s] Passed.
	[0.393034s]

	Summary for 1 test programs:
	    2 passed test cases.
	    0 failed test cases.
	    0 expected failed test cases.
	    0 skipped test cases.
2012-12-03 18:02:22 +00:00
wiz
43e793251e Bump date for previous. 2012-11-30 08:19:01 +00:00
vanhu
2bdb1d3e0a Added support for AES GCM 16 in phase2 negociations. Code from Christophe Carre / NETASQ 2012-11-29 15:31:24 +00:00
wiz
759d63f41f Remove trailing whitespace, sort SEE ALSO, comment out reference
to non-existing libbz2(3).

XXX: bn(3) references correct? (man page doesn't exist in NetBSD)
2012-11-28 09:23:14 +00:00
agc
054ef4df4b revert previous change for LIBDPLIBS until I have a chance to work out the
order for building pre-req libs
2012-11-22 21:20:44 +00:00
martin
6747337601 Initialize "ok" (and thereby fix the vax build) 2012-11-22 11:26:28 +00:00
agc
ef7daf19a9 link libz and libbz2 into the netpgpverify library, rather than into the
executable, via LIBDPLIBS.
2012-11-22 04:05:57 +00:00
agc
53475f6b40 Fix some lint 2012-11-22 00:38:45 +00:00
agc
e5e8eae465 Fix some lint - from Havard Eidnes 2012-11-22 00:37:55 +00:00
agc
2752da196a fix problem on 32-bit problems - with thanks to Alan Barrett and
Jonathan Kollasch
2012-11-20 18:45:37 +00:00
agc
9bf07868ef don't assume every platform is 64-bit - just use standard integer arithmetic 2012-11-20 17:57:40 +00:00
agc
640eb22bcb Merge netpgpverify(1) and libnetpgpverify(3) from the
agc-netpgp-standalone branch.

Rewrite the netpgpverify(1) functionality from RFC4880 up.  This is a
completely new implementation, and uses its own bignum library derived
from libtommath.  Apart from libz and libbz2, it just uses its own
library and is self-contained - this makes it easier to embed, and to
use from scripting languages.

netpgpverify(1) now verifies all the signed files i've thrown at it,
and the added bonus of using no functionality from libcrypto - all of
its bignum functionality comes from its own libnetpgpverify.so.
netpgpverify(1) now verifies not only signatures on binary files, but
also signatures on text documents.  This fixes PR/46930.  Please don't
start me on the hoops I had to jump through to calculate the digests
on text files; trust me, you will regret it.

% supersize `which netpgpverify`
   text    data     bss     dec     hex filename
   4452     860      72    5384    1508 /usr/bin/netpgpverify
  79542    1408       0   80950   13c36 /usr/lib/libz.so.1
  43994     984     488   45466    b19a /usr/lib/libgcc_s.so.1
1318116   49644   69272 1437032  15ed68 /usr/lib/libc.so.12
  57253    4184       0   61437    effd /usr/lib/libbz2.so.1
 108726    1712       0  110438   1af66 /usr/lib/libnetpgpverify.so.4
  1612083    58792   69832   1740707   0x1a8fa3   total
%

% make t
env LD_LIBRARY_PATH=/usr/src/crypto/external/bsd/netpgp-standalone/lib/verify ./netpgpverify -c verify b.gpg > output16
diff expected16 output16
rm -f output16
env LD_LIBRARY_PATH=/usr/src/crypto/external/bsd/netpgp-standalone/lib/verify ./netpgpverify -c verify a.gpg > output17
diff expected17 output17
rm -f output17
env LD_LIBRARY_PATH=/usr/src/crypto/external/bsd/netpgp-standalone/lib/verify ./netpgpverify -c verify gpgsigned-a.gpg > output18
diff expected18 output18
rm -f output18
env LD_LIBRARY_PATH=/usr/src/crypto/external/bsd/netpgp-standalone/lib/verify ./netpgpverify -c verify NetBSD-6.0_RC2_hashes.asc > output19
diff expected19 output19
rm -f output19
...
env LD_LIBRARY_PATH=/usr/src/crypto/external/bsd/netpgp-standalone/lib/verify ./netpgpverify -k dsa-pubring.gpg in2.asc > output45
diff expected45 output45
rm -f output45
env LD_LIBRARY_PATH=/usr/src/crypto/external/bsd/netpgp-standalone/lib/verify ./netpgpverify -k problem-pubring.gpg NetBSD-6.0_hashes.asc > output46
diff expected46 output46
rm -f output46
cd tests/netpgpverify && make && atf-run
atf2kyua: I: Removing stale Kyuafiles from /tmp/.XXXXXX.004966aa
atf2kyua: I: Converting /usr/src/crypto/external/bsd/netpgp-standalone/tests/netpgpverify/Atffile -> /tmp/.XXXXXX.004966aa/Kyuafile
t_netpgpverify:netpgpverify_rsa  ->  passed  [0.221s]
t_netpgpverify:netpgpverify_dsa  ->  passed  [0.117s]

2/2 passed (0 failed)
Committed action 19
%
2012-11-20 05:26:24 +00:00
christos
c254700c5c wait for trousers 2012-11-04 19:46:42 +00:00
christos
df3a32c7fb use LIBDPLIBS 2012-11-04 19:45:58 +00:00
christos
452fa9e672 Hook in TPM utils 2012-11-04 16:29:12 +00:00
christos
0ccc9c4c06 Don't forget to re-assign sock after dup2(); from Jarle Greipsland 2012-10-26 12:42:10 +00:00
christos
839f71d992 Take better care of closing file descriptors in the agent child and dealing
with dup2 and std{in,out,err}.
2012-09-18 15:18:01 +00:00
christos
ff8ddb8d69 fix MKREPRO build not to put Generated from ${NETBSDSRCDIR} in files. 2012-09-05 19:31:04 +00:00
tteras
880340da60 From Roman Hoog Antink <rha@open.ch>: Accept DPD messages with cookies
also in reversed order for compatiblity. At least Cisco 836 running
IOS 12.3(8)T does this.
2012-08-29 12:01:30 +00:00
tteras
6c437507a2 From Roman Hoog Antink <rha@open.ch>: add remote's IP address to the
"certificate not verified" error message.
2012-08-29 11:34:37 +00:00
tteras
f2b1919eeb From Roman Hoog Antink <rha@open.ch>: do not print unnecessary warning
about non-verified certificate when using raw plain-rsa.
2012-08-29 11:24:11 +00:00
manu
5fe2cf73eb Fix make test on powermac G5. Patch from Nakano Takaharu 2012-08-15 14:51:30 +00:00
christos
cd376cd5d3 Prefer SIXTY_FOUR_BIT_LONG instead of SIXTY_FOUR_BIT as before 2012-08-12 17:24:59 +00:00
christos
bfc28188e6 define OPENSSL_THREADS, from drochner. 2012-08-12 12:43:49 +00:00
joerg
e16a720f89 Don't depend on HAVE_GCC being always defined. 2012-08-10 12:20:10 +00:00
christos
cd27e50e59 add #include <machine/asm.h>, use PIC_PLT() 2012-08-04 11:03:34 +00:00
christos
faf72548c4 add this directory to the search path 2012-07-31 11:08:34 +00:00
christos
1a28d260d0 - -m64 is needed for ghash
- add montgomery multiplication assembly
2012-07-31 10:33:45 +00:00
matt
d19212c5d5 Fix mips asm to not use outdated stuff. 2012-07-30 18:40:36 +00:00
christos
6cced2a43a make sure alloca is undefed on SSP 2012-07-30 17:16:23 +00:00
christos
f87f89779c only use alloca if not __SSP__ 2012-07-30 17:15:45 +00:00
martin
a1e40c3f35 Do not use dots in identifiers (replace by _) 2012-07-30 15:00:39 +00:00
matt
fcff60e41a Add sparccpuid.S 2012-07-30 13:53:19 +00:00
christos
c77791c047 fix the generation 2012-07-30 10:25:24 +00:00
matt
72331d9777 Fix init call to OPENSSL_cpuid_setup.
XXX why are using a globally visible routine in a constructor?
2012-07-29 13:17:53 +00:00
christos
4364423588 make sure that the PLT change is not lost 2012-07-28 19:21:57 +00:00
matt
fec343bc7e Call OPENSSL_cpuid_setup through PLT to avoid DT_TEXTREL 2012-07-28 18:06:08 +00:00
matt
8a64184d2a Get new openssl to work on powerpc. 2012-07-27 23:01:23 +00:00
christos
c359006f4e This cannot be used because we are compiling with __ARM_ARCH_3__ and it needs
a minimum of 4
2012-07-27 21:28:24 +00:00
christos
371fb85ca8 remove extra parens that make clang bitchy. 2012-07-27 21:22:55 +00:00
christos
abb96b5702 Instead of leaving the file directive which is inconsistent and may contains
paths, instead include our assembly macros
2012-07-27 19:34:13 +00:00
christos
662e5a1b5f avoid an alloca for SSP 2012-07-27 18:35:57 +00:00
christos
20d591e2dc regen for the new version 2012-07-27 18:22:59 +00:00
christos
25f2218e23 more assembly munging 2012-07-27 18:16:53 +00:00
christos
fc700fffcd provide OPENSSL_cpuid_setup to the haves and the havenots
[still there are other platforms ia64, s370, powerpc64] where we can do better.
2012-07-27 18:10:40 +00:00
christos
59b796f522 undo previous: some ports don't have it in the constructor! 2012-07-27 17:45:59 +00:00
christos
5f605781bc don't do cpuid anymore. 2012-07-27 17:27:43 +00:00
christos
414b1de06c only x86 has AESNI 2012-07-27 16:05:27 +00:00
christos
c0ab76c295 make OPENSSL_cpuid_setup global again 2012-07-27 16:04:30 +00:00
christos
2c88e265bf make this compile. 2012-07-26 21:23:13 +00:00
christos
2131695062 Don't do the PLTGOT for local labels, limit it to OPENSSL_ global symbols. 2012-07-26 21:22:47 +00:00
christos
11b09fe68b put back support for AES-NI. 2012-07-26 20:21:20 +00:00
christos
e3d33c0426 merge openssl-1.0.1c 2012-07-26 19:58:36 +00:00
christos
32daad53f7 from ftp.openssl.org 2012-07-26 14:58:16 +00:00
christos
443e5cbbb2 remove mdc2 and idea handling 2012-07-13 19:32:51 +00:00
christos
0909c5ab7c oops, add all the files 2012-07-12 18:44:49 +00:00
christos
d9a6861d6d no need for MKCRYPTO_IDEA 2012-07-11 19:01:02 +00:00
christos
e6f6cceebd remove unneeded libraries 2012-07-11 18:50:23 +00:00
christos
6a574bf521 Enable ciphers with expired patents:
mdc2 4,908,861 (expired August 28, 2007)
idea 5,214,703 (expired January 7, 2012)
2012-07-11 18:48:27 +00:00
christos
f5b2f99aea - centralize WARNS=4, no need for WARNS=0 for the linker errors
(linking against) dummy idea
- add MKCRYPTO_IDEA support. Alas the code does not seem work accept my
  passphrase on the idea key. A bug?
2012-07-10 19:38:17 +00:00
christos
0c8e933f1b reflect reality. We don't need .a libraries to link against anymore, and
we are not aboting, but exiting.
2012-07-10 19:35:58 +00:00
christos
1a12a170b1 Enable shared libraries for patented cyphers.
Needed since netpgp.so must include them before -lcrypto to enable.
2012-07-10 18:59:21 +00:00
jdf
84bfda063b Change little wording error (s/associate/associated/) and formatting error.
Patch proposal was sent upstream to Heimdal as well.
Patch by jklowden in PR lib/46651.
2012-07-04 20:46:14 +00:00
njoly
0e4029fbef Small spacing fix. Unbreaks section in xref. 2012-06-04 14:24:03 +00:00
drochner
4c2e6ed1da pull in upstream rev.22547:
Sanity check record length before skipping explicit IV in TLS 1.2, 1.1
and DTLS to fix DoS attack.
(CVE-2012-2333)
2012-05-11 18:07:33 +00:00
christos
845f0e2763 bump 2012-05-02 02:41:13 +00:00
christos
091c4109a8 merge OpenSSH 6.0
Features:

 * ssh-keygen(1): Add optional checkpoints for moduli screening
 * ssh-add(1): new -k option to load plain keys (skipping certificates)
 * sshd(8): Add wildcard support to PermitOpen, allowing things like
   "PermitOpen localhost:*".  bz #1857
 * ssh(1): support for cancelling local and remote port forwards via the
   multiplex socket. Use ssh -O cancel -L xx:xx:xx -R yy:yy:yy user@host"
   to request the cancellation of the specified forwardings
 * support cancellation of local/dynamic forwardings from ~C commandline

Bugfixes:

 * ssh(1): ensure that $DISPLAY contains only valid characters before
   using it to extract xauth data so that it can't be used to play local
   shell metacharacter games.
 * ssh(1): unbreak remote portforwarding with dynamic allocated listen ports
 * scp(1): uppress adding '--' to remote commandlines when the first
   argument does not start with '-'. saves breakage on some
   difficult-to-upgrade embedded/router platforms
 * ssh(1)/sshd(8): fix typo in IPQoS parsing: there is no "AF14" class,
   but there is an "AF21" class
 * ssh(1)/sshd(8): do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during
   rekeying
 * ssh(1): skip attempting to create ~/.ssh when -F is passed
 * sshd(8): unbreak stdio forwarding when ControlPersist is in use; bz#1943
 * sshd(1): send tty break to pty master instead of (probably already
   closed) slave side; bz#1859
 * sftp(1): silence error spam for "ls */foo" in directory with files;
   bz#1683
 * Fixed a number of memory and file descriptor leaks
2012-05-02 02:41:08 +00:00
tls
011988ad52 Add new "SendVersionFirst" option to OpenSSH client. This option makes
the client send its version string first if it is configured to speak
v2 only (the old hack of waiting to see the server version is only
really useful if you might be speaking v1 to some servers).  The option
is on by default but can be disabled from the config file.

This aligns the OpenSSH client behavior with most other implementations
and eliminates a major source of connection delays and failures when
speaking SSH through particularly stupid proxies, of which, sadly, there
are many.

This change has also been submitted to OpenSSH as their bug #1999.
2012-04-27 15:45:37 +00:00
drochner
b0eecc93cf fix for previous fix: correct error code (upstream rev.22474) 2012-04-25 11:02:46 +00:00
drochner
c89bad5193 pull in upstream SVN rev. 22439:
check for potentially exploitable overflows in asn1_d2i_read_bio
BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
in CRYPTO_realloc_clean. (CVE-2012-2110)
2012-04-19 20:20:56 +00:00
christos
07636659d9 Minimize diffs. 2012-04-14 01:34:37 +00:00
christos
4dd26a2880 use getpassfd() 2012-04-13 23:57:08 +00:00
tls
36a4733e75 Fix applications that call RAND_bytes() before any other RAND function.
Last change was...a bit too simple.
2012-03-07 10:17:47 +00:00
tls
48b3ca7292 Patch OpenSSL RNG to allow explicit initial seeding. Patch OpenSSH to
explicitly seed the OpenSSL RNG in each new process rather than letting
it repeatedly open /dev/urandom to reseed, which depletes entropy severely.

Note that the OpenSSH part of this fix works better on NetBSD than it would
on many other platforms because on NetBSD, if you don't reopen /dev/urandom,
repeated reads don't deplete entropy.  On other platforms, some other
approach might be required.

Note also that this problem does not arise on OpenBSD because OpenBSD seems
to have patched OpenSSL to seed the RAND functions from arc4random()!  That
seems dangerous, so I am not taking that approach here.
2012-03-05 20:13:36 +00:00
christos
94fcde8eaf Fix compilation:
kill PGP_ERROR() and make everything use a format.
XXX: Fixme to use __VA_ARGS__ instead of the silly PGP_ERROR_N() macros.
2012-03-05 02:20:18 +00:00
agc
ddccfadc5f Use %s for the format string, as pointed out by joerg in the diff for
__printflike attributions (on tech-userlevel, March 1st 2012).
2012-03-04 19:52:02 +00:00
drochner
582e7c9a93 apply upstream rev.22146: Tolerate bad MIME headers in parser.
avoids possible NULL dereference (CVE-2006-7248)
2012-02-28 17:23:58 +00:00
agc
1ce8f15ce5 Add the --trusted-keys argument to netpgpkeys(1) to print out PGP ids in a
machine-readable manner.
2012-02-22 06:58:54 +00:00
agc
c636a2b399 re-order the fields that we print out in the pgp_sprint_pubkey() function
to be more usual.

print out the name from within pgp_sprint_pubkey() rather than tagging it
onto the end of the output from the function.
2012-02-22 06:29:40 +00:00