* New upstream release (closes: #395507, #397961, #420035). Important

  changes not previously backported to 4.3p2:
  - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
    + On portable OpenSSH, fix a GSSAPI authentication abort that could be
      used to determine the validity of usernames on some platforms.
    + Implemented conditional configuration in sshd_config(5) using the
      "Match" directive. This allows some configuration options to be
      selectively overridden if specific criteria (based on user, group,
      hostname and/or address) are met. So far a useful subset of
      post-authentication options are supported and more are expected to
      be added in future releases.
    + Add support for Diffie-Hellman group exchange key agreement with a
      final hash of SHA256.
    + Added a "ForceCommand" directive to sshd_config(5). Similar to the
      command="..." option accepted in ~/.ssh/authorized_keys, this forces
      the execution of the specified command regardless of what the user
      requested. This is very useful in conjunction with the new "Match"
      option.
    + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
      permitopen="..." authorized_keys option, allowing fine-grained
      control over the port-forwardings that a user is allowed to
      establish.
    + Add optional logging of transactions to sftp-server(8).
    + ssh(1) will now record port numbers for hosts stored in
      ~/.ssh/known_hosts when a non-standard port has been requested
      (closes: #50612).
    + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
      non-zero exit code) when requested port forwardings could not be
      established.
    + Extend sshd_config(5) "SubSystem" declarations to allow the
      specification of command-line arguments.
    + Replacement of all integer overflow susceptible invocations of
      malloc(3) and realloc(3) with overflow-checking equivalents.
    + Many manpage fixes and improvements.
    + Add optional support for OpenSSL hardware accelerators (engines),
      enabled using the --with-ssl-engine configure option.
    + Tokens in configuration files may be double-quoted in order to
      contain spaces (closes: #319639).
    + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
      session exits very quickly (closes: #307890).
    + Fix some incorrect buffer allocation calculations (closes: #410599).
    + ssh-add doesn't ask for a passphrase if key file permissions are too
      liberal (closes: #103677).
    + Likewise, ssh doesn't ask either (closes: #99675).
  - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
    + sshd now allows the enabling and disabling of authentication methods
      on a per user, group, host and network basis via the Match directive
      in sshd_config.
    + Fixed an inconsistent check for a terminal when displaying scp
      progress meter (closes: #257524).
    + Fix "hang on exit" when background processes are running at the time
      of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
  install ChangeLog.gssapi.

1 files changed, 49 insertions, 37 deletions

diff --git a/moduli.c b/moduli.c
index d53806ea6..8fa545daf 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.12 2005/07/17 07:17:55 djm Exp $ */
+/* $OpenBSD: moduli.c,v 1.20 2007/02/24 03:30:11 ray Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -38,11 +38,20 @@
  */
 
 #include "includes.h"
-#include "xmalloc.h"
-#include "log.h"
+
+#include <sys/types.h>
 
 #include <openssl/bn.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
+
+#include "xmalloc.h"
+#include "log.h"
+
 /*
  * File output defines
  */
@@ -301,21 +310,10 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start)
                 largewords = (largememory << SHIFT_MEGAWORD);
         }
 
-        TinySieve = calloc(tinywords, sizeof(u_int32_t));
-        if (TinySieve == NULL) {
-                error("Insufficient memory for tiny sieve: need %u bytes",
-                    tinywords << SHIFT_BYTE);
-                exit(1);
-        }
+        TinySieve = xcalloc(tinywords, sizeof(u_int32_t));
         tinybits = tinywords << SHIFT_WORD;
 
-        SmallSieve = calloc(smallwords, sizeof(u_int32_t));
-        if (SmallSieve == NULL) {
-                error("Insufficient memory for small sieve: need %u bytes",
-                    smallwords << SHIFT_BYTE);
-                xfree(TinySieve);
-                exit(1);
-        }
+        SmallSieve = xcalloc(smallwords, sizeof(u_int32_t));
         smallbits = smallwords << SHIFT_WORD;
 
         /*
@@ -329,20 +327,26 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start)
 
         /* validation check: count the number of primes tried */
         largetries = 0;
-        q = BN_new();
+        if ((q = BN_new()) == NULL)
+                fatal("BN_new failed");
 
         /*
          * Generate random starting point for subprime search, or use
          * specified parameter.
          */
-        largebase = BN_new();
-        if (start == NULL)
-                BN_rand(largebase, power, 1, 1);
-        else
-                BN_copy(largebase, start);
+        if ((largebase = BN_new()) == NULL)
+                fatal("BN_new failed");
+        if (start == NULL) {
+                if (BN_rand(largebase, power, 1, 1) == 0)
+                        fatal("BN_rand failed");
+        } else {
+                if (BN_copy(largebase, start) == NULL)
+                        fatal("BN_copy: failed");
+        }
 
         /* ensure odd */
-        BN_set_bit(largebase, 0);
+        if (BN_set_bit(largebase, 0) == 0)
+                fatal("BN_set_bit: failed");
 
         time(&time_start);
 
@@ -426,8 +430,10 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start)
                         continue; /* Definitely composite, skip */
 
                 debug2("test q = largebase+%u", 2 * j);
-                BN_set_word(q, 2 * j);
-                BN_add(q, q, largebase);
+                if (BN_set_word(q, 2 * j) == 0)
+                        fatal("BN_set_word failed");
+                if (BN_add(q, q, largebase) == 0)
+                        fatal("BN_add failed");
                 if (qfileout(out, QTYPE_SOPHIE_GERMAIN, QTEST_SIEVE,
                     largetries, (power - 1) /* MSB */, (0), q) == -1) {
                         ret = -1;
@@ -472,20 +478,21 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted)
 
         time(&time_start);
 
-        p = BN_new();
-        q = BN_new();
-        ctx = BN_CTX_new();
+        if ((p = BN_new()) == NULL)
+                fatal("BN_new failed");
+        if ((q = BN_new()) == NULL)
+                fatal("BN_new failed");
+        if ((ctx = BN_CTX_new()) == NULL)
+                fatal("BN_CTX_new failed");
 
         debug2("%.24s Final %u Miller-Rabin trials (%x generator)",
             ctime(&time_start), trials, generator_wanted);
 
         res = 0;
         lp = xmalloc(QLINESIZE + 1);
-        while (fgets(lp, QLINESIZE, in) != NULL) {
-                int ll = strlen(lp);
-
+        while (fgets(lp, QLINESIZE + 1, in) != NULL) {
                 count_in++;
-                if (ll < 14 || *lp == '!' || *lp == '#') {
+                if (strlen(lp) < 14 || *lp == '!' || *lp == '#') {
                         debug2("%10u: comment or short line", count_in);
                         continue;
                 }
@@ -522,10 +529,13 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted)
                 case QTYPE_SOPHIE_GERMAIN:
                         debug2("%10u: (%u) Sophie-Germain", count_in, in_type);
                         a = q;
-                        BN_hex2bn(&a, cp);
+                        if (BN_hex2bn(&a, cp) == 0)
+                                fatal("BN_hex2bn failed");
                         /* p = 2*q + 1 */
-                        BN_lshift(p, q, 1);
-                        BN_add_word(p, 1);
+                        if (BN_lshift(p, q, 1) == 0)
+                                fatal("BN_lshift failed");
+                        if (BN_add_word(p, 1) == 0)
+                                fatal("BN_add_word failed");
                         in_size += 1;
                         generator_known = 0;
                         break;
@@ -536,9 +546,11 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted)
                 case QTYPE_UNKNOWN:
                         debug2("%10u: (%u)", count_in, in_type);
                         a = p;
-                        BN_hex2bn(&a, cp);
+                        if (BN_hex2bn(&a, cp) == 0)
+                                fatal("BN_hex2bn failed");
                         /* q = (p-1) / 2 */
-                        BN_rshift(q, p, 1);
+                        if (BN_rshift(q, p, 1) == 0)
+                                fatal("BN_rshift failed");
                         break;
                 default:
                         debug2("Unknown prime type");