2 files changed, 346 insertions, 14 deletions

diff --git a/src/lib/libcrypto/bn/asm/mips3-mont.pl b/src/lib/libcrypto/bn/asm/mips3-mont.pl
new file mode 100644
index 0000000000..8f9156e02a
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/mips3-mont.pl
@@ -0,0 +1,327 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. The module is, however, dual licensed under OpenSSL and
+# CRYPTOGAMS licenses depending on where you obtain it. For further
+# details see http://www.openssl.org/~appro/cryptogams/.
+# ====================================================================
+
+# This module doesn't present direct interest for OpenSSL, because it
+# doesn't provide better performance for longer keys. While 512-bit
+# RSA private key operations are 40% faster, 1024-bit ones are hardly
+# faster at all, while longer key operations are slower by up to 20%.
+# It might be of interest to embedded system developers though, as
+# it's smaller than 1KB, yet offers ~3x improvement over compiler
+# generated code.
+#
+# The module targets N32 and N64 MIPS ABIs and currently is a bit
+# IRIX-centric, i.e. is likely to require adaptation for other OSes.
+
+# int bn_mul_mont(
+$rp="a0";       # BN_ULONG *rp,
+$ap="a1";       # const BN_ULONG *ap,
+$bp="a2";       # const BN_ULONG *bp,
+$np="a3";       # const BN_ULONG *np,
+$n0="a4";       # const BN_ULONG *n0,
+$num="a5";      # int num);
+
+$lo0="a6";
+$hi0="a7";
+$lo1="v0";
+$hi1="v1";
+$aj="t0";
+$bi="t1";
+$nj="t2";
+$tp="t3";
+$alo="s0";
+$ahi="s1";
+$nlo="s2";
+$nhi="s3";
+$tj="s4";
+$i="s5";
+$j="s6";
+$fp="t8";
+$m1="t9";
+
+$FRAME=8*(2+8);
+
+$code=<<___;
+#include <asm.h>
+#include <regdef.h>
+
+.text
+
+.set    noat
+.set    reorder
+
+.align  5
+.globl  bn_mul_mont
+.ent    bn_mul_mont
+bn_mul_mont:
+        .set    noreorder
+        PTR_SUB sp,64
+        move    $fp,sp
+        .frame  $fp,64,ra
+        slt     AT,$num,4
+        li      v0,0
+        beqzl   AT,.Lproceed
+        nop
+        jr      ra
+        PTR_ADD sp,$fp,64
+        .set    reorder
+.align  5
+.Lproceed:
+        ld      $n0,0($n0)
+        ld      $bi,0($bp)      # bp[0]
+        ld      $aj,0($ap)      # ap[0]
+        ld      $nj,0($np)      # np[0]
+        PTR_SUB sp,16           # place for two extra words
+        sll     $num,3
+        li      AT,-4096
+        PTR_SUB sp,$num
+        and     sp,AT
+
+        sd      s0,0($fp)
+        sd      s1,8($fp)
+        sd      s2,16($fp)
+        sd      s3,24($fp)
+        sd      s4,32($fp)
+        sd      s5,40($fp)
+        sd      s6,48($fp)
+        sd      s7,56($fp)
+
+        dmultu  $aj,$bi
+        ld      $alo,8($ap)
+        ld      $nlo,8($np)
+        mflo    $lo0
+        mfhi    $hi0
+        dmultu  $lo0,$n0
+        mflo    $m1
+
+        dmultu  $alo,$bi
+        mflo    $alo
+        mfhi    $ahi
+
+        dmultu  $nj,$m1
+        mflo    $lo1
+        mfhi    $hi1
+        dmultu  $nlo,$m1
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        daddu   $hi1,AT
+        mflo    $nlo
+        mfhi    $nhi
+
+        move    $tp,sp
+        li      $j,16
+.align  4
+.L1st:
+        .set    noreorder
+        PTR_ADD $aj,$ap,$j
+        ld      $aj,($aj)
+        PTR_ADD $nj,$np,$j
+        ld      $nj,($nj)
+
+        dmultu  $aj,$bi
+        daddu   $lo0,$alo,$hi0
+        daddu   $lo1,$nlo,$hi1
+        sltu    AT,$lo0,$hi0
+        sltu    s7,$lo1,$hi1
+        daddu   $hi0,$ahi,AT
+        daddu   $hi1,$nhi,s7
+        mflo    $alo
+        mfhi    $ahi
+
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        dmultu  $nj,$m1
+        daddu   $hi1,AT
+        addu    $j,8
+        sd      $lo1,($tp)
+        sltu    s7,$j,$num
+        mflo    $nlo
+        mfhi    $nhi
+
+        bnez    s7,.L1st
+        PTR_ADD $tp,8
+        .set    reorder
+
+        daddu   $lo0,$alo,$hi0
+        sltu    AT,$lo0,$hi0
+        daddu   $hi0,$ahi,AT
+
+        daddu   $lo1,$nlo,$hi1
+        sltu    s7,$lo1,$hi1
+        daddu   $hi1,$nhi,s7
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        daddu   $hi1,AT
+
+        sd      $lo1,($tp)
+
+        daddu   $hi1,$hi0
+        sltu    AT,$hi1,$hi0
+        sd      $hi1,8($tp)
+        sd      AT,16($tp)
+
+        li      $i,8
+.align  4
+.Louter:
+        PTR_ADD $bi,$bp,$i
+        ld      $bi,($bi)
+        ld      $aj,($ap)
+        ld      $alo,8($ap)
+        ld      $tj,(sp)
+
+        dmultu  $aj,$bi
+        ld      $nj,($np)
+        ld      $nlo,8($np)
+        mflo    $lo0
+        mfhi    $hi0
+        daddu   $lo0,$tj
+        dmultu  $lo0,$n0
+        sltu    AT,$lo0,$tj
+        daddu   $hi0,AT
+        mflo    $m1
+
+        dmultu  $alo,$bi
+        mflo    $alo
+        mfhi    $ahi
+
+        dmultu  $nj,$m1
+        mflo    $lo1
+        mfhi    $hi1
+
+        dmultu  $nlo,$m1
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        daddu   $hi1,AT
+        mflo    $nlo
+        mfhi    $nhi
+
+        move    $tp,sp
+        li      $j,16
+        ld      $tj,8($tp)
+.align  4
+.Linner:
+        .set    noreorder
+        PTR_ADD $aj,$ap,$j
+        ld      $aj,($aj)
+        PTR_ADD $nj,$np,$j
+        ld      $nj,($nj)
+
+        dmultu  $aj,$bi
+        daddu   $lo0,$alo,$hi0
+        daddu   $lo1,$nlo,$hi1
+        sltu    AT,$lo0,$hi0
+        sltu    s7,$lo1,$hi1
+        daddu   $hi0,$ahi,AT
+        daddu   $hi1,$nhi,s7
+        mflo    $alo
+        mfhi    $ahi
+
+        daddu   $lo0,$tj
+        addu    $j,8
+        dmultu  $nj,$m1
+        sltu    AT,$lo0,$tj
+        daddu   $lo1,$lo0
+        daddu   $hi0,AT
+        sltu    s7,$lo1,$lo0
+        ld      $tj,16($tp)
+        daddu   $hi1,s7
+        sltu    AT,$j,$num
+        mflo    $nlo
+        mfhi    $nhi
+        sd      $lo1,($tp)
+        bnez    AT,.Linner
+        PTR_ADD $tp,8
+        .set    reorder
+
+        daddu   $lo0,$alo,$hi0
+        sltu    AT,$lo0,$hi0
+        daddu   $hi0,$ahi,AT
+        daddu   $lo0,$tj
+        sltu    s7,$lo0,$tj
+        daddu   $hi0,s7
+
+        ld      $tj,16($tp)
+        daddu   $lo1,$nlo,$hi1
+        sltu    AT,$lo1,$hi1
+        daddu   $hi1,$nhi,AT
+        daddu   $lo1,$lo0
+        sltu    s7,$lo1,$lo0
+        daddu   $hi1,s7
+        sd      $lo1,($tp)
+
+        daddu   $lo1,$hi1,$hi0
+        sltu    $hi1,$lo1,$hi0
+        daddu   $lo1,$tj
+        sltu    AT,$lo1,$tj
+        daddu   $hi1,AT
+        sd      $lo1,8($tp)
+        sd      $hi1,16($tp)
+
+        addu    $i,8
+        sltu    s7,$i,$num
+        bnez    s7,.Louter
+
+        .set    noreorder
+        PTR_ADD $tj,sp,$num     # &tp[num]
+        move    $tp,sp
+        move    $ap,sp
+        li      $hi0,0          # clear borrow bit
+
+.align  4
+.Lsub:  ld      $lo0,($tp)
+        ld      $lo1,($np)
+        PTR_ADD $tp,8
+        PTR_ADD $np,8
+        dsubu   $lo1,$lo0,$lo1  # tp[i]-np[i]
+        sgtu    AT,$lo1,$lo0
+        dsubu   $lo0,$lo1,$hi0
+        sgtu    $hi0,$lo0,$lo1
+        sd      $lo0,($rp)
+        or      $hi0,AT
+        sltu    AT,$tp,$tj
+        bnez    AT,.Lsub
+        PTR_ADD $rp,8
+
+        dsubu   $hi0,$hi1,$hi0  # handle upmost overflow bit
+        move    $tp,sp
+        PTR_SUB $rp,$num        # restore rp
+        not     $hi1,$hi0
+
+        and     $ap,$hi0,sp
+        and     $bp,$hi1,$rp
+        or      $ap,$ap,$bp     # ap=borrow?tp:rp
+
+.align  4
+.Lcopy: ld      $aj,($ap)
+        PTR_ADD $ap,8
+        PTR_ADD $tp,8
+        sd      zero,-8($tp)
+        sltu    AT,$tp,$tj
+        sd      $aj,($rp)
+        bnez    AT,.Lcopy
+        PTR_ADD $rp,8
+
+        ld      s0,0($fp)
+        ld      s1,8($fp)
+        ld      s2,16($fp)
+        ld      s3,24($fp)
+        ld      s4,32($fp)
+        ld      s5,40($fp)
+        ld      s6,48($fp)
+        ld      s7,56($fp)
+        li      v0,1
+        jr      ra
+        PTR_ADD sp,$fp,64
+        .set    reorder
+END(bn_mul_mont)
+.rdata
+.asciiz "Montgomery Multiplication for MIPS III/IV, CRYPTOGAMS by <appro\@openssl.org>"
+___
+
+print $code;
+close STDOUT;
diff --git a/src/lib/libcrypto/x509v3/v3_addr.c b/src/lib/libcrypto/x509v3/v3_addr.c
index a37f844d3c..efdf7c3ba7 100644
--- a/src/lib/libcrypto/x509v3/v3_addr.c
+++ b/src/lib/libcrypto/x509v3/v3_addr.c
@@ -61,7 +61,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
+
 #include "cryptlib.h"
 #include <openssl/conf.h>
 #include <openssl/asn1.h>
@@ -128,7 +128,7 @@ static int length_from_afi(const unsigned afi)
 /*
  * Extract the AFI from an IPAddressFamily.
  */
-unsigned v3_addr_get_afi(const IPAddressFamily *f)
+unsigned int v3_addr_get_afi(const IPAddressFamily *f)
 {
   return ((f != NULL &&
            f->addressFamily != NULL &&
@@ -147,7 +147,7 @@ static void addr_expand(unsigned char *addr,
                         const int length,
                         const unsigned char fill)
 {
-  assert(bs->length >= 0 && bs->length <= length);
+  OPENSSL_assert(bs->length >= 0 && bs->length <= length);
   if (bs->length > 0) {
     memcpy(addr, bs->data, bs->length);
     if ((bs->flags & 7) != 0) {
@@ -190,6 +190,8 @@ static int i2r_address(BIO *out,
       BIO_printf(out, "%x%s", (addr[i] << 8) | addr[i+1], (i < 14 ? ":" : ""));
     if (i < 16)
       BIO_puts(out, ":");
+    if (i == 0)
+      BIO_puts(out, ":");
     break;
   default:
     for (i = 0; i < bs->length; i++)
@@ -243,7 +245,7 @@ static int i2r_IPAddrBlocks(X509V3_EXT_METHOD *method,
   int i;
   for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
     IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
-    const unsigned afi = v3_addr_get_afi(f);
+    const unsigned int afi = v3_addr_get_afi(f);
     switch (afi) {
     case IANA_AFI_IPV4:
       BIO_printf(out, "%*sIPv4", indent, "");
@@ -453,7 +455,7 @@ static int make_addressRange(IPAddressOrRange **result,
   if ((aor = IPAddressOrRange_new()) == NULL)
     return 0;
   aor->type = IPAddressOrRange_addressRange;
-  assert(aor->u.addressRange == NULL);
+  OPENSSL_assert(aor->u.addressRange == NULL);
   if ((aor->u.addressRange = IPAddressRange_new()) == NULL)
     goto err;
   if (aor->u.addressRange->min == NULL &&
@@ -522,7 +524,7 @@ static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
 
   for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
     f = sk_IPAddressFamily_value(addr, i);
-    assert(f->addressFamily->data != NULL);
+    OPENSSL_assert(f->addressFamily->data != NULL);
     if (f->addressFamily->length == keylen &&
         !memcmp(f->addressFamily->data, key, keylen))
       return f;
@@ -654,7 +656,7 @@ static void extract_min_max(IPAddressOrRange *aor,
                             unsigned char *max,
                             int length)
 {
-  assert(aor != NULL && min != NULL && max != NULL);
+  OPENSSL_assert(aor != NULL && min != NULL && max != NULL);
   switch (aor->type) {
   case IPAddressOrRange_addressPrefix:
     addr_expand(min, aor->u.addressPrefix, length, 0x00);
@@ -880,7 +882,7 @@ int v3_addr_canonize(IPAddrBlocks *addr)
   }
   (void)sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
   sk_IPAddressFamily_sort(addr);
-  assert(v3_addr_is_canonical(addr));
+  OPENSSL_assert(v3_addr_is_canonical(addr));
   return 1;
 }
 
@@ -1127,7 +1129,10 @@ int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
   for (i = 0; i < sk_IPAddressFamily_num(a); i++) {
     IPAddressFamily *fa = sk_IPAddressFamily_value(a, i);
     int j = sk_IPAddressFamily_find(b, fa);
-    IPAddressFamily *fb = sk_IPAddressFamily_value(b, j);
+    IPAddressFamily *fb;
+    fb = sk_IPAddressFamily_value(b, j);
+    if (fb == NULL)
+       return 0;
     if (!addr_contains(fb->ipAddressChoice->u.addressesOrRanges, 
                        fa->ipAddressChoice->u.addressesOrRanges,
                        length_from_afi(v3_addr_get_afi(fb))))
@@ -1164,9 +1169,9 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
   int i, j, ret = 1;
   X509 *x = NULL;
 
-  assert(chain != NULL && sk_X509_num(chain) > 0);
-  assert(ctx != NULL || ext != NULL);
-  assert(ctx == NULL || ctx->verify_cb != NULL);
+  OPENSSL_assert(chain != NULL && sk_X509_num(chain) > 0);
+  OPENSSL_assert(ctx != NULL || ext != NULL);
+  OPENSSL_assert(ctx == NULL || ctx->verify_cb != NULL);
 
   /*
    * Figure out where to start.  If we don't have an extension to
@@ -1178,7 +1183,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
   } else {
     i = 0;
     x = sk_X509_value(chain, i);
-    assert(x != NULL);
+    OPENSSL_assert(x != NULL);
     if ((ext = x->rfc3779_addr) == NULL)
       goto done;
   }
@@ -1197,7 +1202,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
    */
   for (i++; i < sk_X509_num(chain); i++) {
     x = sk_X509_value(chain, i);
-    assert(x != NULL);
+    OPENSSL_assert(x != NULL);
     if (!v3_addr_is_canonical(x->rfc3779_addr))
       validation_err(X509_V_ERR_INVALID_EXTENSION);
     if (x->rfc3779_addr == NULL) {