This commit was manufactured by cvs2svn to create tag 'Makefile'.

git-svn-id: svn://10.0.0.236/tags/Makefile@142414 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/nss/lib/freebl/GF2m_ecl.c

@@ -0,0 +1,539 @@
+/*
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial
+ * field curves.
+ *
+ * The Initial Developer of the Original Code is Sun Microsystems, Inc.
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Douglas Stebila <douglas@stebila.ca>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ */
+
+#ifdef NSS_ENABLE_ECC
+/*
+ * GF2m_ecl.c: Contains an implementation of elliptic curve math library
+ * for curves over GF2m.
+ *
+ * XXX Can be moved to a separate subdirectory later.
+ *
+ */
+
+#include "GF2m_ecl.h"
+#include "mpi/mplogic.h"
+#include "mpi/mp_gf2m.h"
+#include <stdlib.h>
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+mp_err 
+GF2m_ec_pt_is_inf_aff(const mp_int *px, const mp_int *py)
+{
+
+    if ((mp_cmp_z(px) == 0) && (mp_cmp_z(py) == 0)) {
+        return MP_YES;
+    } else {
+        return MP_NO;
+    }
+
+}
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+mp_err 
+GF2m_ec_pt_set_inf_aff(mp_int *px, mp_int *py)
+{
+    mp_zero(px);
+    mp_zero(py);
+    return MP_OKAY;
+}
+
+/* Computes R = P + Q based on IEEE P1363 A.10.2.
+ * Elliptic curve points P, Q, and R can all be identical.
+ * Uses affine coordinates.
+ */
+mp_err 
+GF2m_ec_pt_add_aff(const mp_int *pp, const mp_int *a, const mp_int *px, 
+    const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int lambda, xtemp, ytemp;
+    unsigned int *p;
+    int p_size;
+
+    p_size = mp_bpoly2arr(pp, p, 0) + 1;
+    p = (unsigned int *) (malloc(sizeof(unsigned int) * p_size));
+    if (p == NULL) goto cleanup;
+    mp_bpoly2arr(pp, p, p_size);
+    
+    CHECK_MPI_OK( mp_init(&lambda) );
+    CHECK_MPI_OK( mp_init(&xtemp) );
+    CHECK_MPI_OK( mp_init(&ytemp) );
+    /* if P = inf, then R = Q */
+    if (GF2m_ec_pt_is_inf_aff(px, py) == 0) {
+        CHECK_MPI_OK( mp_copy(qx, rx) );
+        CHECK_MPI_OK( mp_copy(qy, ry) );
+        err = MP_OKAY;
+        goto cleanup;
+    }
+    /* if Q = inf, then R = P */
+    if (GF2m_ec_pt_is_inf_aff(qx, qy) == 0) {
+        CHECK_MPI_OK( mp_copy(px, rx) );
+        CHECK_MPI_OK( mp_copy(py, ry) );
+        err = MP_OKAY;
+        goto cleanup;
+    }
+    /* if px != qx, then lambda = (py+qy) / (px+qx), 
+     *                   xtemp = a + lambda^2 + lambda + px + qx
+     */
+    if (mp_cmp(px, qx) != 0) {
+        CHECK_MPI_OK( mp_badd(py, qy, &ytemp) );
+        CHECK_MPI_OK( mp_badd(px, qx, &xtemp) );
+        CHECK_MPI_OK( mp_bdivmod(&ytemp, &xtemp, pp, p, &lambda) );
+        CHECK_MPI_OK( mp_bsqrmod(&lambda, p, &xtemp) );
+        CHECK_MPI_OK( mp_badd(&xtemp, &lambda, &xtemp) );
+        CHECK_MPI_OK( mp_badd(&xtemp, a, &xtemp) );
+        CHECK_MPI_OK( mp_badd(&xtemp, px, &xtemp) );
+        CHECK_MPI_OK( mp_badd(&xtemp, qx, &xtemp) );
+    } else {
+        /* if py != qy or qx = 0, then R = inf */
+        if (((mp_cmp(py, qy) != 0)) || (mp_cmp_z(qx) == 0)) {
+            mp_zero(rx);
+            mp_zero(ry);
+            err = MP_OKAY;
+            goto cleanup;
+        }
+        /* lambda = qx + qy / qx  */
+        CHECK_MPI_OK( mp_bdivmod(qy, qx, pp, p, &lambda) );
+        CHECK_MPI_OK( mp_badd(&lambda, qx, &lambda) );
+        /* xtemp = a + lambda^2 + lambda */
+        CHECK_MPI_OK( mp_bsqrmod(&lambda, p, &xtemp) );
+        CHECK_MPI_OK( mp_badd(&xtemp, &lambda, &xtemp) );
+        CHECK_MPI_OK( mp_badd(&xtemp, a, &xtemp) );
+    }
+    /* ry = (qx + xtemp) * lambda + xtemp + qy */
+    CHECK_MPI_OK( mp_badd(qx, &xtemp, &ytemp) );
+    CHECK_MPI_OK( mp_bmulmod(&ytemp, &lambda, p, &ytemp) );
+    CHECK_MPI_OK( mp_badd(&ytemp, &xtemp, &ytemp) );
+    CHECK_MPI_OK( mp_badd(&ytemp, qy, ry) );
+    /* rx = xtemp */
+    CHECK_MPI_OK( mp_copy(&xtemp, rx) );
+
+cleanup:
+    mp_clear(&lambda);
+    mp_clear(&xtemp);
+    mp_clear(&ytemp);
+    free(p);
+    return err;
+}
+
+/* Computes R = P - Q. 
+ * Elliptic curve points P, Q, and R can all be identical.
+ * Uses affine coordinates.
+ */
+mp_err 
+GF2m_ec_pt_sub_aff(const mp_int *pp, const mp_int *a, const mp_int *px, 
+    const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int nqy;
+    MP_DIGITS(&nqy) = 0;
+    CHECK_MPI_OK( mp_init(&nqy) );
+    /* nqy = qx+qy */
+    CHECK_MPI_OK( mp_badd(qx, qy, &nqy) );
+    err = GF2m_ec_pt_add_aff(pp, a, px, py, qx, &nqy, rx, ry);
+cleanup:
+    mp_clear(&nqy);
+    return err;
+}
+
+/* Computes R = 2P. 
+ * Elliptic curve points P and R can be identical.
+ * Uses affine coordinates.
+ */
+mp_err 
+GF2m_ec_pt_dbl_aff(const mp_int *pp, const mp_int *a, const mp_int *px, 
+    const mp_int *py, mp_int *rx, mp_int *ry)
+{
+    return GF2m_ec_pt_add_aff(pp, a, px, py, px, py, rx, ry);
+}
+
+/* Gets the i'th bit in the binary representation of a.
+ * If i >= length(a), then return 0.
+ * (The above behaviour differs from mpl_get_bit, which
+ * causes an error if i >= length(a).)
+ */
+#define MP_GET_BIT(a, i) \
+    ((i) >= mpl_significant_bits((a))) ? 0 : mpl_get_bit((a), (i))
+
+/* Computes R = nP based on IEEE P1363 A.10.3.
+ * Elliptic curve points P and R can be identical.
+ * Uses affine coordinates.
+ */
+mp_err 
+GF2m_ec_pt_mul_aff(const mp_int *pp, const mp_int *a, const mp_int *b, 
+    const mp_int *px, const mp_int *py, const mp_int *n, 
+    mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int k, k3, qx, qy, sx, sy;
+    int b1, b3, i, l;
+    unsigned int *p;
+    int p_size;
+
+    MP_DIGITS(&k) = 0;
+    MP_DIGITS(&k3) = 0;
+    MP_DIGITS(&qx) = 0;
+    MP_DIGITS(&qy) = 0;
+    MP_DIGITS(&sx) = 0;
+    MP_DIGITS(&sy) = 0;
+    CHECK_MPI_OK( mp_init(&k) );
+    CHECK_MPI_OK( mp_init(&k3) );
+    CHECK_MPI_OK( mp_init(&qx) );
+    CHECK_MPI_OK( mp_init(&qy) );
+    CHECK_MPI_OK( mp_init(&sx) );
+    CHECK_MPI_OK( mp_init(&sy) );
+    
+    p_size = mp_bpoly2arr(pp, p, 0) + 1;
+    p = (unsigned int *) (malloc(sizeof(unsigned int) * p_size));
+    if (p == NULL) goto cleanup;
+    mp_bpoly2arr(pp, p, p_size);
+    
+    /* if n = 0 then r = inf */
+    if (mp_cmp_z(n) == 0) {
+        mp_zero(rx);
+        mp_zero(ry);
+        err = MP_OKAY;
+        goto cleanup;
+    }
+    /* Q = P, k = n */
+    CHECK_MPI_OK( mp_copy(px, &qx) );
+    CHECK_MPI_OK( mp_copy(py, &qy) );
+    CHECK_MPI_OK( mp_copy(n, &k) );
+    /* if n < 0 then Q = -Q, k = -k */
+    if (mp_cmp_z(n) < 0) {
+        CHECK_MPI_OK( mp_badd(&qx, &qy, &qy) );
+        CHECK_MPI_OK( mp_neg(&k, &k) );
+    }
+#ifdef EC_DEBUG /* basic double and add method */
+    l = mpl_significant_bits(&k) - 1;
+    mp_zero(&sx);
+    mp_zero(&sy);
+    for (i = l; i >= 0; i--) {
+        /* if k_i = 1, then S = S + Q */
+        if (mpl_get_bit(&k, i) != 0) {
+            CHECK_MPI_OK( GF2m_ec_pt_add_aff(pp, a, &sx, &sy, &qx, &qy, &sx, &sy) );
+        }
+        if (i > 0) {
+            /* S = 2S */
+            CHECK_MPI_OK( GF2m_ec_pt_dbl_aff(pp, a, &sx, &sy, &sx, &sy) );
+        }
+    }
+#else /* double and add/subtract method from standard */
+    /* k3 = 3 * k */
+    mp_set(&k3, 0x3);
+    CHECK_MPI_OK( mp_mul(&k, &k3, &k3) );
+    /* S = Q */
+    CHECK_MPI_OK( mp_copy(&qx, &sx) );
+    CHECK_MPI_OK( mp_copy(&qy, &sy) );
+    /* l = index of high order bit in binary representation of 3*k */
+    l = mpl_significant_bits(&k3) - 1;
+    /* for i = l-1 downto 1 */
+    for (i = l - 1; i >= 1; i--) {
+        /* S = 2S */
+        CHECK_MPI_OK( GF2m_ec_pt_dbl_aff(pp, a, &sx, &sy, &sx, &sy) );
+        b3 = MP_GET_BIT(&k3, i);
+        b1 = MP_GET_BIT(&k, i);
+        /* if k3_i = 1 and k_i = 0, then S = S + Q */
+        if ((b3 == 1) && (b1 == 0)) {
+            CHECK_MPI_OK( GF2m_ec_pt_add_aff(pp, a, &sx, &sy, &qx, &qy, &sx, &sy) );
+        /* if k3_i = 0 and k_i = 1, then S = S - Q */
+        } else if ((b3 == 0) && (b1 == 1)) {
+            CHECK_MPI_OK( GF2m_ec_pt_sub_aff(pp, a, &sx, &sy, &qx, &qy, &sx, &sy) );
+        }
+    }
+#endif
+    /* output S */
+    CHECK_MPI_OK( mp_copy(&sx, rx) );
+    CHECK_MPI_OK( mp_copy(&sy, ry) );
+
+cleanup:
+    mp_clear(&k);
+    mp_clear(&k3);
+    mp_clear(&qx);
+    mp_clear(&qy);
+    mp_clear(&sx);
+    mp_clear(&sy);
+    free(p);
+    return err;
+}
+
+/* Compute the x-coordinate x/z for the point 2*(x/z) in Montgomery projective 
+ * coordinates.
+ * Uses algorithm Mdouble in appendix of 
+ *     Lopez, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ * modified to not require precomputation of c=b^{2^{m-1}}.
+ */
+static mp_err 
+gf2m_Mdouble(const mp_int *pp, const unsigned int p[], const mp_int *a, 
+    const mp_int *b, mp_int *x, mp_int *z) 
+{
+    mp_err err = MP_OKAY;
+    mp_int t1;
+
+    MP_DIGITS(&t1) = 0;
+    CHECK_MPI_OK( mp_init(&t1) );
+    
+    CHECK_MPI_OK( mp_bsqrmod(x, p, x) );
+    CHECK_MPI_OK( mp_bsqrmod(z, p, &t1) );
+    CHECK_MPI_OK( mp_bmulmod(x, &t1, p, z) );
+    CHECK_MPI_OK( mp_bsqrmod(x, p, x) );
+    CHECK_MPI_OK( mp_bsqrmod(&t1, p, &t1) );
+    CHECK_MPI_OK( mp_bmulmod(b, &t1, p, &t1) );
+    CHECK_MPI_OK( mp_badd(x, &t1, x) );
+
+cleanup:
+    mp_clear(&t1);
+    return err;
+}
+
+/* Compute the x-coordinate x1/z1 for the point (x1/z1)+(x2/x2) in Montgomery 
+ * projective coordinates.
+ * Uses algorithm Madd in appendix of 
+ *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ */
+static mp_err 
+gf2m_Madd(const mp_int *pp, const unsigned int p[], const mp_int *a, 
+    const mp_int *b, const mp_int *x, mp_int *x1, mp_int *z1, mp_int *x2,
+    mp_int *z2)
+{
+    mp_err err = MP_OKAY;
+    mp_int t1, t2;
+
+    MP_DIGITS(&t1) = 0;
+    MP_DIGITS(&t2) = 0;
+    CHECK_MPI_OK( mp_init(&t1) );
+    CHECK_MPI_OK( mp_init(&t2) );
+    
+    CHECK_MPI_OK( mp_copy(x, &t1) );
+    CHECK_MPI_OK( mp_bmulmod(x1, z2, p, x1) );
+    CHECK_MPI_OK( mp_bmulmod(z1, x2, p, z1) );
+    CHECK_MPI_OK( mp_bmulmod(x1, z1, p, &t2) );
+    CHECK_MPI_OK( mp_badd(z1, x1, z1) );
+    CHECK_MPI_OK( mp_bsqrmod(z1, p, z1) );
+    CHECK_MPI_OK( mp_bmulmod(z1, &t1, p, x1) );
+    CHECK_MPI_OK( mp_badd(x1, &t2, x1) );
+    
+cleanup:
+    mp_clear(&t1);
+    mp_clear(&t2);
+    return err;
+}
+
+/* Compute the x, y affine coordinates from the point (x1, z1) (x2, z2) 
+ * using Montgomery point multiplication algorithm Mxy() in appendix of 
+ *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ * Returns:
+ *     0 on error
+ *     1 if return value should be the point at infinity
+ *     2 otherwise
+ */
+static int
+gf2m_Mxy(const mp_int *pp, const unsigned int p[], const mp_int *a, 
+    const mp_int *b, const mp_int *x, const mp_int *y, mp_int *x1, mp_int *z1, 
+    mp_int *x2, mp_int *z2)
+{
+    mp_err err = MP_OKAY;
+    int ret;
+    mp_int t3, t4, t5;
+
+    MP_DIGITS(&t3) = 0;
+    MP_DIGITS(&t4) = 0;
+    MP_DIGITS(&t5) = 0;
+    CHECK_MPI_OK( mp_init(&t3) );
+    CHECK_MPI_OK( mp_init(&t4) );
+    CHECK_MPI_OK( mp_init(&t5) );
+    
+    if (mp_cmp_z(z1) == 0) {
+        mp_zero(x2);
+        mp_zero(z2);
+        ret = 1;
+        goto cleanup;
+    }
+    
+    if (mp_cmp_z(z2) == 0) {
+        CHECK_MPI_OK( mp_copy(x, x2) );
+        CHECK_MPI_OK( mp_badd(x, y, z2) );
+        ret = 2;
+        goto cleanup;
+    }
+        
+    mp_set(&t5, 0x1);
+
+    CHECK_MPI_OK( mp_bmulmod(z1, z2, p, &t3) );
+
+    CHECK_MPI_OK( mp_bmulmod(z1, x, p, z1) );
+    CHECK_MPI_OK( mp_badd(z1, x1, z1) );
+    CHECK_MPI_OK( mp_bmulmod(z2, x, p, z2) );
+    CHECK_MPI_OK( mp_bmulmod(z2, x1, p, x1) );
+    CHECK_MPI_OK( mp_badd(z2, x2, z2) );
+
+    CHECK_MPI_OK( mp_bmulmod(z2, z1, p, z2) );
+    CHECK_MPI_OK( mp_bsqrmod(x, p, &t4) );
+    CHECK_MPI_OK( mp_badd(&t4, y, &t4) );
+    CHECK_MPI_OK( mp_bmulmod(&t4, &t3, p, &t4) );
+    CHECK_MPI_OK( mp_badd(&t4, z2, &t4) );
+
+    CHECK_MPI_OK( mp_bmulmod(&t3, x, p, &t3) );
+    CHECK_MPI_OK( mp_bdivmod(&t5, &t3, pp, p, &t3) );
+    CHECK_MPI_OK( mp_bmulmod(&t3, &t4, p, &t4) );
+    CHECK_MPI_OK( mp_bmulmod(x1, &t3, p, x2) );
+    CHECK_MPI_OK( mp_badd(x2, x, z2) );
+
+    CHECK_MPI_OK( mp_bmulmod(z2, &t4, p, z2) );
+    CHECK_MPI_OK( mp_badd(z2, y, z2) );
+
+    ret = 2;
+    
+cleanup:
+    mp_clear(&t3);
+    mp_clear(&t4);
+    mp_clear(&t5);
+    if (err == MP_OKAY) {
+        return ret;
+    } else {
+        return 0;
+    }
+}
+
+/* Computes R = nP based on algorithm 2P of
+ *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ * Elliptic curve points P and R can be identical.
+ * Uses Montgomery projective coordinates.
+ */
+mp_err 
+GF2m_ec_pt_mul_mont(const mp_int *pp, const mp_int *a, const mp_int *b, 
+    const mp_int *px, const mp_int *py, const mp_int *n, 
+    mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int x1, x2, z1, z2;
+    int i, j;
+    mp_digit top_bit, mask;
+    unsigned int *p;
+    int p_size;
+
+    MP_DIGITS(&x1) = 0;
+    MP_DIGITS(&x2) = 0;
+    MP_DIGITS(&z1) = 0;
+    MP_DIGITS(&z2) = 0;
+    CHECK_MPI_OK( mp_init(&x1) );
+    CHECK_MPI_OK( mp_init(&x2) );
+    CHECK_MPI_OK( mp_init(&z1) );
+    CHECK_MPI_OK( mp_init(&z2) );
+
+    p_size = mp_bpoly2arr(pp, p, 0) + 1;
+    p = (unsigned int *) (malloc(sizeof(unsigned int) * p_size));
+    if (p == NULL) goto cleanup;
+    mp_bpoly2arr(pp, p, p_size);
+    
+	/* if result should be point at infinity */
+    if ((mp_cmp_z(n) == 0) || (GF2m_ec_pt_is_inf_aff(px, py) == MP_YES)) {
+        CHECK_MPI_OK( GF2m_ec_pt_set_inf_aff(rx, ry) );
+        goto cleanup;
+    }
+
+    CHECK_MPI_OK( mp_copy(rx, &x2) );           /* x2 = rx */
+    CHECK_MPI_OK( mp_copy(ry, &z2) );           /* z2 = ry */
+
+    CHECK_MPI_OK( mp_copy(px, &x1) );           /* x1 = px */
+    mp_set(&z1, 0x1);                           /* z1 = 1 */
+    CHECK_MPI_OK( mp_bsqrmod(&x1, p, &z2) );    /* z2 = x1^2 = x2^2 */
+    CHECK_MPI_OK( mp_bsqrmod(&z2, p, &x2) );
+    CHECK_MPI_OK( mp_badd(&x2, b, &x2) );       /* x2 = px^4 + b */
+    
+    /* find top-most bit and go one past it */
+    i = MP_USED(n) - 1;
+    j = MP_DIGIT_BIT - 1;
+    top_bit = 1;
+    top_bit <<= MP_DIGIT_BIT - 1;
+    mask = top_bit;
+    while (!(MP_DIGITS(n)[i] & mask)) {
+        mask >>= 1;
+        j--;
+    }
+    mask >>= 1; j--;
+    
+    /* if top most bit was at word break, go to next word */
+    if (!mask) {
+	i--; 
+        j = MP_DIGIT_BIT - 1;
+	mask = top_bit;
+    }
+
+    for (; i >= 0; i--) {
+	for (; j >= 0; j--) {
+	    if (MP_DIGITS(n)[i] & mask) {
+		CHECK_MPI_OK( gf2m_Madd(pp, p, a, b, px, &x1, &z1, &x2, &z2) );
+                CHECK_MPI_OK( gf2m_Mdouble(pp, p, a, b, &x2, &z2) );
+            } else {
+                CHECK_MPI_OK( gf2m_Madd(pp, p, a, b, px, &x2, &z2, &x1, &z1) );
+                CHECK_MPI_OK( gf2m_Mdouble(pp, p, a, b, &x1, &z1) );
+            }
+	    mask >>= 1;
+	}
+	j = MP_DIGIT_BIT - 1;
+	mask = top_bit;
+    }
+
+    /* convert out of "projective" coordinates */
+    i = gf2m_Mxy(pp, p, a, b, px, py, &x1, &z1, &x2, &z2);
+    if (i == 0) {
+	err = MP_BADARG;
+        goto cleanup;
+    } else if (i == 1) {
+	CHECK_MPI_OK( GF2m_ec_pt_set_inf_aff(rx, ry) );
+    } else {
+        CHECK_MPI_OK( mp_copy(&x2, rx) );
+        CHECK_MPI_OK( mp_copy(&z2, ry) );
+    }
+
+cleanup:
+    mp_clear(&x1);
+    mp_clear(&x2);
+    mp_clear(&z1);
+    mp_clear(&z2);
+    free(p);
+    return err;
+}
+
+#endif /* NSS_ENABLE_ECC */

mozilla/security/nss/lib/freebl/GF2m_ecl.h

@@ -0,0 +1,96 @@
+/*
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial
+ * field curves.
+ *
+ * The Initial Developer of the Original Code is Sun Microsystems, Inc.
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Douglas Stebila <douglas@stebila.ca>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ */
+
+#ifndef __gf2m_ecl_h_
+#define __gf2m_ecl_h_
+#ifdef NSS_ENABLE_ECC
+
+#include "secmpi.h"
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+mp_err GF2m_ec_pt_is_inf_aff(const mp_int *px, const mp_int *py);
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+mp_err GF2m_ec_pt_set_inf_aff(mp_int *px, mp_int *py);
+
+/* Computes R = P + Q where R is (rx, ry), P is (px, py) and Q is (qx, qy). 
+ * Uses affine coordinates.
+ */
+mp_err GF2m_ec_pt_add_aff(const mp_int *pp, const mp_int *a, 
+    const mp_int *px, const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry);
+
+/* Computes R = P - Q.  Uses affine coordinates. */
+mp_err GF2m_ec_pt_sub_aff(const mp_int *pp, const mp_int *a, 
+    const mp_int *px, const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry);
+
+/* Computes R = 2P.  Uses affine coordinates. */
+mp_err GF2m_ec_pt_dbl_aff(const mp_int *pp, const mp_int *a, 
+    const mp_int *px, const mp_int *py, mp_int *rx, mp_int *ry);
+
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the irreducible that 
+ * determines the field GF2m.  Uses affine coordinates.
+ */
+mp_err GF2m_ec_pt_mul_aff(const mp_int *pp, const mp_int *a, const mp_int *b, 
+    const mp_int *px, const mp_int *py, const mp_int *n, 
+    mp_int *rx, mp_int *ry);
+
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the irreducible that 
+ * determines the field GF2m.  Uses Montgomery projective coordinates.
+ */
+mp_err GF2m_ec_pt_mul_mont(const mp_int *pp, const mp_int *a, 
+    const mp_int *b, const mp_int *px, const mp_int *py, 
+    const mp_int *n, mp_int *rx, mp_int *ry);
+
+#define GF2m_ec_pt_is_inf(px, py)    GF2m_ec_pt_is_inf_aff((px), (py))
+#define GF2m_ec_pt_add(p, a, px, py, qx, qy, rx, ry) \
+        GF2m_ec_pt_add_aff((p), (a), (px), (py), (qx), (qy), (rx), (ry))
+
+#define GF2m_ECL_MONTGOMERY
+#ifdef GF2m_ECL_AFFINE
+#define GF2m_ec_pt_mul(pp, a, b, px, py, n, rx, ry) \
+	GF2m_ec_pt_mul_aff((pp), (a), (b), (px), (py), (n), (rx), (ry))
+#elif defined(GF2m_ECL_MONTGOMERY)
+#define GF2m_ec_pt_mul(pp, a, b, px, py, n, rx, ry) \
+	GF2m_ec_pt_mul_mont((pp), (a), (b), (px), (py), (n), (rx), (ry))
+#endif /* GF2m_ECL_AFFINE or GF2m_ECL_MONTGOMERY */
+
+#endif /* NSS_ENABLE_ECC */
+#endif /* __gf2m_ecl_h_ */

mozilla/security/nss/lib/freebl/GFp_ecl.c

@@ -0,0 +1,647 @@
+/*
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime 
+ * field curves.
+ *
+ * The Initial Developer of the Original Code is Sun Microsystems, Inc.
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *	Sheueling Chang Shantz <sheueling.chang@sun.com> and
+ *	Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ *	Bodo Moeller <moeller@cdc.informatik.tu-darmstadt.de>, 
+ *	Nils Larsch <nla@trustcenter.de>, and 
+ *	Lenka Fibikova <fibikova@exp-math.uni-essen.de>, the OpenSSL Project.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ */
+#ifdef NSS_ENABLE_ECC
+/*
+ * GFp_ecl.c: Contains an implementation of elliptic curve math library
+ * for curves over GFp.
+ *
+ * XXX Can be moved to a separate subdirectory later.
+ *
+ */
+
+#include "GFp_ecl.h"
+#include "mpi/mplogic.h"
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+mp_err
+GFp_ec_pt_is_inf_aff(const mp_int *px, const mp_int *py)
+{
+
+    if ((mp_cmp_z(px) == 0) && (mp_cmp_z(py) == 0)) {
+        return MP_YES;
+    } else {
+        return MP_NO;
+    }
+
+}
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+mp_err
+GFp_ec_pt_set_inf_aff(mp_int *px, mp_int *py)
+{
+    mp_zero(px);
+    mp_zero(py);
+    return MP_OKAY;
+}
+
+/* Computes R = P + Q based on IEEE P1363 A.10.1.
+ * Elliptic curve points P, Q, and R can all be identical.
+ * Uses affine coordinates.
+ */
+mp_err
+GFp_ec_pt_add_aff(const mp_int *p, const mp_int *a, const mp_int *px,
+    const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int lambda, temp, xtemp, ytemp;
+
+    CHECK_MPI_OK( mp_init(&lambda) );
+    CHECK_MPI_OK( mp_init(&temp) );
+    CHECK_MPI_OK( mp_init(&xtemp) );
+    CHECK_MPI_OK( mp_init(&ytemp) );
+    /* if P = inf, then R = Q */
+    if (GFp_ec_pt_is_inf_aff(px, py) == 0) {
+        CHECK_MPI_OK( mp_copy(qx, rx) );
+        CHECK_MPI_OK( mp_copy(qy, ry) );
+        err = MP_OKAY;
+        goto cleanup;
+    }
+    /* if Q = inf, then R = P */
+    if (GFp_ec_pt_is_inf_aff(qx, qy) == 0) {
+        CHECK_MPI_OK( mp_copy(px, rx) );
+        CHECK_MPI_OK( mp_copy(py, ry) );
+        err = MP_OKAY;
+        goto cleanup;
+    }
+    /* if px != qx, then lambda = (py-qy) / (px-qx) */
+    if (mp_cmp(px, qx) != 0) {
+        CHECK_MPI_OK( mp_submod(py, qy, p, &ytemp) );
+        CHECK_MPI_OK( mp_submod(px, qx, p, &xtemp) );
+        CHECK_MPI_OK( mp_invmod(&xtemp, p, &xtemp) );
+        CHECK_MPI_OK( mp_mulmod(&ytemp, &xtemp, p, &lambda) );
+    } else {
+        /* if py != qy or qy = 0, then R = inf */
+        if (((mp_cmp(py, qy) != 0)) || (mp_cmp_z(qy) == 0)) {
+            mp_zero(rx);
+            mp_zero(ry);
+            err = MP_OKAY;
+            goto cleanup;
+        }
+        /* lambda = (3qx^2+a) / (2qy) */
+        CHECK_MPI_OK( mp_sqrmod(qx, p, &xtemp) );
+        mp_set(&temp, 0x3);
+        CHECK_MPI_OK( mp_mulmod(&xtemp, &temp, p, &xtemp) );
+        CHECK_MPI_OK( mp_addmod(&xtemp, a, p, &xtemp) );
+        mp_set(&temp, 0x2);
+        CHECK_MPI_OK( mp_mulmod(qy, &temp, p, &ytemp) );
+        CHECK_MPI_OK( mp_invmod(&ytemp, p, &ytemp) );
+        CHECK_MPI_OK( mp_mulmod(&xtemp, &ytemp, p, &lambda) );
+    }
+    /* rx = lambda^2 - px - qx */
+    CHECK_MPI_OK( mp_sqrmod(&lambda, p, &xtemp) );
+    CHECK_MPI_OK( mp_submod(&xtemp, px, p, &xtemp) );
+    CHECK_MPI_OK( mp_submod(&xtemp, qx, p, &xtemp) );
+    /* ry = (x1-x2) * lambda - y1 */
+    CHECK_MPI_OK( mp_submod(qx, &xtemp, p, &ytemp) );
+    CHECK_MPI_OK( mp_mulmod(&ytemp, &lambda, p, &ytemp) );
+    CHECK_MPI_OK( mp_submod(&ytemp, qy, p, &ytemp) );
+    CHECK_MPI_OK( mp_copy(&xtemp, rx) );
+    CHECK_MPI_OK( mp_copy(&ytemp, ry) );
+
+cleanup:
+    mp_clear(&lambda);
+    mp_clear(&temp);
+    mp_clear(&xtemp);
+    mp_clear(&ytemp);
+    return err;
+}
+
+/* Computes R = P - Q. 
+ * Elliptic curve points P, Q, and R can all be identical.
+ * Uses affine coordinates.
+ */
+mp_err
+GFp_ec_pt_sub_aff(const mp_int *p, const mp_int *a, const mp_int *px, 
+    const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int nqy;
+    MP_DIGITS(&nqy) = 0;
+    CHECK_MPI_OK( mp_init(&nqy) );
+    /* nqy = -qy */
+    CHECK_MPI_OK( mp_neg(qy, &nqy) );
+    err = GFp_ec_pt_add_aff(p, a, px, py, qx, &nqy, rx, ry);
+cleanup:
+    mp_clear(&nqy);
+    return err;
+}
+
+/* Computes R = 2P. 
+ * Elliptic curve points P and R can be identical.
+ * Uses affine coordinates.
+ */
+mp_err
+GFp_ec_pt_dbl_aff(const mp_int *p, const mp_int *a, const mp_int *px, 
+    const mp_int *py, mp_int *rx, mp_int *ry)
+{
+    return GFp_ec_pt_add_aff(p, a, px, py, px, py, rx, ry);
+}
+
+/* Gets the i'th bit in the binary representation of a.
+ * If i >= length(a), then return 0.
+ * (The above behaviour differs from mpl_get_bit, which
+ * causes an error if i >= length(a).)
+ */
+#define MP_GET_BIT(a, i) \
+    ((i) >= mpl_significant_bits((a))) ? 0 : mpl_get_bit((a), (i))
+
+/* Computes R = nP based on IEEE P1363 A.10.3.
+ * Elliptic curve points P and R can be identical.
+ * Uses affine coordinates.
+ */
+mp_err
+GFp_ec_pt_mul_aff(const mp_int *p, const mp_int *a, const mp_int *b,
+    const mp_int *px, const mp_int *py, const mp_int *n, mp_int *rx,
+    mp_int *ry) 
+{
+    mp_err err = MP_OKAY;
+    mp_int k, k3, qx, qy, sx, sy;
+    int b1, b3, i, l;
+
+    MP_DIGITS(&k) = 0;
+    MP_DIGITS(&k3) = 0;
+    MP_DIGITS(&qx) = 0;
+    MP_DIGITS(&qy) = 0;
+    MP_DIGITS(&sx) = 0;
+    MP_DIGITS(&sy) = 0;
+    CHECK_MPI_OK( mp_init(&k) );
+    CHECK_MPI_OK( mp_init(&k3) );
+    CHECK_MPI_OK( mp_init(&qx) );
+    CHECK_MPI_OK( mp_init(&qy) );
+    CHECK_MPI_OK( mp_init(&sx) );
+    CHECK_MPI_OK( mp_init(&sy) );
+    
+    /* if n = 0 then r = inf */
+    if (mp_cmp_z(n) == 0) {
+        mp_zero(rx);
+        mp_zero(ry);
+        err = MP_OKAY;
+        goto cleanup;
+    }
+    /* Q = P, k = n */
+    CHECK_MPI_OK( mp_copy(px, &qx) );
+    CHECK_MPI_OK( mp_copy(py, &qy) );
+    CHECK_MPI_OK( mp_copy(n, &k) );
+    /* if n < 0 Q = -Q, k = -k */
+    if (mp_cmp_z(n) < 0) {
+        CHECK_MPI_OK( mp_neg(&qy, &qy) );
+        CHECK_MPI_OK( mp_mod(&qy, p, &qy) );
+        CHECK_MPI_OK( mp_neg(&k, &k) );
+        CHECK_MPI_OK( mp_mod(&k, p, &k) );
+    }
+#ifdef EC_DEBUG /* basic double and add method */
+    l = mpl_significant_bits(&k) - 1;
+    mp_zero(&sx);
+    mp_zero(&sy);
+    for (i = l; i >= 0; i--) {
+        /* if k_i = 1, then S = S + Q */
+        if (mpl_get_bit(&k, i) != 0) {
+            CHECK_MPI_OK( GFp_ec_pt_add_aff(p, a, &sx, &sy, 
+		&qx, &qy, &sx, &sy) );
+        }
+        if (i > 0) {
+            /* S = 2S */
+            CHECK_MPI_OK( GFp_ec_pt_dbl_aff(p, a, &sx, &sy, &sx, &sy) );
+        }
+    }
+#else /* double and add/subtract method from standard */
+    /* k3 = 3 * k */
+    mp_set(&k3, 0x3);
+    CHECK_MPI_OK( mp_mul(&k, &k3, &k3) );
+    /* S = Q */
+    CHECK_MPI_OK( mp_copy(&qx, &sx) );
+    CHECK_MPI_OK( mp_copy(&qy, &sy) );
+    /* l = index of high order bit in binary representation of 3*k */
+    l = mpl_significant_bits(&k3) - 1;
+    /* for i = l-1 downto 1 */
+    for (i = l - 1; i >= 1; i--) {
+        /* S = 2S */
+        CHECK_MPI_OK( GFp_ec_pt_dbl_aff(p, a, &sx, &sy, &sx, &sy) );
+		b3 = MP_GET_BIT(&k3, i);
+		b1 = MP_GET_BIT(&k, i);
+        /* if k3_i = 1 and k_i = 0, then S = S + Q */
+        if ((b3 == 1) && (b1 == 0)) {
+            CHECK_MPI_OK( GFp_ec_pt_add_aff(p, a, &sx, &sy, 
+		&qx, &qy, &sx, &sy) );
+        /* if k3_i = 0 and k_i = 1, then S = S - Q */
+        } else if ((b3 == 0) && (b1 == 1)) {
+            CHECK_MPI_OK( GFp_ec_pt_sub_aff(p, a, &sx, &sy, 
+		&qx, &qy, &sx, &sy) );
+        }
+    }
+#endif
+    /* output S */
+    CHECK_MPI_OK( mp_copy(&sx, rx) );
+    CHECK_MPI_OK( mp_copy(&sy, ry) );
+
+cleanup:
+    mp_clear(&k);
+    mp_clear(&k3);
+    mp_clear(&qx);
+    mp_clear(&qy);
+    mp_clear(&sx);
+    mp_clear(&sy);
+    return err;
+}
+
+/* Converts a point P(px, py, pz) from Jacobian projective coordinates to
+ * affine coordinates R(rx, ry).  P and R can share x and y coordinates.
+ */
+mp_err
+GFp_ec_pt_jac2aff(const mp_int *px, const mp_int *py, const mp_int *pz,
+    const mp_int *p, mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int z1, z2, z3;
+    MP_DIGITS(&z1) = 0;
+    MP_DIGITS(&z2) = 0;
+    MP_DIGITS(&z3) = 0;
+    CHECK_MPI_OK( mp_init(&z1) );
+    CHECK_MPI_OK( mp_init(&z2) );
+    CHECK_MPI_OK( mp_init(&z3) );
+
+    /* if point at infinity, then set point at infinity and exit */
+    if (GFp_ec_pt_is_inf_jac(px, py, pz) == MP_YES) {
+        CHECK_MPI_OK( GFp_ec_pt_set_inf_aff(rx, ry) );
+	goto cleanup;
+    }
+
+    /* transform (px, py, pz) into (px / pz^2, py / pz^3) */
+    if (mp_cmp_d(pz, 1) == 0) {
+        CHECK_MPI_OK( mp_copy(px, rx) );
+	CHECK_MPI_OK( mp_copy(py, ry) );
+    } else {
+        CHECK_MPI_OK( mp_invmod(pz, p, &z1) );
+	CHECK_MPI_OK( mp_sqrmod(&z1, p, &z2) );
+	CHECK_MPI_OK( mp_mulmod(&z1, &z2, p, &z3) );
+	CHECK_MPI_OK( mp_mulmod(px, &z2, p, rx) );
+	CHECK_MPI_OK( mp_mulmod(py, &z3, p, ry) );
+    }
+	
+cleanup:
+    mp_clear(&z1);
+    mp_clear(&z2);
+    mp_clear(&z3);
+	return err;
+}
+
+/* Checks if point P(px, py, pz) is at infinity.  
+ * Uses Jacobian coordinates.
+ */
+mp_err
+GFp_ec_pt_is_inf_jac(const mp_int *px, const mp_int *py, const mp_int *pz) 
+{
+    return mp_cmp_z(pz);
+}
+
+/* Sets P(px, py, pz) to be the point at infinity.  Uses Jacobian 
+ * coordinates. 
+ */
+mp_err
+GFp_ec_pt_set_inf_jac(mp_int *px, mp_int *py, mp_int *pz) 
+{
+    mp_zero(pz);
+    return MP_OKAY;
+}
+
+/* Computes R = P + Q where R is (rx, ry, rz), P is (px, py, pz) and 
+ * Q is (qx, qy, qz).  Elliptic curve points P, Q, and R can all be 
+ * identical. Uses Jacobian coordinates.
+ *
+ * This routine implements Point Addition in the Jacobian Projective 
+ * space as described in the paper "Efficient elliptic curve exponentiation 
+ * using mixed coordinates", by H. Cohen, A Miyaji, T. Ono.
+ */
+mp_err
+GFp_ec_pt_add_jac(const mp_int *p, const mp_int *a, const mp_int *px,
+    const mp_int *py, const mp_int *pz, const mp_int *qx, 
+    const mp_int *qy, const mp_int *qz, mp_int *rx, mp_int *ry, mp_int *rz)
+{
+    mp_err err = MP_OKAY;
+    mp_int n0, u1, u2, s1, s2, H, G;
+    MP_DIGITS(&n0) = 0;
+    MP_DIGITS(&u1) = 0;
+    MP_DIGITS(&u2) = 0;
+    MP_DIGITS(&s1) = 0;
+    MP_DIGITS(&s2) = 0;
+    MP_DIGITS(&H) = 0;
+    MP_DIGITS(&G) = 0;
+    CHECK_MPI_OK( mp_init(&n0) );
+    CHECK_MPI_OK( mp_init(&u1) );
+    CHECK_MPI_OK( mp_init(&u2) );
+    CHECK_MPI_OK( mp_init(&s1) );
+    CHECK_MPI_OK( mp_init(&s2) );
+    CHECK_MPI_OK( mp_init(&H) );
+    CHECK_MPI_OK( mp_init(&G) );
+
+    /* Use point double if pointers are equal. */
+    if ((px == qx) && (py == qy) && (pz == qz)) {
+        err = GFp_ec_pt_dbl_jac(p, a, px, py, pz, rx, ry, rz);
+	goto cleanup;
+    }
+	
+    /* If either P or Q is the point at infinity, then return 
+     * the other point 
+     */
+    if (GFp_ec_pt_is_inf_jac(px, py, pz) == MP_YES) {
+        CHECK_MPI_OK( mp_copy(qx, rx) );
+	CHECK_MPI_OK( mp_copy(qy, ry) );
+	CHECK_MPI_OK( mp_copy(qz, rz) );
+	goto cleanup;
+    }
+    if (GFp_ec_pt_is_inf_jac(qx, qy, qz) == MP_YES) {
+        CHECK_MPI_OK( mp_copy(px, rx) );
+	CHECK_MPI_OK( mp_copy(py, ry) );
+	CHECK_MPI_OK( mp_copy(pz, rz) );
+	goto cleanup;
+    }
+	
+    /* Compute u1 = px * qz^2, s1 = py * qz^3 */
+    if (mp_cmp_d(qz, 1) == 0) {
+        CHECK_MPI_OK( mp_copy(px, &u1) );
+	CHECK_MPI_OK( mp_copy(py, &s1) );
+    } else {
+        CHECK_MPI_OK( mp_sqrmod(qz, p, &n0) );
+	CHECK_MPI_OK( mp_mulmod(px, &n0, p, &u1) );
+	CHECK_MPI_OK( mp_mulmod(&n0, qz, p, &n0) );
+	CHECK_MPI_OK( mp_mulmod(py, &n0, p, &s1) );
+    }
+
+    /* Compute u2 = qx * pz^2, s2 = qy * pz^3 */
+    if (mp_cmp_d(pz, 1) == 0) {
+        CHECK_MPI_OK( mp_copy(qx, &u2) );
+	CHECK_MPI_OK( mp_copy(qy, &s2) );
+    } else {
+        CHECK_MPI_OK( mp_sqrmod(pz, p, &n0) );
+	CHECK_MPI_OK( mp_mulmod(qx, &n0, p, &u2) );
+	CHECK_MPI_OK( mp_mulmod(&n0, pz, p, &n0) );
+	CHECK_MPI_OK( mp_mulmod(qy, &n0, p, &s2) );
+    }
+
+    /* Compute H = u2 - u1 ; G = s2 - s1 */
+    CHECK_MPI_OK( mp_submod(&u2, &u1, p, &H) );
+    CHECK_MPI_OK( mp_submod(&s2, &s1, p, &G) );
+
+    if (mp_cmp_z(&H) == 0) {
+        if (mp_cmp_z(&G) == 0) {
+	    /* P = Q; double */
+	    err = GFp_ec_pt_dbl_jac(p, a, px, py, pz, 
+				    rx, ry, rz);
+	    goto cleanup;
+	} else {
+	    /* P = -Q; return point at infinity */
+	    CHECK_MPI_OK( GFp_ec_pt_set_inf_jac(rx, ry, rz) );
+	    goto cleanup;
+	}
+    }
+
+    /* rz = pz * qz * H */
+    if (mp_cmp_d(pz, 1) == 0) {
+        if (mp_cmp_d(qz, 1) == 0) {
+	    /* if pz == qz == 1, then rz = H */
+	    CHECK_MPI_OK( mp_copy(&H, rz) );
+	} else {
+	    CHECK_MPI_OK( mp_mulmod(qz, &H, p, rz) );
+	}
+    } else {
+        if (mp_cmp_d(qz, 1) == 0) {
+	    CHECK_MPI_OK( mp_mulmod(pz, &H, p, rz) );
+	} else {
+	    CHECK_MPI_OK( mp_mulmod(pz, qz, p, &n0) );
+	    CHECK_MPI_OK( mp_mulmod(&n0, &H, p, rz) );
+	}
+    }
+	
+    /* rx = G^2 - H^3 - 2 * u1 * H^2 */
+    CHECK_MPI_OK( mp_sqrmod(&G, p, rx) );
+    CHECK_MPI_OK( mp_sqrmod(&H, p, &n0) );
+    CHECK_MPI_OK( mp_mulmod(&n0, &u1, p, &u1) );
+    CHECK_MPI_OK( mp_addmod(&u1, &u1, p, &u2) );
+    CHECK_MPI_OK( mp_mulmod(&H, &n0, p, &H) );
+    CHECK_MPI_OK( mp_submod(rx, &H, p, rx) );
+    CHECK_MPI_OK( mp_submod(rx, &u2, p, rx) );
+
+    /* ry = - s1 * H^3 + G * (u1 * H^2 - rx) */
+    /* (formula based on values of variables before block above) */
+    CHECK_MPI_OK( mp_submod(&u1, rx, p, &u1) );
+    CHECK_MPI_OK( mp_mulmod(&G, &u1, p, ry) );
+    CHECK_MPI_OK( mp_mulmod(&s1, &H, p, &s1) );
+    CHECK_MPI_OK( mp_submod(ry, &s1, p, ry) );
+
+cleanup:
+    mp_clear(&n0);
+    mp_clear(&u1);
+    mp_clear(&u2);
+    mp_clear(&s1);
+    mp_clear(&s2);
+    mp_clear(&H);
+    mp_clear(&G);
+	return err;
+}
+
+/* Computes R = 2P.  Elliptic curve points P and R can be identical.  Uses 
+ * Jacobian coordinates.
+ *
+ * This routine implements Point Doubling in the Jacobian Projective 
+ * space as described in the paper "Efficient elliptic curve exponentiation 
+ * using mixed coordinates", by H. Cohen, A Miyaji, T. Ono.
+ */
+mp_err
+GFp_ec_pt_dbl_jac(const mp_int *p, const mp_int *a, const mp_int *px, 
+    const mp_int *py, const mp_int *pz, mp_int *rx, mp_int *ry, mp_int *rz)
+{
+    mp_err err = MP_OKAY;
+    mp_int t0, t1, M, S;
+    MP_DIGITS(&t0) = 0;
+    MP_DIGITS(&t1) = 0;
+    MP_DIGITS(&M) = 0;
+    MP_DIGITS(&S) = 0;
+    CHECK_MPI_OK( mp_init(&t0) );
+    CHECK_MPI_OK( mp_init(&t1) );
+    CHECK_MPI_OK( mp_init(&M) );
+    CHECK_MPI_OK( mp_init(&S) );
+
+    if (GFp_ec_pt_is_inf_jac(px, py, pz) == MP_YES) {
+        CHECK_MPI_OK( GFp_ec_pt_set_inf_jac(rx, ry, rz) );
+	goto cleanup;
+    }
+
+    if (mp_cmp_d(pz, 1) == 0) {
+        /* M = 3 * px^2 + a */
+        CHECK_MPI_OK( mp_sqrmod(px, p, &t0) );
+	CHECK_MPI_OK( mp_addmod(&t0, &t0, p, &M) );
+	CHECK_MPI_OK( mp_addmod(&t0, &M, p, &t0) );
+	CHECK_MPI_OK( mp_addmod(&t0, a, p, &M) );
+    } else if (mp_cmp_int(a, -3) == 0) {
+        /* M = 3 * (px + pz^2) * (px - pz) */
+        CHECK_MPI_OK( mp_sqrmod(pz, p, &M) );
+	CHECK_MPI_OK( mp_addmod(px, &M, p, &t0) );
+	CHECK_MPI_OK( mp_submod(px, &M, p, &t1) );
+	CHECK_MPI_OK( mp_mulmod(&t0, &t1, p, &M) );
+	CHECK_MPI_OK( mp_addmod(&M, &M, p, &t0) );
+	CHECK_MPI_OK( mp_addmod(&t0, &M, p, &M) );
+    } else {
+        CHECK_MPI_OK( mp_sqrmod(px, p, &t0) );
+	CHECK_MPI_OK( mp_addmod(&t0, &t0, p, &M) );
+	CHECK_MPI_OK( mp_addmod(&t0, &M, p, &t0) );
+	CHECK_MPI_OK( mp_sqrmod(pz, p, &M) );
+	CHECK_MPI_OK( mp_sqrmod(&M, p, &M) );
+	CHECK_MPI_OK( mp_mulmod(&M, a, p, &M) );
+	CHECK_MPI_OK( mp_addmod(&M, &t0, p, &M) );
+    }
+
+    /* rz = 2 * py * pz */
+    if (mp_cmp_d(pz, 1) == 0) {
+        CHECK_MPI_OK( mp_addmod(py, py, p, rz) );
+	CHECK_MPI_OK( mp_sqrmod(rz, p, &t0) );
+    } else {
+        CHECK_MPI_OK( mp_addmod(py, py, p, &t0) );
+	CHECK_MPI_OK( mp_mulmod(&t0, pz, p, rz) );
+	CHECK_MPI_OK( mp_sqrmod(&t0, p, &t0) );
+    }
+
+    /* S = 4 * px * py^2 = pz * (2 * py)^2 */
+    CHECK_MPI_OK( mp_mulmod(px, &t0, p, &S) );
+
+    /* rx = M^2 - 2 * S */
+    CHECK_MPI_OK( mp_addmod(&S, &S, p, &t1) );
+    CHECK_MPI_OK( mp_sqrmod(&M, p, rx) );
+    CHECK_MPI_OK( mp_submod(rx, &t1, p, rx) );
+
+    /* ry = M * (S - rx) - 8 * py^4 */
+    CHECK_MPI_OK( mp_sqrmod(&t0, p, &t1) );
+    if (mp_isodd(&t1)) {
+        CHECK_MPI_OK( mp_add(&t1, p, &t1) );
+    }
+    CHECK_MPI_OK( mp_div_2(&t1, &t1) );
+    CHECK_MPI_OK( mp_submod(&S, rx, p, &S) );
+    CHECK_MPI_OK( mp_mulmod(&M, &S, p, &M) );
+    CHECK_MPI_OK( mp_submod(&M, &t1, p, ry) );
+	
+cleanup:
+    mp_clear(&t0);
+    mp_clear(&t1);
+    mp_clear(&M);
+    mp_clear(&S);
+    return err;
+}
+
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the prime that 
+ * determines the field GFp.  Elliptic curve points P and R can be 
+ * identical.  Uses Jacobian coordinates.
+ */
+mp_err
+GFp_ec_pt_mul_jac(const mp_int *p, const mp_int *a, const mp_int *b, 
+    const mp_int *px, const mp_int *py, const mp_int *n, 
+    mp_int *rx, mp_int *ry)
+{
+    mp_err err = MP_OKAY;
+    mp_int k, qx, qy, qz, sx, sy, sz;
+    int i, l;
+
+    MP_DIGITS(&k) = 0;
+    MP_DIGITS(&qx) = 0;
+    MP_DIGITS(&qy) = 0;
+    MP_DIGITS(&qz) = 0;
+    MP_DIGITS(&sx) = 0;
+    MP_DIGITS(&sy) = 0;
+    MP_DIGITS(&sz) = 0;
+    CHECK_MPI_OK( mp_init(&k) );
+    CHECK_MPI_OK( mp_init(&qx) );
+    CHECK_MPI_OK( mp_init(&qy) );
+    CHECK_MPI_OK( mp_init(&qz) );
+    CHECK_MPI_OK( mp_init(&sx) );
+    CHECK_MPI_OK( mp_init(&sy) );
+    CHECK_MPI_OK( mp_init(&sz) );
+
+    /* if n = 0 then r = inf */
+    if (mp_cmp_z(n) == 0) {
+        mp_zero(rx);
+        mp_zero(ry);
+        err = MP_OKAY;
+        goto cleanup;
+	/* if n < 0 then out of range error */
+    } else if (mp_cmp_z(n) < 0) {
+        err = MP_RANGE;
+	goto cleanup;
+    }
+    /* Q = P, k = n */
+    CHECK_MPI_OK( mp_copy(px, &qx) );
+    CHECK_MPI_OK( mp_copy(py, &qy) );
+    CHECK_MPI_OK( mp_set_int(&qz, 1) );
+    CHECK_MPI_OK( mp_copy(n, &k) );
+
+    /* double and add method */
+    l = mpl_significant_bits(&k) - 1;
+    mp_zero(&sx);
+    mp_zero(&sy);
+    mp_zero(&sz);
+    for (i = l; i >= 0; i--) {
+        /* if k_i = 1, then S = S + Q */
+        if (MP_GET_BIT(&k, i) != 0) {
+            CHECK_MPI_OK( GFp_ec_pt_add_jac(p, a, &sx, &sy, &sz, 
+					    &qx, &qy, &qz, &sx, &sy, &sz) );
+        }
+        if (i > 0) {
+            /* S = 2S */
+            CHECK_MPI_OK( GFp_ec_pt_dbl_jac(p, a, &sx, &sy, &sz, 
+					    &sx, &sy, &sz) );
+        }
+    }
+
+    /* convert result S to affine coordinates */
+    CHECK_MPI_OK( GFp_ec_pt_jac2aff(&sx, &sy, &sz, p, rx, ry) );
+
+cleanup:
+    mp_clear(&k);
+    mp_clear(&qx);
+    mp_clear(&qy);
+    mp_clear(&qz);
+    mp_clear(&sx);
+    mp_clear(&sy);
+    mp_clear(&sz);
+    return err;
+}
+#endif /* NSS_ENABLE_ECC */

mozilla/security/nss/lib/freebl/GFp_ecl.h

@@ -0,0 +1,126 @@
+/*
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime 
+ * field curves.
+ *
+ * The Initial Developer of the Original Code is Sun Microsystems, Inc.
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *	Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ */
+
+#ifndef __gfp_ecl_h_
+#define __gfp_ecl_h_
+#ifdef NSS_ENABLE_ECC
+
+#include "secmpi.h"
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+extern mp_err GFp_ec_pt_is_inf_aff(const mp_int *px, const mp_int *py);
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+extern mp_err GFp_ec_pt_set_inf_aff(mp_int *px, mp_int *py);
+
+/* Computes R = P + Q where R is (rx, ry), P is (px, py) and Q is (qx, qy). 
+ * Uses affine coordinates.
+ */
+extern mp_err GFp_ec_pt_add_aff(const mp_int *p, const mp_int *a, 
+    const mp_int *px, const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry);
+
+/* Computes R = P - Q.  Uses affine coordinates. */
+extern mp_err GFp_ec_pt_sub_aff(const mp_int *p, const mp_int *a, 
+    const mp_int *px, const mp_int *py, const mp_int *qx, const mp_int *qy, 
+    mp_int *rx, mp_int *ry);
+
+/* Computes R = 2P.  Uses affine coordinates. */
+extern mp_err GFp_ec_pt_dbl_aff(const mp_int *p, const mp_int *a, 
+    const mp_int *px, const mp_int *py, mp_int *rx, mp_int *ry);
+
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the prime that 
+ * determines the field GFp.  Uses affine coordinates.
+ */
+extern mp_err GFp_ec_pt_mul_aff(const mp_int *p, const mp_int *a, 
+    const mp_int *b, const mp_int *px, const mp_int *py, const mp_int *n, 
+    mp_int *rx, mp_int *ry);
+
+/* Converts a point P(px, py, pz) from Jacobian projective coordinates to
+ * affine coordinates R(rx, ry).
+ */
+extern mp_err GFp_ec_pt_jac2aff(const mp_int *px, const mp_int *py, 
+    const mp_int *pz, const mp_int *p, mp_int *rx, mp_int *ry);
+
+/* Checks if point P(px, py, pz) is at infinity.  Uses Jacobian 
+ * coordinates. 
+ */
+extern mp_err GFp_ec_pt_is_inf_jac(const mp_int *px, const mp_int *py, 
+	const mp_int *pz);
+
+/* Sets P(px, py, pz) to be the point at infinity.  Uses Jacobian 
+ * coordinates. 
+ */
+extern mp_err GFp_ec_pt_set_inf_jac(mp_int *px, mp_int *py, mp_int *pz);
+
+/* Computes R = P + Q where R is (rx, ry, rz), P is (px, py, pz) and 
+ * Q is (qx, qy, qz).  Uses Jacobian coordinates.
+ */
+extern mp_err GFp_ec_pt_add_jac(const mp_int *p, const mp_int *a, 
+    const mp_int *px, const mp_int *py, const mp_int *pz, 
+    const mp_int *qx, const mp_int *qy, const mp_int *qz, 
+    mp_int *rx, mp_int *ry, mp_int *rz);
+
+/* Computes R = 2P.  Uses Jacobian coordinates. */
+extern mp_err GFp_ec_pt_dbl_jac(const mp_int *p, const mp_int *a, 
+    const mp_int *px, const mp_int *py, const mp_int *pz, 
+    mp_int *rx, mp_int *ry, mp_int *rz);
+
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the prime that 
+ * determines the field GFp.  Uses Jacobian coordinates.
+ */
+mp_err GFp_ec_pt_mul_jac(const mp_int *p, const mp_int *a, const mp_int *b, 
+    const mp_int *px, const mp_int *py, const mp_int *n, 
+    mp_int *rx, mp_int *ry);
+
+#define GFp_ec_pt_is_inf(px, py)    GFp_ec_pt_is_inf_aff((px), (py))
+#define GFp_ec_pt_add(p, a, px, py, qx, qy, rx, ry) \
+        GFp_ec_pt_add_aff((p), (a), (px), (py), (qx), (qy), (rx), (ry))
+
+#define GFp_ECL_JACOBIAN
+#ifdef GFp_ECL_AFFINE
+#define GFp_ec_pt_mul(p, a, b, px, py, n, rx, ry) \
+	GFp_ec_pt_mul_aff((p), (a), (b), (px), (py), (n), (rx), (ry))
+#elif defined(GFp_ECL_JACOBIAN)
+#define GFp_ec_pt_mul(p, a, b, px, py, n, rx, ry) \
+	GFp_ec_pt_mul_jac((p), (a), (b), (px), (py), (n), (rx), (ry))
+#endif /* GFp_ECL_AFFINE or GFp_ECL_JACOBIAN*/
+
+#endif /* NSS_ENABLE_ECC */
+#endif /* __gfp_ecl_h_ */

mozilla/security/nss/lib/freebl/Makefile

@@ -0,0 +1,339 @@
+#! gmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+-include config.mk
+
+ifdef USE_64
+	DEFINES += -DNSS_USE_64
+endif
+
+ifdef USE_HYBRID
+	DEFINES += -DNSS_USE_HYBRID
+endif
+
+# des.c wants _X86_ defined for intel CPUs.  
+# coreconf does this for windows, but not for Linux, FreeBSD, etc.
+ifeq ($(CPU_ARCH),x86)
+ifneq (,$(filter-out WIN%,$(OS_TARGET)))
+	OS_REL_CFLAGS += -D_X86_
+endif
+endif
+
+ifeq ($(OS_TARGET),OSF1)
+    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
+    MPI_SRCS += mpvalpha.c
+endif
+
+ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))  #omits WIN16 and WINCE
+ifdef NS_USE_GCC
+# Ideally, we want to use assembler
+#     ASFILES  = mpi_x86.s
+#     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE \
+#                -DMP_ASSEMBLY_DIV_2DX1D
+# but we haven't figured out how to make it work, so we are not
+# using assembler right now.
+    ASFILES  =
+    DEFINES += -DMP_NO_MP_WORD -DMP_USE_UINT_DIGIT
+else
+    ASFILES  = mpi_x86.asm
+    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D
+endif
+ifdef BUILD_OPT
+ifndef NS_USE_GCC
+    OPTIMIZER += -Ox  # maximum optimization for freebl
+endif
+endif
+endif
+
+ifeq ($(OS_TARGET),WINCE)
+    DEFINES += -DMP_ARGCHK=0	# no assert in WinCE
+    DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
+endif
+
+ifdef XP_OS2_VACPP
+    ASFILES  = mpi_x86.asm
+    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
+endif
+
+ifeq ($(OS_TARGET),IRIX)
+ifeq ($(USE_N32),1)
+    ASFILES  = mpi_mips.s
+ifeq ($(NS_USE_GCC),1)
+    ASFLAGS = -Wp,-P -Wp,-traditional -O -mips3
+else
+    ASFLAGS = -O -OPT:Olimit=4000 -dollar -fullwarn -xansi -n32 -mips3 
+endif
+    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+    DEFINES += -DMP_USE_UINT_DIGIT
+else
+endif
+endif
+
+ifeq ($(OS_TARGET),Linux)
+ifeq ($(CPU_ARCH),x86)
+    ASFILES  = mpi_x86.s
+    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D
+endif
+endif
+
+ifeq ($(OS_TARGET),AIX)
+DEFINES += -DMP_USE_UINT_DIGIT
+ifndef USE_64
+DEFINES += -DMP_NO_DIV_WORD -DMP_NO_ADD_WORD -DMP_NO_SUB_WORD
+endif
+endif
+
+ifeq ($(OS_TARGET), HP-UX)
+ifneq ($(OS_TEST), ia64)
+MKSHLIB += +k +vshlibunsats -u FREEBL_GetVector +e FREEBL_GetVector
+ifndef FREEBL_EXTENDED_BUILD
+ifdef USE_PURE_32
+# build for DA1.1 (HP PA 1.1) pure 32 bit model
+    DEFINES  += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
+    DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
+else
+ifdef USE_64
+# this builds for DA2.0W (HP PA 2.0 Wide), the LP64 ABI, using 32-bit digits 
+    MPI_SRCS += mpi_hp.c 
+    ASFILES  += hpma512.s hppa20.s 
+    DEFINES  += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+else
+# this builds for DA2.0 (HP PA 2.0 Narrow) hybrid model 
+# (the 32-bit ABI with 64-bit registers) using 32-bit digits
+    MPI_SRCS += mpi_hp.c 
+    ASFILES  += hpma512.s hppa20.s 
+    DEFINES  += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+# This is done in coreconf by defining USE_LONG_LONGS
+#   OS_CFLAGS += -Aa +e +DA2.0 +DS2.0
+endif
+endif
+endif
+endif
+endif
+
+# Note: -xarch=v8 or v9 is now done in coreconf
+ifeq ($(OS_TARGET),SunOS)
+ifeq ($(CPU_ARCH),sparc)
+ifndef NS_USE_GCC
+ifdef USE_HYBRID
+    OS_CFLAGS += -xchip=ultra2
+endif
+endif
+ifeq (5.5.1,$(firstword $(sort 5.5.1 $(OS_RELEASE))))
+    SYSV_SPARC = 1
+endif
+ifeq ($(SYSV_SPARC),1)
+SOLARIS_AS = /usr/ccs/bin/as
+ifdef NS_USE_GCC
+ifdef GCC_USE_GNU_LD
+MKSHLIB += -Wl,-Bsymbolic,-z,defs,-z,now,-z,text,--version-script,mapfile.Solaris
+else
+MKSHLIB += -Wl,-B,symbolic,-z,defs,-z,now,-z,text,-M,mapfile.Solaris
+endif
+else
+MKSHLIB += -B symbolic -z defs -z now -z text -M mapfile.Solaris
+endif
+ifdef USE_PURE_32
+# this builds for Sparc v8 pure 32-bit architecture
+    DEFINES += -DMP_USE_LONG_LONG_MULTIPLY -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
+    DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
+else
+ifdef USE_64
+# this builds for Sparc v9a pure 64-bit architecture
+    MPI_SRCS += mpi_sparc.c
+    ASFILES   = mpv_sparcv9.s montmulfv9.s
+    DEFINES  += -DMP_ASSEMBLY_MULTIPLY -DMP_USING_MONT_MULF
+    DEFINES  += -DMP_USE_UINT_DIGIT 
+#   MPI_SRCS += mpv_sparc.c
+# removed -xdepend from the following line
+    SOLARIS_FLAGS = -fast -xO5 -xrestrict=%all -xchip=ultra -xarch=v9a -KPIC -mt
+    SOLARIS_AS_FLAGS = -xarch=v9a -K PIC
+else
+# this builds for Sparc v8+a hybrid architecture, 64-bit registers, 32-bit ABI
+    MPI_SRCS += mpi_sparc.c
+    ASFILES  = mpv_sparcv8.s montmulfv8.s
+    DEFINES  += -DMP_NO_MP_WORD -DMP_ASSEMBLY_MULTIPLY -DMP_USING_MONT_MULF
+    DEFINES  += -DMP_USE_UINT_DIGIT 
+    SOLARIS_AS_FLAGS = -xarch=v8plusa -K PIC
+#   ASM_SUFFIX = .S
+endif
+endif
+endif
+else
+# Solaris x86
+    DEFINES += -D_X86_
+    DEFINES += -DMP_USE_UINT_DIGIT
+    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D
+    ASFILES  = mpi_i86pc.s
+ifdef NS_USE_GCC
+    LD = gcc
+    AS = gcc
+    ASFLAGS =
+endif
+
+endif
+endif
+
+$(OBJDIR)/sysrand$(OBJ_SUFFIX): sysrand.c unix_rand.c win_rand.c mac_rand.c os2_rand.c
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+export:: private_export
+
+rijndael_tables:
+	$(CC) -o $(OBJDIR)/make_rijndael_tab rijndael_tables.c \
+	         $(DEFINES) $(INCLUDES) $(OBJDIR)/libfreebl.a
+	$(OBJDIR)/make_rijndael_tab
+
+ifdef MOZILLA_BSAFE_BUILD
+
+private_export::
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+	rm -f $(DIST)/lib/bsafe$(BSAFEVER).lib
+endif
+	$(NSINSTALL) -R $(BSAFEPATH) $(DIST)/lib
+endif
+
+ifdef USE_PURE_32 
+vpath %.h $(FREEBL_PARENT)/mpi:$(FREEBL_PARENT)
+vpath %.c $(FREEBL_PARENT)/mpi:$(FREEBL_PARENT)
+vpath %.S $(FREEBL_PARENT)/mpi:$(FREEBL_PARENT)
+vpath %.s $(FREEBL_PARENT)/mpi:$(FREEBL_PARENT)
+vpath %.asm $(FREEBL_PARENT)/mpi:$(FREEBL_PARENT)
+INCLUDES += -I$(FREEBL_PARENT) -I$(FREEBL_PARENT)/mpi
+else
+vpath %.h mpi
+vpath %.c mpi
+vpath %.S mpi
+vpath %.s mpi
+vpath %.asm mpi
+INCLUDES += -Impi
+endif
+
+
+DEFINES += -DMP_API_COMPATIBLE
+
+MPI_USERS = dh.c pqg.c dsa.c rsa.c ec.c GFp_ecl.c
+
+MPI_OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_SRCS:.c=$(OBJ_SUFFIX)))
+MPI_OBJS += $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_USERS:.c=$(OBJ_SUFFIX)))
+
+$(MPI_OBJS): $(MPI_HDRS)
+
+$(OBJDIR)/$(PROG_PREFIX)mpprime$(OBJ_SUFFIX): primes.c
+
+$(OBJDIR)/ldvector$(OBJ_SUFFIX) $(OBJDIR)/loader$(OBJ_SUFFIX) : loader.h
+
+ifeq ($(SYSV_SPARC),1)
+
+$(OBJDIR)/mpv_sparcv8.o $(OBJDIR)/montmulfv8.o : $(OBJDIR)/%.o : %.s 
+	@$(MAKE_OBJDIR)
+	$(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $<
+
+$(OBJDIR)/mpv_sparcv9.o $(OBJDIR)/montmulfv9.o : $(OBJDIR)/%.o : %.s
+	@$(MAKE_OBJDIR)
+	$(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $<
+
+$(OBJDIR)/mpmontg.o: mpmontg.c montmulf.h
+
+endif
+
+ifdef FREEBL_EXTENDED_BUILD
+
+PURE32DIR = $(OBJDIR)/$(OS_TARGET)pure32
+ALL_TRASH += $(PURE32DIR)
+
+FILES2LN = \
+ $(wildcard *.tab) \
+ $(wildcard mapfile.*) \
+ Makefile manifest.mn config.mk 
+
+LINKEDFILES = $(addprefix $(PURE32DIR)/, $(FILES2LN))
+
+CDDIR := $(shell pwd)
+
+$(PURE32DIR):
+	-mkdir $(PURE32DIR)
+	-ln -s $(CDDIR)/mpi $(PURE32DIR)
+
+$(LINKEDFILES) : $(PURE32DIR)/% : % 
+	ln -s $(CDDIR)/$* $(PURE32DIR)
+
+libs:: 
+	$(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_HYBRID=1 libs
+
+libs:: $(PURE32DIR) $(LINKEDFILES)
+	cd $(PURE32DIR) && $(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_PURE_32=1 FREEBL_PARENT=$(CDDIR) CORE_DEPTH=$(CDDIR)/$(CORE_DEPTH) libs
+
+release_md::
+	$(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_HYBRID=1 $@
+	cd $(PURE32DIR) && $(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_PURE_32=1 FREEBL_PARENT=$(CDDIR) CORE_DEPTH=$(CDDIR)/$(CORE_DEPTH) $@
+
+endif

mozilla/security/nss/lib/freebl/aeskeywrap.c

@@ -0,0 +1,383 @@
+/*
+ * aeskeywrap.c - implement AES Key Wrap algorithm from RFC 3394
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 2002, 2003 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ *
+ * $Id: aeskeywrap.c,v 1.1 2003-01-14 22:16:04 nelsonb%netscape.com Exp $
+ */
+
+#include "prcpucfg.h"
+#if defined(IS_LITTLE_ENDIAN) || defined(SHA_NO_LONG_LONG)
+#define BIG_ENDIAN_WITH_64_BIT_REGISTERS 0
+#else
+#define BIG_ENDIAN_WITH_64_BIT_REGISTERS 1
+#endif
+#include "prtypes.h"	/* for PRUintXX */
+#include "secport.h"	/* for PORT_XXX */
+#include "secerr.h"
+#include "blapi.h"	/* for AES_ functions */
+
+
+struct AESKeyWrapContextStr {
+     AESContext *  aescx;
+     unsigned char iv[AES_KEY_WRAP_IV_BYTES];
+};
+
+/******************************************/
+/*
+** AES key wrap algorithm, RFC 3394
+*/
+
+/*
+** Create a new AES context suitable for AES encryption/decryption.
+** 	"key" raw key data
+** 	"keylen" the number of bytes of key data (16, 24, or 32)
+*/
+extern AESKeyWrapContext *
+AESKeyWrap_CreateContext(const unsigned char *key, const unsigned char *iv, 
+                         int encrypt, unsigned int keylen)
+{
+    AESKeyWrapContext * cx = PORT_ZNew(AESKeyWrapContext);
+    if (!cx) 
+    	return NULL;	/* error is already set */
+    cx->aescx = AES_CreateContext(key, NULL, NSS_AES, encrypt, keylen, 
+                                  AES_BLOCK_SIZE);
+    if (!cx->aescx) {
+        PORT_Free(cx);
+	return NULL; 	/* error should already be set */
+    }
+    if (iv) {
+    	memcpy(cx->iv, iv, AES_KEY_WRAP_IV_BYTES);
+    } else {
+	memset(cx->iv, 0xA6, AES_KEY_WRAP_IV_BYTES);
+    }
+    return cx;
+}
+
+/*
+** Destroy a AES KeyWrap context.
+**	"cx" the context
+**	"freeit" if PR_TRUE then free the object as well as its sub-objects
+*/
+extern void 
+AESKeyWrap_DestroyContext(AESKeyWrapContext *cx, PRBool freeit)
+{
+    if (cx) {
+	if (cx->aescx)
+	    AES_DestroyContext(cx->aescx, PR_TRUE);
+	memset(cx, 0, sizeof *cx);
+	if (freeit)
+	    PORT_Free(cx);
+    }
+}
+
+#if !BIG_ENDIAN_WITH_64_BIT_REGISTERS
+
+/* The AES Key Wrap algorithm has 64-bit values that are ALWAYS big-endian
+** (Most significant byte first) in memory.  The only ALU operations done
+** on them are increment, decrement, and XOR.  So, on little-endian CPUs,
+** and on CPUs that lack 64-bit registers, these big-endian 64-bit operations
+** are simulated in the following code.  This is thought to be faster and
+** simpler than trying to convert the data to little-endian and back.
+*/
+
+/* A and T point to two 64-bit values stored most signficant byte first
+** (big endian).  This function increments the 64-bit value T, and then
+** XORs it with A, changing A.
+*/ 
+static void
+increment_and_xor(unsigned char *A, unsigned char *T)
+{
+    if (!++T[7])
+        if (!++T[6])
+	    if (!++T[5])
+		if (!++T[4])
+		    if (!++T[3])
+			if (!++T[2])
+			    if (!++T[1])
+				 ++T[0];
+
+    A[0] ^= T[0];
+    A[1] ^= T[1];
+    A[2] ^= T[2];
+    A[3] ^= T[3];
+    A[4] ^= T[4];
+    A[5] ^= T[5];
+    A[6] ^= T[6];
+    A[7] ^= T[7];
+}
+
+/* A and T point to two 64-bit values stored most signficant byte first
+** (big endian).  This function XORs T with A, giving a new A, then 
+** decrements the 64-bit value T.
+*/ 
+static void
+xor_and_decrement(unsigned char *A, unsigned char *T)
+{
+    A[0] ^= T[0];
+    A[1] ^= T[1];
+    A[2] ^= T[2];
+    A[3] ^= T[3];
+    A[4] ^= T[4];
+    A[5] ^= T[5];
+    A[6] ^= T[6];
+    A[7] ^= T[7];
+
+    if (!T[7]--)
+        if (!T[6]--)
+	    if (!T[5]--)
+		if (!T[4]--)
+		    if (!T[3]--)
+			if (!T[2]--)
+			    if (!T[1]--)
+				 T[0]--;
+
+}
+
+/* Given an unsigned long t (in host byte order), store this value as a
+** 64-bit big-endian value (MSB first) in *pt.
+*/
+static void
+set_t(unsigned char *pt, unsigned long t)
+{
+    pt[7] = (unsigned char)t; t >>= 8;
+    pt[6] = (unsigned char)t; t >>= 8;
+    pt[5] = (unsigned char)t; t >>= 8;
+    pt[4] = (unsigned char)t; t >>= 8;
+    pt[3] = (unsigned char)t; t >>= 8;
+    pt[2] = (unsigned char)t; t >>= 8;
+    pt[1] = (unsigned char)t; t >>= 8;
+    pt[0] = (unsigned char)t;
+}
+
+#endif
+
+/*
+** Perform AES key wrap.
+**	"cx" the context
+**	"output" the output buffer to store the encrypted data.
+**	"outputLen" how much data is stored in "output". Set by the routine
+**	   after some data is stored in output.
+**	"maxOutputLen" the maximum amount of data that can ever be
+**	   stored in "output"
+**	"input" the input data
+**	"inputLen" the amount of input data
+*/
+extern SECStatus 
+AESKeyWrap_Encrypt(AESKeyWrapContext *cx, unsigned char *output,
+            unsigned int *pOutputLen, unsigned int maxOutputLen,
+            const unsigned char *input, unsigned int inputLen)
+{
+    PRUint64 *     R          = NULL;
+    unsigned int   nBlocks;
+    unsigned int   i, j;
+    unsigned int   aesLen     = AES_BLOCK_SIZE;
+    unsigned int   outLen     = inputLen + AES_KEY_WRAP_BLOCK_SIZE;
+    SECStatus      s          = SECFailure;
+    /* These PRUint64s are ALWAYS big endian, regardless of CPU orientation. */
+    PRUint64       t;
+    PRUint64       B[2];
+
+#define A B[0]
+
+    /* Check args */
+    if (!inputLen || 0 != inputLen % AES_KEY_WRAP_BLOCK_SIZE) {
+	PORT_SetError(SEC_ERROR_INPUT_LEN);
+	return s;
+    }
+#ifdef maybe
+    if (!output && pOutputLen) {	/* caller is asking for output size */
+    	*pOutputLen = outLen;
+	return SECSuccess;
+    }
+#endif
+    if (maxOutputLen < outLen) {
+	PORT_SetError(SEC_ERROR_OUTPUT_LEN);
+	return s;
+    }
+    if (cx == NULL || output == NULL || input == NULL) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return s;
+    }
+    nBlocks = inputLen / AES_KEY_WRAP_BLOCK_SIZE;
+    R = PORT_NewArray(PRUint64, nBlocks + 1);
+    if (!R)
+    	return s;	/* error is already set. */
+    /* 
+    ** 1) Initialize variables.
+    */
+    memcpy(&A, cx->iv, AES_KEY_WRAP_IV_BYTES);
+    memcpy(&R[1], input, inputLen);
+#if BIG_ENDIAN_WITH_64_BIT_REGISTERS
+    t = 0;
+#else
+    memset(&t, 0, sizeof t);
+#endif
+    /* 
+    ** 2) Calculate intermediate values.
+    */
+    for (j = 0; j < 6; ++j) {
+    	for (i = 1; i <= nBlocks; ++i) {
+	    B[1] = R[i];
+	    s = AES_Encrypt(cx->aescx, (unsigned char *)B, &aesLen, 
+	                    sizeof B,  (unsigned char *)B, sizeof B);
+	    if (s != SECSuccess) 
+	        break;
+	    R[i] = B[1];
+	    /* here, increment t and XOR A with t (in big endian order); */
+#if BIG_ENDIAN_WITH_64_BIT_REGISTERS
+   	    A ^= ++t; 
+#else
+	    increment_and_xor((unsigned char *)&A, (unsigned char *)&t);
+#endif
+	}
+    }
+    /* 
+    ** 3) Output the results.
+    */
+    if (s == SECSuccess) {
+    	R[0] =  A;
+	memcpy(output, &R[0], outLen);
+	if (pOutputLen)
+	    *pOutputLen = outLen;
+    } else if (pOutputLen) {
+    	*pOutputLen = 0;
+    }
+    PORT_ZFree(R, outLen);
+    return s;
+}
+#undef A
+
+/*
+** Perform AES key unwrap.
+**	"cx" the context
+**	"output" the output buffer to store the decrypted data.
+**	"outputLen" how much data is stored in "output". Set by the routine
+**	   after some data is stored in output.
+**	"maxOutputLen" the maximum amount of data that can ever be
+**	   stored in "output"
+**	"input" the input data
+**	"inputLen" the amount of input data
+*/
+extern SECStatus 
+AESKeyWrap_Decrypt(AESKeyWrapContext *cx, unsigned char *output,
+            unsigned int *pOutputLen, unsigned int maxOutputLen,
+            const unsigned char *input, unsigned int inputLen)
+{
+    PRUint64 *     R          = NULL;
+    unsigned int   nBlocks;
+    unsigned int   i, j;
+    unsigned int   aesLen     = AES_BLOCK_SIZE;
+    unsigned int   outLen;
+    SECStatus      s          = SECFailure;
+    /* These PRUint64s are ALWAYS big endian, regardless of CPU orientation. */
+    PRUint64       t;
+    PRUint64       B[2];
+
+#define A B[0]
+
+    /* Check args */
+    if (inputLen < 3 * AES_KEY_WRAP_BLOCK_SIZE || 
+        0 != inputLen % AES_KEY_WRAP_BLOCK_SIZE) {
+	PORT_SetError(SEC_ERROR_INPUT_LEN);
+	return s;
+    }
+    outLen = inputLen - AES_KEY_WRAP_BLOCK_SIZE;
+#ifdef maybe
+    if (!output && pOutputLen) {	/* caller is asking for output size */
+    	*pOutputLen = outLen;
+	return SECSuccess;
+    }
+#endif
+    if (maxOutputLen < outLen) {
+	PORT_SetError(SEC_ERROR_OUTPUT_LEN);
+	return s;
+    }
+    if (cx == NULL || output == NULL || input == NULL) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return s;
+    }
+    nBlocks = inputLen / AES_KEY_WRAP_BLOCK_SIZE;
+    R = PORT_NewArray(PRUint64, nBlocks);
+    if (!R)
+    	return s;	/* error is already set. */
+    nBlocks--;
+    /* 
+    ** 1) Initialize variables.
+    */
+    memcpy(&R[0], input, inputLen);
+    A = R[0];
+#if BIG_ENDIAN_WITH_64_BIT_REGISTERS
+    t = 6UL * nBlocks;
+#else
+    set_t((unsigned char *)&t, 6UL * nBlocks);
+#endif
+    /* 
+    ** 2) Calculate intermediate values.
+    */
+    for (j = 0; j < 6; ++j) {
+    	for (i = nBlocks; i; --i) {
+	    /* here, XOR A with t (in big endian order) and decrement t; */
+#if BIG_ENDIAN_WITH_64_BIT_REGISTERS
+   	    A ^= t--; 
+#else
+	    xor_and_decrement((unsigned char *)&A, (unsigned char *)&t);
+#endif
+	    B[1] = R[i];
+	    s = AES_Decrypt(cx->aescx, (unsigned char *)B, &aesLen, 
+	                    sizeof B,  (unsigned char *)B, sizeof B);
+	    if (s != SECSuccess) 
+	        break;
+	    R[i] = B[1];
+	}
+    }
+    /* 
+    ** 3) Output the results.
+    */
+    if (s == SECSuccess) {
+	int bad = memcmp(&A, cx->iv, AES_KEY_WRAP_IV_BYTES);
+	if (!bad) {
+	    memcpy(output, &R[1], outLen);
+	    if (pOutputLen)
+		*pOutputLen = outLen;
+	} else {
+	    PORT_SetError(SEC_ERROR_BAD_DATA);
+	    if (pOutputLen) 
+		*pOutputLen = 0;
+    	}
+    } else if (pOutputLen) {
+    	*pOutputLen = 0;
+    }
+    PORT_ZFree(R, inputLen);
+    return s;
+}
+#undef A

mozilla/security/nss/lib/freebl/alg2268.c

@@ -0,0 +1,493 @@
+/*
+ * alg2268.c - implementation of the algorithm in RFC 2268
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ *
+ * $Id: alg2268.c,v 1.4 2002-11-16 06:09:57 nelsonb%netscape.com Exp $
+ */
+
+
+#include "blapi.h"
+#include "secerr.h"
+#ifdef XP_UNIX_XXX
+#include <stddef.h>	/* for ptrdiff_t */
+#endif
+
+/*
+** RC2 symmetric block cypher
+*/
+
+typedef SECStatus (rc2Func)(RC2Context *cx, unsigned char *output,
+		           const unsigned char *input, unsigned int inputLen);
+
+/* forward declarations */
+static rc2Func rc2_EncryptECB;
+static rc2Func rc2_DecryptECB;
+static rc2Func rc2_EncryptCBC;
+static rc2Func rc2_DecryptCBC;
+
+typedef union {
+    PRUint32	l[2];
+    PRUint16	s[4];
+    PRUint8	b[8];
+} RC2Block;
+
+struct RC2ContextStr {
+    union {
+    	PRUint8  Kb[128];
+	PRUint16 Kw[64];
+    } u;
+    RC2Block     iv;
+    rc2Func      *enc;
+    rc2Func      *dec;
+};
+
+#define B u.Kb
+#define K u.Kw
+#define BYTESWAP(x) ((x) << 8 | (x) >> 8)
+#define SWAPK(i)  cx->K[i] = (tmpS = cx->K[i], BYTESWAP(tmpS))
+#define RC2_BLOCK_SIZE 8
+
+#define LOAD_HARD(R) \
+    R[0] = (PRUint16)input[1] << 8 | input[0]; \
+    R[1] = (PRUint16)input[3] << 8 | input[2]; \
+    R[2] = (PRUint16)input[5] << 8 | input[4]; \
+    R[3] = (PRUint16)input[7] << 8 | input[6];
+#define LOAD_EASY(R) \
+    R[0] = ((PRUint16 *)input)[0]; \
+    R[1] = ((PRUint16 *)input)[1]; \
+    R[2] = ((PRUint16 *)input)[2]; \
+    R[3] = ((PRUint16 *)input)[3];
+#define STORE_HARD(R) \
+    output[0] =  (PRUint8)(R[0]);   output[1] = (PRUint8)(R[0] >> 8); \
+    output[2] =  (PRUint8)(R[1]);   output[3] = (PRUint8)(R[1] >> 8); \
+    output[4] =  (PRUint8)(R[2]);   output[5] = (PRUint8)(R[2] >> 8); \
+    output[6] =  (PRUint8)(R[3]);   output[7] = (PRUint8)(R[3] >> 8);
+#define STORE_EASY(R) \
+    ((PRUint16 *)output)[0] =  R[0]; \
+    ((PRUint16 *)output)[1] =  R[1]; \
+    ((PRUint16 *)output)[2] =  R[2]; \
+    ((PRUint16 *)output)[3] =  R[3];   
+
+#if defined (_X86_)
+#define LOAD(R)  LOAD_EASY(R)
+#define STORE(R) STORE_EASY(R)
+#elif !defined(IS_LITTLE_ENDIAN)
+#define LOAD(R)  LOAD_HARD(R)
+#define STORE(R) STORE_HARD(R)
+#else
+#define LOAD(R) if ((ptrdiff_t)input & 1) { LOAD_HARD(R) } else { LOAD_EASY(R) }
+#define STORE(R) if ((ptrdiff_t)input & 1) { STORE_HARD(R) } else { STORE_EASY(R) }
+#endif
+
+static const PRUint8 S[256] = {
+0331,0170,0371,0304,0031,0335,0265,0355,0050,0351,0375,0171,0112,0240,0330,0235,
+0306,0176,0067,0203,0053,0166,0123,0216,0142,0114,0144,0210,0104,0213,0373,0242,
+0027,0232,0131,0365,0207,0263,0117,0023,0141,0105,0155,0215,0011,0201,0175,0062,
+0275,0217,0100,0353,0206,0267,0173,0013,0360,0225,0041,0042,0134,0153,0116,0202,
+0124,0326,0145,0223,0316,0140,0262,0034,0163,0126,0300,0024,0247,0214,0361,0334,
+0022,0165,0312,0037,0073,0276,0344,0321,0102,0075,0324,0060,0243,0074,0266,0046,
+0157,0277,0016,0332,0106,0151,0007,0127,0047,0362,0035,0233,0274,0224,0103,0003,
+0370,0021,0307,0366,0220,0357,0076,0347,0006,0303,0325,0057,0310,0146,0036,0327,
+0010,0350,0352,0336,0200,0122,0356,0367,0204,0252,0162,0254,0065,0115,0152,0052,
+0226,0032,0322,0161,0132,0025,0111,0164,0113,0237,0320,0136,0004,0030,0244,0354,
+0302,0340,0101,0156,0017,0121,0313,0314,0044,0221,0257,0120,0241,0364,0160,0071,
+0231,0174,0072,0205,0043,0270,0264,0172,0374,0002,0066,0133,0045,0125,0227,0061,
+0055,0135,0372,0230,0343,0212,0222,0256,0005,0337,0051,0020,0147,0154,0272,0311,
+0323,0000,0346,0317,0341,0236,0250,0054,0143,0026,0001,0077,0130,0342,0211,0251,
+0015,0070,0064,0033,0253,0063,0377,0260,0273,0110,0014,0137,0271,0261,0315,0056,
+0305,0363,0333,0107,0345,0245,0234,0167,0012,0246,0040,0150,0376,0177,0301,0255
+};
+
+/*
+** Create a new RC2 context suitable for RC2 encryption/decryption.
+** 	"key" raw key data
+** 	"len" the number of bytes of key data
+** 	"iv" is the CBC initialization vector (if mode is NSS_RC2_CBC)
+** 	"mode" one of NSS_RC2 or NSS_RC2_CBC
+**	"effectiveKeyLen" in bytes, not bits.
+**
+** When mode is set to NSS_RC2_CBC the RC2 cipher is run in "cipher block
+** chaining" mode.
+*/
+RC2Context *
+RC2_CreateContext(const unsigned char *key, unsigned int len,
+		  const unsigned char *input, int mode, unsigned efLen8)
+{
+    RC2Context *cx;
+    PRUint8    *L,*L2;
+    int         i;
+#if !defined(IS_LITTLE_ENDIAN)
+    PRUint16    tmpS;
+#endif
+    PRUint8     tmpB;
+
+    if (!key || len == 0 || len > (sizeof cx->B) || efLen8 > (sizeof cx->B)) {
+    	return NULL;
+    }
+    if (mode == NSS_RC2) {
+    	/* groovy */
+    } else if (mode == NSS_RC2_CBC) {
+    	if (!input) {
+	    return NULL;	/* not groovy */
+	}
+    } else {
+    	return NULL;
+    }
+
+    cx = PORT_ZNew(RC2Context);
+    if (!cx)
+    	return cx;
+
+    if (mode == NSS_RC2_CBC) {
+    	cx->enc = & rc2_EncryptCBC;
+	cx->dec = & rc2_DecryptCBC;
+	LOAD(cx->iv.s);
+    } else {
+    	cx->enc = & rc2_EncryptECB;
+	cx->dec = & rc2_DecryptECB;
+    }
+
+    /* Step 0. Copy key into table. */
+    memcpy(cx->B, key, len);
+
+    /* Step 1. Compute all values to the right of the key. */
+    L2 = cx->B;
+    L = L2 + len;
+    tmpB = L[-1];
+    for (i = (sizeof cx->B) - len; i > 0; --i) {
+	*L++ = tmpB = S[ (PRUint8)(tmpB + *L2++) ];
+    }
+
+    /* step 2. Adjust left most byte of effective key. */
+    i = (sizeof cx->B) - efLen8;
+    L = cx->B + i;
+    *L = tmpB = S[*L];				/* mask is always 0xff */
+
+    /* step 3. Recompute all values to the left of effective key. */
+    L2 = --L + efLen8;
+    while(L >= cx->B) {
+	*L-- = tmpB = S[ tmpB ^ *L2-- ];
+    }
+
+#if !defined(IS_LITTLE_ENDIAN)
+    for (i = 63; i >= 0; --i) {
+        SWAPK(i);		/* candidate for unrolling */
+    }
+#endif
+    return cx;
+}
+
+/*
+** Destroy an RC2 encryption/decryption context.
+**	"cx" the context
+**	"freeit" if PR_TRUE then free the object as well as its sub-objects
+*/
+void 
+RC2_DestroyContext(RC2Context *cx, PRBool freeit)
+{
+    if (cx) {
+	memset(cx, 0, sizeof *cx);
+	if (freeit) {
+	    PORT_Free(cx);
+	}
+    }
+}
+
+#define ROL(x,k) (x << k | x >> (16-k))
+#define MIX(j) \
+    R0 = R0 + cx->K[ 4*j+0] + (R3 & R2) + (~R3 & R1);  R0 = ROL(R0,1);\
+    R1 = R1 + cx->K[ 4*j+1] + (R0 & R3) + (~R0 & R2);  R1 = ROL(R1,2);\
+    R2 = R2 + cx->K[ 4*j+2] + (R1 & R0) + (~R1 & R3);  R2 = ROL(R2,3);\
+    R3 = R3 + cx->K[ 4*j+3] + (R2 & R1) + (~R2 & R0);  R3 = ROL(R3,5)
+#define MASH \
+    R0 = R0 + cx->K[R3 & 63];\
+    R1 = R1 + cx->K[R0 & 63];\
+    R2 = R2 + cx->K[R1 & 63];\
+    R3 = R3 + cx->K[R2 & 63]
+
+/* Encrypt one block */
+static void 
+rc2_Encrypt1Block(RC2Context *cx, RC2Block *output, RC2Block *input)
+{
+    register PRUint16 R0, R1, R2, R3;
+
+    /* step 1. Initialize input. */
+    R0 = input->s[0];
+    R1 = input->s[1];
+    R2 = input->s[2];
+    R3 = input->s[3];
+
+    /* step 2.  Expand Key (already done, in context) */
+    /* step 3.  j = 0 */
+    /* step 4.  Perform 5 mixing rounds. */
+
+    MIX(0);
+    MIX(1);
+    MIX(2);
+    MIX(3);
+    MIX(4);
+
+    /* step 5. Perform 1 mashing round. */
+    MASH;
+
+    /* step 6. Perform 6 mixing rounds. */
+
+    MIX(5);
+    MIX(6);
+    MIX(7);
+    MIX(8);
+    MIX(9);
+    MIX(10);
+
+    /* step 7. Perform 1 mashing round. */
+    MASH;
+
+    /* step 8. Perform 5 mixing rounds. */
+
+    MIX(11);
+    MIX(12);
+    MIX(13);
+    MIX(14);
+    MIX(15);
+
+    /* output results */
+    output->s[0] = R0;
+    output->s[1] = R1;
+    output->s[2] = R2;
+    output->s[3] = R3;
+}
+
+#define ROR(x,k) (x >> k | x << (16-k))
+#define R_MIX(j) \
+    R3 = ROR(R3,5); R3 = R3 - cx->K[ 4*j+3] - (R2 & R1) - (~R2 & R0);  \
+    R2 = ROR(R2,3); R2 = R2 - cx->K[ 4*j+2] - (R1 & R0) - (~R1 & R3);  \
+    R1 = ROR(R1,2); R1 = R1 - cx->K[ 4*j+1] - (R0 & R3) - (~R0 & R2);  \
+    R0 = ROR(R0,1); R0 = R0 - cx->K[ 4*j+0] - (R3 & R2) - (~R3 & R1)
+#define R_MASH \
+    R3 = R3 - cx->K[R2 & 63];\
+    R2 = R2 - cx->K[R1 & 63];\
+    R1 = R1 - cx->K[R0 & 63];\
+    R0 = R0 - cx->K[R3 & 63]
+
+/* Encrypt one block */
+static void 
+rc2_Decrypt1Block(RC2Context *cx, RC2Block *output, RC2Block *input)
+{
+    register PRUint16 R0, R1, R2, R3;
+
+    /* step 1. Initialize input. */
+    R0 = input->s[0];
+    R1 = input->s[1];
+    R2 = input->s[2];
+    R3 = input->s[3];
+
+    /* step 2.  Expand Key (already done, in context) */
+    /* step 3.  j = 63 */
+    /* step 4.  Perform 5 r_mixing rounds. */
+    R_MIX(15);
+    R_MIX(14);
+    R_MIX(13);
+    R_MIX(12);
+    R_MIX(11);
+
+    /* step 5.  Perform 1 r_mashing round. */
+    R_MASH;
+
+    /* step 6.  Perform 6 r_mixing rounds. */
+    R_MIX(10);
+    R_MIX(9);
+    R_MIX(8);
+    R_MIX(7);
+    R_MIX(6);
+    R_MIX(5);
+
+    /* step 7.  Perform 1 r_mashing round. */
+    R_MASH;
+
+    /* step 8.  Perform 5 r_mixing rounds. */
+    R_MIX(4);
+    R_MIX(3);
+    R_MIX(2);
+    R_MIX(1);
+    R_MIX(0);
+
+    /* output results */
+    output->s[0] = R0;
+    output->s[1] = R1;
+    output->s[2] = R2;
+    output->s[3] = R3;
+}
+
+static SECStatus
+rc2_EncryptECB(RC2Context *cx, unsigned char *output,
+	       const unsigned char *input, unsigned int inputLen)
+{
+    RC2Block  iBlock;
+
+    while (inputLen > 0) {
+    	LOAD(iBlock.s)
+	rc2_Encrypt1Block(cx, &iBlock, &iBlock);
+	STORE(iBlock.s)
+	output   += RC2_BLOCK_SIZE;
+	input    += RC2_BLOCK_SIZE;
+	inputLen -= RC2_BLOCK_SIZE;
+    }
+    return SECSuccess;
+}
+
+static SECStatus
+rc2_DecryptECB(RC2Context *cx, unsigned char *output,
+	       const unsigned char *input, unsigned int inputLen)
+{
+    RC2Block  iBlock;
+
+    while (inputLen > 0) {
+    	LOAD(iBlock.s)
+	rc2_Decrypt1Block(cx, &iBlock, &iBlock);
+	STORE(iBlock.s)
+	output   += RC2_BLOCK_SIZE;
+	input    += RC2_BLOCK_SIZE;
+	inputLen -= RC2_BLOCK_SIZE;
+    }
+    return SECSuccess;
+}
+
+static SECStatus
+rc2_EncryptCBC(RC2Context *cx, unsigned char *output,
+	       const unsigned char *input, unsigned int inputLen)
+{
+    RC2Block  iBlock;
+
+    while (inputLen > 0) {
+
+	LOAD(iBlock.s)
+	iBlock.l[0] ^= cx->iv.l[0];
+	iBlock.l[1] ^= cx->iv.l[1];
+	rc2_Encrypt1Block(cx, &iBlock, &iBlock);
+	cx->iv = iBlock;
+	STORE(iBlock.s)
+	output   += RC2_BLOCK_SIZE;
+	input    += RC2_BLOCK_SIZE;
+	inputLen -= RC2_BLOCK_SIZE;
+    }
+    return SECSuccess;
+}
+
+static SECStatus
+rc2_DecryptCBC(RC2Context *cx, unsigned char *output,
+	       const unsigned char *input, unsigned int inputLen)
+{
+    RC2Block  iBlock;
+    RC2Block  oBlock;
+
+    while (inputLen > 0) {
+	LOAD(iBlock.s)
+	rc2_Decrypt1Block(cx, &oBlock, &iBlock);
+	oBlock.l[0] ^= cx->iv.l[0];
+	oBlock.l[1] ^= cx->iv.l[1];
+	cx->iv = iBlock;
+	STORE(oBlock.s)
+	output   += RC2_BLOCK_SIZE;
+	input    += RC2_BLOCK_SIZE;
+	inputLen -= RC2_BLOCK_SIZE;
+    }
+    return SECSuccess;
+}
+
+
+/*
+** Perform RC2 encryption.
+**	"cx" the context
+**	"output" the output buffer to store the encrypted data.
+**	"outputLen" how much data is stored in "output". Set by the routine
+**	   after some data is stored in output.
+**	"maxOutputLen" the maximum amount of data that can ever be
+**	   stored in "output"
+**	"input" the input data
+**	"inputLen" the amount of input data
+*/
+SECStatus RC2_Encrypt(RC2Context *cx, unsigned char *output,
+		      unsigned int *outputLen, unsigned int maxOutputLen,
+		      const unsigned char *input, unsigned int inputLen)
+{
+    SECStatus rv = SECSuccess;
+    if (inputLen) {
+	if (inputLen % RC2_BLOCK_SIZE) {
+	    PORT_SetError(SEC_ERROR_INPUT_LEN);
+	    return SECFailure;
+	}
+	if (maxOutputLen < inputLen) {
+	    PORT_SetError(SEC_ERROR_OUTPUT_LEN);
+	    return SECFailure;
+	}
+	rv = (*cx->enc)(cx, output, input, inputLen);
+    }
+    if (rv == SECSuccess) {
+    	*outputLen = inputLen;
+    }
+    return rv;
+}
+
+/*
+** Perform RC2 decryption.
+**	"cx" the context
+**	"output" the output buffer to store the decrypted data.
+**	"outputLen" how much data is stored in "output". Set by the routine
+**	   after some data is stored in output.
+**	"maxOutputLen" the maximum amount of data that can ever be
+**	   stored in "output"
+**	"input" the input data
+**	"inputLen" the amount of input data
+*/
+SECStatus RC2_Decrypt(RC2Context *cx, unsigned char *output,
+		      unsigned int *outputLen, unsigned int maxOutputLen,
+		      const unsigned char *input, unsigned int inputLen)
+{
+    SECStatus rv = SECSuccess;
+    if (inputLen) {
+	if (inputLen % RC2_BLOCK_SIZE) {
+	    PORT_SetError(SEC_ERROR_INPUT_LEN);
+	    return SECFailure;
+	}
+	if (maxOutputLen < inputLen) {
+	    PORT_SetError(SEC_ERROR_OUTPUT_LEN);
+	    return SECFailure;
+	}
+	rv = (*cx->dec)(cx, output, input, inputLen);
+    }
+    if (rv == SECSuccess) {
+	*outputLen = inputLen;
+    }
+    return rv;
+}
+

mozilla/security/nss/lib/freebl/arcfive.c

@@ -0,0 +1,114 @@
+/*
+ * arcfive.c - stubs for RC5 - NOT a working implementation!
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ *
+ * $Id: arcfive.c,v 1.3 2002-11-16 06:09:57 nelsonb%netscape.com Exp $
+ */
+
+#include "blapi.h"
+#include "prerror.h"
+
+/******************************************/
+/*
+** RC5 symmetric block cypher -- 64-bit block size
+*/
+
+/*
+** Create a new RC5 context suitable for RC5 encryption/decryption.
+**      "key" raw key data
+**      "len" the number of bytes of key data
+**      "iv" is the CBC initialization vector (if mode is NSS_RC5_CBC)
+**      "mode" one of NSS_RC5 or NSS_RC5_CBC
+**
+** When mode is set to NSS_RC5_CBC the RC5 cipher is run in "cipher block
+** chaining" mode.
+*/
+RC5Context *
+RC5_CreateContext(const SECItem *key, unsigned int rounds,
+                  unsigned int wordSize, const unsigned char *iv, int mode)
+{
+    PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+    return NULL;
+}
+
+/*
+** Destroy an RC5 encryption/decryption context.
+**      "cx" the context
+**      "freeit" if PR_TRUE then free the object as well as its sub-objects
+*/
+void 
+RC5_DestroyContext(RC5Context *cx, PRBool freeit) 
+{
+    PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+}
+
+/*
+** Perform RC5 encryption.
+**      "cx" the context
+**      "output" the output buffer to store the encrypted data.
+**      "outputLen" how much data is stored in "output". Set by the routine
+**         after some data is stored in output.
+**      "maxOutputLen" the maximum amount of data that can ever be
+**         stored in "output"
+**      "input" the input data
+**      "inputLen" the amount of input data
+*/
+SECStatus 
+RC5_Encrypt(RC5Context *cx, unsigned char *output, unsigned int *outputLen, 
+	    unsigned int maxOutputLen, 
+	    const unsigned char *input, unsigned int inputLen)
+{
+    PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+    return SECFailure;
+}
+
+/*
+** Perform RC5 decryption.
+**      "cx" the context
+**      "output" the output buffer to store the decrypted data.
+**      "outputLen" how much data is stored in "output". Set by the routine
+**         after some data is stored in output.
+**      "maxOutputLen" the maximum amount of data that can ever be
+**         stored in "output"
+**      "input" the input data
+**      "inputLen" the amount of input data
+*/
+SECStatus 
+RC5_Decrypt(RC5Context *cx, unsigned char *output, unsigned int *outputLen, 
+	    unsigned int maxOutputLen,
+            const unsigned char *input, unsigned int inputLen)
+{
+    PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+    return SECFailure;
+}
+

mozilla/security/nss/lib/freebl/arcfour.c

@@ -0,0 +1,567 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.	Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.	If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include "prerr.h"
+#include "secerr.h"
+
+#include "prtypes.h"
+#include "blapi.h"
+
+/* Architecture-dependent defines */
+
+#if defined(SOLARIS) || defined(HPUX) || defined(i386) || defined(IRIX)
+/* Convert the byte-stream to a word-stream */
+#define CONVERT_TO_WORDS
+#endif
+
+#if defined(AIX) || defined(OSF1)
+/* Treat array variables as longs, not bytes */
+#define USE_LONG
+#endif
+
+#if defined(_WIN32_WCE)
+#undef WORD
+#define WORD ARC4WORD
+#endif
+
+#if defined(NSS_USE_HYBRID) && !defined(SOLARIS) && !defined(NSS_USE_64) 
+typedef unsigned long long WORD;
+#else
+typedef unsigned long WORD;
+#endif
+#define WORDSIZE sizeof(WORD)
+
+#ifdef USE_LONG
+typedef unsigned long Stype;
+#else
+typedef PRUint8 Stype;
+#endif
+
+#define ARCFOUR_STATE_SIZE 256
+
+#define MASK1BYTE (WORD)(0xff)
+
+#define SWAP(a, b) \
+	tmp = a; \
+	a = b; \
+	b = tmp;
+
+/*
+ * State information for stream cipher.
+ */
+struct RC4ContextStr
+{
+	Stype S[ARCFOUR_STATE_SIZE];
+	PRUint8 i;
+	PRUint8 j;
+};
+
+/*
+ * array indices [0..255] to initialize cx->S array (faster than loop).
+ */
+static const Stype Kinit[256] = {
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+	0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+	0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+	0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+	0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+	0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+	0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+
+/*
+ * Initialize a new generator.
+ */
+RC4Context *
+RC4_CreateContext(const unsigned char *key, int len)
+{
+	int i;
+	PRUint8 j, tmp;
+	RC4Context *cx;
+	PRUint8 K[256];
+	PRUint8 *L;
+	/* verify the key length. */
+	PORT_Assert(len > 0 && len < ARCFOUR_STATE_SIZE);
+	if (len < 0 || len >= ARCFOUR_STATE_SIZE) {
+		PORT_SetError(SEC_ERROR_INVALID_ARGS);
+		return NULL;
+	}
+	/* Create space for the context. */
+	cx = (RC4Context *)PORT_ZAlloc(sizeof(RC4Context));
+	if (cx == NULL) {
+		PORT_SetError(PR_OUT_OF_MEMORY_ERROR);
+		return NULL;
+	}
+	/* Initialize the state using array indices. */
+	memcpy(cx->S, Kinit, sizeof cx->S);
+	/* Fill in K repeatedly with values from key. */
+	L = K;
+	for (i = sizeof K; i > len; i-= len) {
+		memcpy(L, key, len);
+		L += len;
+	}
+	memcpy(L, key, i);
+	/* Stir the state of the generator.  At this point it is assumed
+	 * that the key is the size of the state buffer.  If this is not
+	 * the case, the key bytes are repeated to fill the buffer.
+	 */
+	j = 0;
+#define ARCFOUR_STATE_STIR(ii) \
+	j = j + cx->S[ii] + K[ii]; \
+	SWAP(cx->S[ii], cx->S[j]);
+	for (i=0; i<ARCFOUR_STATE_SIZE; i++) {
+		ARCFOUR_STATE_STIR(i);
+	}
+	cx->i = 0;
+	cx->j = 0;
+	return cx;
+}
+
+void 
+RC4_DestroyContext(RC4Context *cx, PRBool freeit)
+{
+	if (freeit)
+		PORT_ZFree(cx, sizeof(*cx));
+}
+
+/*
+ * Generate the next byte in the stream.
+ */
+#define ARCFOUR_NEXT_BYTE() \
+	tmpSi = cx->S[++tmpi]; \
+	tmpj += tmpSi; \
+	tmpSj = cx->S[tmpj]; \
+	cx->S[tmpi] = tmpSj; \
+	cx->S[tmpj] = tmpSi; \
+	t = tmpSi + tmpSj;
+
+#ifdef CONVERT_TO_WORDS
+/*
+ * Straight RC4 op.  No optimization.
+ */
+static SECStatus 
+rc4_no_opt(RC4Context *cx, unsigned char *output,
+           unsigned int *outputLen, unsigned int maxOutputLen,
+           const unsigned char *input, unsigned int inputLen)
+{
+    PRUint8 t;
+	Stype tmpSi, tmpSj;
+	register PRUint8 tmpi = cx->i;
+	register PRUint8 tmpj = cx->j;
+	unsigned int index;
+	PORT_Assert(maxOutputLen >= inputLen);
+	if (maxOutputLen < inputLen) {
+		PORT_SetError(SEC_ERROR_INVALID_ARGS);
+		return SECFailure;
+	}
+	for (index=0; index < inputLen; index++) {
+		/* Generate next byte from stream. */
+		ARCFOUR_NEXT_BYTE();
+		/* output = next stream byte XOR next input byte */
+		output[index] = cx->S[t] ^ input[index];
+	}
+	*outputLen = inputLen;
+	cx->i = tmpi;
+	cx->j = tmpj;
+	return SECSuccess;
+}
+#endif
+
+#ifndef CONVERT_TO_WORDS
+/*
+ * Byte-at-a-time RC4, unrolling the loop into 8 pieces.
+ */
+static SECStatus 
+rc4_unrolled(RC4Context *cx, unsigned char *output,
+             unsigned int *outputLen, unsigned int maxOutputLen,
+             const unsigned char *input, unsigned int inputLen)
+{
+	PRUint8 t;
+	Stype tmpSi, tmpSj;
+	register PRUint8 tmpi = cx->i;
+	register PRUint8 tmpj = cx->j;
+	int index;
+	PORT_Assert(maxOutputLen >= inputLen);
+	if (maxOutputLen < inputLen) {
+		PORT_SetError(SEC_ERROR_INVALID_ARGS);
+		return SECFailure;
+	}
+	for (index = inputLen / 8; index-- > 0; input += 8, output += 8) {
+		ARCFOUR_NEXT_BYTE();
+		output[0] = cx->S[t] ^ input[0];
+		ARCFOUR_NEXT_BYTE();
+		output[1] = cx->S[t] ^ input[1];
+		ARCFOUR_NEXT_BYTE();
+		output[2] = cx->S[t] ^ input[2];
+		ARCFOUR_NEXT_BYTE();
+		output[3] = cx->S[t] ^ input[3];
+		ARCFOUR_NEXT_BYTE();
+		output[4] = cx->S[t] ^ input[4];
+		ARCFOUR_NEXT_BYTE();
+		output[5] = cx->S[t] ^ input[5];
+		ARCFOUR_NEXT_BYTE();
+		output[6] = cx->S[t] ^ input[6];
+		ARCFOUR_NEXT_BYTE();
+		output[7] = cx->S[t] ^ input[7];
+	}
+	index = inputLen % 8;
+	if (index) {
+		input += index;
+		output += index;
+		switch (index) {
+		case 7:
+			ARCFOUR_NEXT_BYTE();
+			output[-7] = cx->S[t] ^ input[-7]; /* FALLTHRU */
+		case 6:
+			ARCFOUR_NEXT_BYTE();
+			output[-6] = cx->S[t] ^ input[-6]; /* FALLTHRU */
+		case 5:
+			ARCFOUR_NEXT_BYTE();
+			output[-5] = cx->S[t] ^ input[-5]; /* FALLTHRU */
+		case 4:
+			ARCFOUR_NEXT_BYTE();
+			output[-4] = cx->S[t] ^ input[-4]; /* FALLTHRU */
+		case 3:
+			ARCFOUR_NEXT_BYTE();
+			output[-3] = cx->S[t] ^ input[-3]; /* FALLTHRU */
+		case 2:
+			ARCFOUR_NEXT_BYTE();
+			output[-2] = cx->S[t] ^ input[-2]; /* FALLTHRU */
+		case 1:
+			ARCFOUR_NEXT_BYTE();
+			output[-1] = cx->S[t] ^ input[-1]; /* FALLTHRU */
+		default:
+			/* FALLTHRU */
+			; /* hp-ux build breaks without this */
+		}
+	}
+	cx->i = tmpi;
+	cx->j = tmpj;
+	*outputLen = inputLen;
+	return SECSuccess;
+}
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define ARCFOUR_NEXT4BYTES_L(n) \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n     ); \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n +  8); \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n + 16); \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n + 24);
+#else
+#define ARCFOUR_NEXT4BYTES_B(n) \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n + 24); \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n + 16); \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n +  8); \
+	ARCFOUR_NEXT_BYTE(); streamWord |= (WORD)cx->S[t] << (n     );
+#endif
+
+#if (defined(NSS_USE_HYBRID) && !defined(SOLARIS)) || defined(NSS_USE_64)
+/* 64-bit wordsize */
+#ifdef IS_LITTLE_ENDIAN
+#define ARCFOUR_NEXT_WORD() \
+	{ streamWord = 0; ARCFOUR_NEXT4BYTES_L(0); ARCFOUR_NEXT4BYTES_L(32); }
+#else
+#define ARCFOUR_NEXT_WORD() \
+	{ streamWord = 0; ARCFOUR_NEXT4BYTES_B(32); ARCFOUR_NEXT4BYTES_B(0); }
+#endif
+#else
+/* 32-bit wordsize */
+#ifdef IS_LITTLE_ENDIAN
+#define ARCFOUR_NEXT_WORD() \
+	{ streamWord = 0; ARCFOUR_NEXT4BYTES_L(0); }
+#else
+#define ARCFOUR_NEXT_WORD() \
+	{ streamWord = 0; ARCFOUR_NEXT4BYTES_B(0); }
+#endif
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define RSH <<
+#define LSH >>
+#else
+#define RSH >>
+#define LSH <<
+#endif
+
+#ifdef CONVERT_TO_WORDS
+/*
+ * Convert input and output buffers to words before performing
+ * RC4 operations.
+ */
+static SECStatus 
+rc4_wordconv(RC4Context *cx, unsigned char *output,
+             unsigned int *outputLen, unsigned int maxOutputLen,
+             const unsigned char *input, unsigned int inputLen)
+{
+	ptrdiff_t inOffset = (ptrdiff_t)input % WORDSIZE;
+	ptrdiff_t outOffset = (ptrdiff_t)output % WORDSIZE;
+	register WORD streamWord, mask;
+	register WORD *pInWord, *pOutWord;
+	register WORD inWord, nextInWord;
+	PRUint8 t;
+	register Stype tmpSi, tmpSj;
+	register PRUint8 tmpi = cx->i;
+	register PRUint8 tmpj = cx->j;
+	unsigned int byteCount;
+	unsigned int bufShift, invBufShift;
+	int i;
+
+	PORT_Assert(maxOutputLen >= inputLen);
+	if (maxOutputLen < inputLen) {
+		PORT_SetError(SEC_ERROR_INVALID_ARGS);
+		return SECFailure;
+	}
+	if (inputLen < 2*WORDSIZE) {
+		/* Ignore word conversion, do byte-at-a-time */
+		return rc4_no_opt(cx, output, outputLen, maxOutputLen, input, inputLen);
+	}
+	*outputLen = inputLen;
+	pInWord = (WORD *)(input - inOffset);
+	if (inOffset < outOffset) {
+		bufShift = 8*(outOffset - inOffset);
+		invBufShift = 8*WORDSIZE - bufShift;
+	} else {
+		invBufShift = 8*(inOffset - outOffset);
+		bufShift = 8*WORDSIZE - invBufShift;
+	}
+	/*****************************************************************/
+	/* Step 1:                                                       */
+	/* If the first output word is partial, consume the bytes in the */
+	/* first partial output word by loading one or two words of      */
+	/* input and shifting them accordingly.  Otherwise, just load    */
+	/* in the first word of input.  At the end of this block, at     */
+	/* least one partial word of input should ALWAYS be loaded.      */
+	/*****************************************************************/
+	if (outOffset) {
+		/* Generate input and stream words aligned relative to the
+		 * partial output buffer.
+		 */
+		byteCount = WORDSIZE - outOffset; 
+		pOutWord = (WORD *)(output - outOffset);
+		mask = streamWord = 0;
+#ifdef IS_LITTLE_ENDIAN
+		for (i = WORDSIZE - byteCount; i < WORDSIZE; i++) {
+#else
+		for (i = byteCount - 1; i >= 0; --i) {
+#endif
+			ARCFOUR_NEXT_BYTE();
+			streamWord |= (WORD)(cx->S[t]) << 8*i;
+			mask |= MASK1BYTE << 8*i;
+		} /* } */
+		inWord = *pInWord++;
+		/* If buffers are relatively misaligned, shift the bytes in inWord
+		 * to be aligned to the output buffer.
+		 */
+		nextInWord = 0;
+		if (inOffset < outOffset) {
+			/* Have more bytes than needed, shift remainder into nextInWord */
+			nextInWord = inWord LSH 8*(inOffset + byteCount);
+			inWord = inWord RSH bufShift;
+		} else if (inOffset > outOffset) {
+			/* Didn't get enough bytes from current input word, load another
+			 * word and then shift remainder into nextInWord.
+			 */
+			nextInWord = *pInWord++;
+			inWord = (inWord LSH invBufShift) | 
+			         (nextInWord RSH bufShift);
+			nextInWord = nextInWord LSH invBufShift;
+		}
+		/* Store output of first partial word */
+		*pOutWord = (*pOutWord & ~mask) | ((inWord ^ streamWord) & mask);
+		/* Consumed byteCount bytes of input */
+		inputLen -= byteCount;
+		/* move to next word of output */
+		pOutWord++;
+		/* inWord has been consumed, but there may be bytes in nextInWord */
+		inWord = nextInWord;
+	} else {
+		/* output is word-aligned */
+		pOutWord = (WORD *)output;
+		if (inOffset) {
+			/* Input is not word-aligned.  The first word load of input 
+			 * will not produce a full word of input bytes, so one word
+			 * must be pre-loaded.  The main loop below will load in the
+			 * next input word and shift some of its bytes into inWord
+			 * in order to create a full input word.  Note that the main
+			 * loop must execute at least once because the input must
+			 * be at least two words.
+			 */
+			inWord = *pInWord++;
+			inWord = inWord LSH invBufShift;
+		} else {
+			/* Input is word-aligned.  The first word load of input 
+			 * will produce a full word of input bytes, so nothing
+			 * needs to be loaded here.
+			 */
+			inWord = 0;
+		}
+	}
+	/* Output buffer is aligned, inOffset is now measured relative to
+	 * outOffset (and not a word boundary).
+	 */
+	inOffset = (inOffset + WORDSIZE - outOffset) % WORDSIZE;
+	/*****************************************************************/
+	/* Step 2: main loop                                             */
+	/* At this point the output buffer is word-aligned.  Any unused  */
+	/* bytes from above will be in inWord (shifted correctly).  If   */
+	/* the input buffer is unaligned relative to the output buffer,  */
+	/* shifting has to be done.                                      */
+	/*****************************************************************/
+	if (inOffset) {
+		for (; inputLen >= WORDSIZE; inputLen -= WORDSIZE) {
+			nextInWord = *pInWord++;
+			inWord |= nextInWord RSH bufShift;
+			nextInWord = nextInWord LSH invBufShift;
+			ARCFOUR_NEXT_WORD();
+			*pOutWord++ = inWord ^ streamWord;
+			inWord = nextInWord;
+		}
+		if (inputLen == 0) {
+			/* Nothing left to do. */
+			cx->i = tmpi;
+			cx->j = tmpj;
+			return SECSuccess;
+		}
+		/* If the amount of remaining input is greater than the amount
+		 * bytes pulled from the current input word, need to do another
+		 * word load.  What's left in inWord will be consumed in step 3.
+		 */
+		if (inputLen > WORDSIZE - inOffset)
+			inWord |= *pInWord RSH bufShift;
+	} else {
+		for (; inputLen >= WORDSIZE; inputLen -= WORDSIZE) {
+			inWord = *pInWord++;
+			ARCFOUR_NEXT_WORD();
+			*pOutWord++ = inWord ^ streamWord;
+		}
+		if (inputLen == 0) {
+			/* Nothing left to do. */
+			cx->i = tmpi;
+			cx->j = tmpj;
+			return SECSuccess;
+		} else {
+			/* A partial input word remains at the tail.  Load it.  The
+			 * relevant bytes will be consumed in step 3.
+			 */
+			inWord = *pInWord;
+		}
+	}
+	/*****************************************************************/
+	/* Step 3:                                                       */
+	/* A partial word of input remains, and it is already loaded     */
+	/* into nextInWord.  Shift appropriately and consume the bytes   */
+	/* used in the partial word.                                     */
+	/*****************************************************************/
+	mask = streamWord = 0;
+#ifdef IS_LITTLE_ENDIAN
+	for (i = 0; i < inputLen; ++i) {
+#else
+	for (i = WORDSIZE - 1; i >= WORDSIZE - inputLen; --i) {
+#endif
+		ARCFOUR_NEXT_BYTE();
+		streamWord |= (WORD)(cx->S[t]) << 8*i;
+		mask |= MASK1BYTE << 8*i;
+	} /* } */
+	*pOutWord = (*pOutWord & ~mask) | ((inWord ^ streamWord) & mask);
+	cx->i = tmpi;
+	cx->j = tmpj;
+	return SECSuccess;
+}
+#endif
+
+SECStatus 
+RC4_Encrypt(RC4Context *cx, unsigned char *output,
+            unsigned int *outputLen, unsigned int maxOutputLen,
+            const unsigned char *input, unsigned int inputLen)
+{
+	PORT_Assert(maxOutputLen >= inputLen);
+	if (maxOutputLen < inputLen) {
+		PORT_SetError(SEC_ERROR_INVALID_ARGS);
+		return SECFailure;
+	}
+#ifdef CONVERT_TO_WORDS
+	/* Convert the byte-stream to a word-stream */
+	return rc4_wordconv(cx, output, outputLen, maxOutputLen, input, inputLen);
+#else
+	/* Operate on bytes, but unroll the main loop */
+	return rc4_unrolled(cx, output, outputLen, maxOutputLen, input, inputLen);
+#endif
+}
+
+SECStatus RC4_Decrypt(RC4Context *cx, unsigned char *output,
+                      unsigned int *outputLen, unsigned int maxOutputLen,
+                      const unsigned char *input, unsigned int inputLen)
+{
+	PORT_Assert(maxOutputLen >= inputLen);
+	if (maxOutputLen < inputLen) {
+		PORT_SetError(SEC_ERROR_INVALID_ARGS);
+		return SECFailure;
+	}
+	/* decrypt and encrypt are same operation. */
+#ifdef CONVERT_TO_WORDS
+	/* Convert the byte-stream to a word-stream */
+	return rc4_wordconv(cx, output, outputLen, maxOutputLen, input, inputLen);
+#else
+	/* Operate on bytes, but unroll the main loop */
+	return rc4_unrolled(cx, output, outputLen, maxOutputLen, input, inputLen);
+#endif
+}
+
+#undef CONVERT_TO_WORDS
+#undef USE_LONG

mozilla/security/nss/lib/freebl/blapit.h

@@ -0,0 +1,336 @@
+/*
+ * blapit.h - public data structures for the crypto library
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *	Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ *
+ * $Id: blapit.h,v 1.10 2003-03-29 00:18:18 nelsonb%netscape.com Exp $
+ */
+
+#ifndef _BLAPIT_H_
+#define _BLAPIT_H_
+
+#include "seccomon.h"
+#include "prlink.h"
+#include "plarena.h"
+
+
+/* RC2 operation modes */
+#define NSS_RC2			0
+#define NSS_RC2_CBC		1
+
+/* RC5 operation modes */
+#define NSS_RC5                 0
+#define NSS_RC5_CBC             1
+
+/* DES operation modes */
+#define NSS_DES			0
+#define NSS_DES_CBC		1
+#define NSS_DES_EDE3		2
+#define NSS_DES_EDE3_CBC	3
+
+#define DES_KEY_LENGTH		8	/* Bytes */
+
+/* AES operation modes */
+#define NSS_AES                 0
+#define NSS_AES_CBC             1
+
+#define DSA_SIGNATURE_LEN 	40	/* Bytes */
+#define DSA_SUBPRIME_LEN	20	/* Bytes */
+
+/* XXX We shouldn't have to hard code this limit. For
+ * now, this is the quickest way to support ECDSA signature
+ * processing (ECDSA signature lengths depend on curve
+ * size). This limit is sufficient for curves upto
+ * 576 bits.
+ */
+#define MAX_ECKEY_LEN 	        72	/* Bytes */
+
+/*
+ * Number of bytes each hash algorithm produces
+ */
+#define MD2_LENGTH		16	/* Bytes */
+#define MD5_LENGTH		16	/* Bytes */
+#define SHA1_LENGTH		20	/* Bytes */
+#define SHA256_LENGTH 		32 	/* bytes */
+#define SHA384_LENGTH 		48 	/* bytes */
+#define SHA512_LENGTH 		64 	/* bytes */
+#define HASH_LENGTH_MAX         SHA512_LENGTH
+
+/*
+ * Input block size for each hash algorithm.
+ */
+
+#define SHA256_BLOCK_LENGTH 	 64 	/* bytes */
+#define SHA384_BLOCK_LENGTH 	128 	/* bytes */
+#define SHA512_BLOCK_LENGTH 	128 	/* bytes */
+
+#define AES_KEY_WRAP_IV_BYTES    8
+#define AES_KEY_WRAP_BLOCK_SIZE  8  /* bytes */
+#define AES_BLOCK_SIZE          16  /* bytes */
+
+#define NSS_FREEBL_DEFAULT_CHUNKSIZE 2048
+
+/*
+ * The FIPS 186 algorithm for generating primes P and Q allows only 9
+ * distinct values for the length of P, and only one value for the
+ * length of Q.
+ * The algorithm uses a variable j to indicate which of the 9 lengths
+ * of P is to be used.
+ * The following table relates j to the lengths of P and Q in bits.
+ *
+ *	j	bits in P	bits in Q
+ *	_	_________	_________
+ *	0	 512		160
+ *	1	 576		160
+ *	2	 640		160
+ *	3	 704		160
+ *	4	 768		160
+ *	5	 832		160
+ *	6	 896		160
+ *	7	 960		160
+ *	8	1024		160
+ *
+ * The FIPS-186 compliant PQG generator takes j as an input parameter.
+ */
+
+#define DSA_Q_BITS       160
+#define DSA_MAX_P_BITS	1024
+#define DSA_MIN_P_BITS	 512
+
+/*
+ * function takes desired number of bits in P,
+ * returns index (0..8) or -1 if number of bits is invalid.
+ */
+#define PQG_PBITS_TO_INDEX(bits) ((((bits)-512) % 64) ? -1 : (int)((bits)-512)/64)
+
+/*
+ * function takes index (0-8)
+ * returns number of bits in P for that index, or -1 if index is invalid.
+ */
+#define PQG_INDEX_TO_PBITS(j) (((unsigned)(j) > 8) ? -1 : (512 + 64 * (j)))
+
+
+/***************************************************************************
+** Opaque objects 
+*/
+
+struct DESContextStr        ;
+struct RC2ContextStr        ;
+struct RC4ContextStr        ;
+struct RC5ContextStr        ;
+struct AESContextStr        ;
+struct MD2ContextStr        ;
+struct MD5ContextStr        ;
+struct SHA1ContextStr       ;
+struct SHA256ContextStr     ;
+struct SHA512ContextStr     ;
+struct AESKeyWrapContextStr ;
+
+typedef struct DESContextStr        DESContext;
+typedef struct RC2ContextStr        RC2Context;
+typedef struct RC4ContextStr        RC4Context;
+typedef struct RC5ContextStr        RC5Context;
+typedef struct AESContextStr        AESContext;
+typedef struct MD2ContextStr        MD2Context;
+typedef struct MD5ContextStr        MD5Context;
+typedef struct SHA1ContextStr       SHA1Context;
+typedef struct SHA256ContextStr     SHA256Context;
+typedef struct SHA512ContextStr     SHA512Context;
+/* SHA384Context is really a SHA512ContextStr.  This is not a mistake. */
+typedef struct SHA512ContextStr     SHA384Context;
+typedef struct AESKeyWrapContextStr AESKeyWrapContext;
+
+/***************************************************************************
+** RSA Public and Private Key structures
+*/
+
+/* member names from PKCS#1, section 7.1 */
+struct RSAPublicKeyStr {
+    PRArenaPool * arena;
+    SECItem modulus;
+    SECItem publicExponent;
+};
+typedef struct RSAPublicKeyStr RSAPublicKey;
+
+/* member names from PKCS#1, section 7.2 */
+struct RSAPrivateKeyStr {
+    PRArenaPool * arena;
+    SECItem version;
+    SECItem modulus;
+    SECItem publicExponent;
+    SECItem privateExponent;
+    SECItem prime1;
+    SECItem prime2;
+    SECItem exponent1;
+    SECItem exponent2;
+    SECItem coefficient;
+};
+typedef struct RSAPrivateKeyStr RSAPrivateKey;
+
+
+/***************************************************************************
+** DSA Public and Private Key and related structures
+*/
+
+struct PQGParamsStr {
+    PRArenaPool *arena;
+    SECItem prime;    /* p */
+    SECItem subPrime; /* q */
+    SECItem base;     /* g */
+    /* XXX chrisk: this needs to be expanded to hold j and validationParms (RFC2459 7.3.2) */
+};
+typedef struct PQGParamsStr PQGParams;
+
+struct PQGVerifyStr {
+    PRArenaPool * arena;	/* includes this struct, seed, & h. */
+    unsigned int  counter;
+    SECItem       seed;
+    SECItem       h;
+};
+typedef struct PQGVerifyStr PQGVerify;
+
+struct DSAPublicKeyStr {
+    PQGParams params;
+    SECItem publicValue;
+};
+typedef struct DSAPublicKeyStr DSAPublicKey;
+
+struct DSAPrivateKeyStr {
+    PQGParams params;
+    SECItem publicValue;
+    SECItem privateValue;
+};
+typedef struct DSAPrivateKeyStr DSAPrivateKey;
+
+/***************************************************************************
+** Diffie-Hellman Public and Private Key and related structures
+** Structure member names suggested by PKCS#3.
+*/
+
+struct DHParamsStr {
+    PRArenaPool * arena;
+    SECItem prime; /* p */
+    SECItem base; /* g */
+};
+typedef struct DHParamsStr DHParams;
+
+struct DHPublicKeyStr {
+    PRArenaPool * arena;
+    SECItem prime;
+    SECItem base;
+    SECItem publicValue;
+};
+typedef struct DHPublicKeyStr DHPublicKey;
+
+struct DHPrivateKeyStr {
+    PRArenaPool * arena;
+    SECItem prime;
+    SECItem base;
+    SECItem publicValue;
+    SECItem privateValue;
+};
+typedef struct DHPrivateKeyStr DHPrivateKey;
+
+/***************************************************************************
+** Data structures used for elliptic curve parameters and
+** public and private keys.
+*/
+
+/*
+** The ECParams data structures can encode elliptic curve 
+** parameters for both GFp and GF2m curves.
+*/
+
+typedef enum { ec_params_explicit,
+	       ec_params_named
+} ECParamsType;
+
+typedef enum { ec_field_GFp = 1,
+               ec_field_GF2m
+} ECFieldType;
+
+struct ECFieldIDStr {
+    int         size;   /* field size in bits */
+    ECFieldType type;
+    union {
+        SECItem  prime; /* prime p for (GFp) */
+        SECItem  poly;  /* irreducible binary polynomial for (GF2m) */
+    } u;
+    int         k1;     /* first coefficient of pentanomial or
+                         * the only coefficient of trinomial 
+                         */
+    int         k2;     /* two remaining coefficients of pentanomial */
+    int         k3;
+};
+typedef struct ECFieldIDStr ECFieldID;
+
+struct ECCurveStr {
+    SECItem a;          /* contains octet stream encoding of
+                         * field element (X9.62 section 4.3.3) 
+			 */
+    SECItem b;
+    SECItem seed;
+};
+typedef struct ECCurveStr ECCurve;
+
+struct ECParamsStr {
+    PRArenaPool * arena;
+    ECParamsType  type;
+    ECFieldID     fieldID;
+    ECCurve       curve; 
+    SECItem       base;
+    SECItem       order; 
+    int           cofactor;
+    SECItem       DEREncoding;
+};
+typedef struct ECParamsStr ECParams;
+
+struct ECPublicKeyStr {
+    ECParams ecParams;   
+    SECItem publicValue;   /* elliptic curve point encoded as 
+			    * octet stream.
+			    */
+};
+typedef struct ECPublicKeyStr ECPublicKey;
+
+struct ECPrivateKeyStr {
+    ECParams ecParams;   
+    SECItem publicValue;   /* encoded ec point */
+    SECItem privateValue;  /* private big integer */
+};
+typedef struct ECPrivateKeyStr ECPrivateKey;
+
+#endif /* _BLAPIT_H_ */

mozilla/security/nss/lib/freebl/config.mk

@@ -0,0 +1,103 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+# only do this in the outermost freebl build.
+ifndef FREEBL_RECURSIVE_BUILD
+# we only do this stuff for some of the 32-bit builds, no 64-bit builds
+ifndef USE_64
+
+ifeq ($(OS_TARGET), HP-UX)
+  ifneq ($(OS_TEST), ia64)
+    FREEBL_EXTENDED_BUILD = 1
+  endif
+endif
+
+ifeq ($(OS_TARGET),SunOS)
+  ifeq ($(CPU_ARCH),sparc)
+    FREEBL_EXTENDED_BUILD = 1
+  endif
+endif
+
+ifdef FREEBL_EXTENDED_BUILD
+# We're going to change this build so that it builds libfreebl.a with
+# just loader.c.  Then we have to build this directory twice again to 
+# build the two DSOs.
+# To build libfreebl.a with just loader.c, we must now override many
+# of the make variables setup by the prior inclusion of CORECONF's config.mk
+
+CSRCS		= loader.c sysrand.c
+SIMPLE_OBJS 	= $(CSRCS:.c=$(OBJ_SUFFIX))
+OBJS 		= $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(SIMPLE_OBJS))
+ALL_TRASH :=    $(TARGETS) $(OBJS) $(OBJDIR) LOGS TAGS $(GARBAGE) \
+                $(NOSUCHFILE) so_locations 
+endif
+
+#end of 32-bit only stuff.
+endif
+
+# Override the values defined in coreconf's ruleset.mk.
+#
+# - (1) LIBRARY: a static (archival) library
+# - (2) SHARED_LIBRARY: a shared (dynamic link) library
+# - (3) IMPORT_LIBRARY: an import library, used only on Windows
+# - (4) PROGRAM: an executable binary
+#
+# override these variables to prevent building a DSO/DLL.
+  TARGETS        = $(LIBRARY)
+  SHARED_LIBRARY =
+  IMPORT_LIBRARY =
+  PROGRAM        =
+
+else
+# This is a recursive build.  
+
+TARGETS	     = $(SHARED_LIBRARY)
+LIBRARY      =
+PROGRAM      =
+
+#ifeq ($(OS_TARGET), HP-UX)
+  EXTRA_LIBS        += \
+	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
+	$(NULL)
+
+# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+  EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib/ \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	-lc
+#endif
+
+endif

mozilla/security/nss/lib/freebl/des.c

@@ -0,0 +1,683 @@
+/*
+ *  des.c
+ *
+ *  core source file for DES-150 library
+ *  Make key schedule from DES key.
+ *  Encrypt/Decrypt one 8-byte block.
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is the DES-150 library.
+ *
+ * The Initial Developer of the Original Code is Nelson B. Bolyard,
+ * nelsonb@iname.com.  Portions created by Nelson B. Bolyard are 
+ * Copyright (C) 1990, 2000  Nelson B. Bolyard, All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the GPL.
+ */
+
+#include "des.h"
+#include <stddef.h>	/* for ptrdiff_t */
+/* #define USE_INDEXING 1 */
+
+/*
+ * The tables below are the 8 sbox functions, with the 6-bit input permutation 
+ * and the 32-bit output permutation pre-computed.
+ * They are shifted circularly to the left 3 bits, which removes 2 shifts
+ * and an or from each round by reducing the number of sboxes whose
+ * indices cross word broundaries from 2 to 1.  
+ */
+
+static const HALF SP[8][64] = {
+/* Box S1 */ { 
+	0x04041000, 0x00000000, 0x00040000, 0x04041010, 
+	0x04040010, 0x00041010, 0x00000010, 0x00040000, 
+	0x00001000, 0x04041000, 0x04041010, 0x00001000, 
+	0x04001010, 0x04040010, 0x04000000, 0x00000010, 
+	0x00001010, 0x04001000, 0x04001000, 0x00041000, 
+	0x00041000, 0x04040000, 0x04040000, 0x04001010, 
+	0x00040010, 0x04000010, 0x04000010, 0x00040010, 
+	0x00000000, 0x00001010, 0x00041010, 0x04000000, 
+	0x00040000, 0x04041010, 0x00000010, 0x04040000, 
+	0x04041000, 0x04000000, 0x04000000, 0x00001000, 
+	0x04040010, 0x00040000, 0x00041000, 0x04000010, 
+	0x00001000, 0x00000010, 0x04001010, 0x00041010, 
+	0x04041010, 0x00040010, 0x04040000, 0x04001010, 
+	0x04000010, 0x00001010, 0x00041010, 0x04041000, 
+	0x00001010, 0x04001000, 0x04001000, 0x00000000, 
+	0x00040010, 0x00041000, 0x00000000, 0x04040010
+    },
+/* Box S2 */ { 
+	0x00420082, 0x00020002, 0x00020000, 0x00420080, 
+	0x00400000, 0x00000080, 0x00400082, 0x00020082, 
+	0x00000082, 0x00420082, 0x00420002, 0x00000002, 
+	0x00020002, 0x00400000, 0x00000080, 0x00400082, 
+	0x00420000, 0x00400080, 0x00020082, 0x00000000, 
+	0x00000002, 0x00020000, 0x00420080, 0x00400002, 
+	0x00400080, 0x00000082, 0x00000000, 0x00420000, 
+	0x00020080, 0x00420002, 0x00400002, 0x00020080, 
+	0x00000000, 0x00420080, 0x00400082, 0x00400000, 
+	0x00020082, 0x00400002, 0x00420002, 0x00020000, 
+	0x00400002, 0x00020002, 0x00000080, 0x00420082, 
+	0x00420080, 0x00000080, 0x00020000, 0x00000002, 
+	0x00020080, 0x00420002, 0x00400000, 0x00000082, 
+	0x00400080, 0x00020082, 0x00000082, 0x00400080, 
+	0x00420000, 0x00000000, 0x00020002, 0x00020080, 
+	0x00000002, 0x00400082, 0x00420082, 0x00420000 
+    },
+/* Box S3 */ { 
+	0x00000820, 0x20080800, 0x00000000, 0x20080020, 
+	0x20000800, 0x00000000, 0x00080820, 0x20000800, 
+	0x00080020, 0x20000020, 0x20000020, 0x00080000, 
+	0x20080820, 0x00080020, 0x20080000, 0x00000820, 
+	0x20000000, 0x00000020, 0x20080800, 0x00000800, 
+	0x00080800, 0x20080000, 0x20080020, 0x00080820, 
+	0x20000820, 0x00080800, 0x00080000, 0x20000820, 
+	0x00000020, 0x20080820, 0x00000800, 0x20000000, 
+	0x20080800, 0x20000000, 0x00080020, 0x00000820, 
+	0x00080000, 0x20080800, 0x20000800, 0x00000000, 
+	0x00000800, 0x00080020, 0x20080820, 0x20000800, 
+	0x20000020, 0x00000800, 0x00000000, 0x20080020, 
+	0x20000820, 0x00080000, 0x20000000, 0x20080820, 
+	0x00000020, 0x00080820, 0x00080800, 0x20000020, 
+	0x20080000, 0x20000820, 0x00000820, 0x20080000, 
+	0x00080820, 0x00000020, 0x20080020, 0x00080800 
+    },
+/* Box S4 */ { 
+	0x02008004, 0x00008204, 0x00008204, 0x00000200, 
+	0x02008200, 0x02000204, 0x02000004, 0x00008004, 
+	0x00000000, 0x02008000, 0x02008000, 0x02008204, 
+	0x00000204, 0x00000000, 0x02000200, 0x02000004, 
+	0x00000004, 0x00008000, 0x02000000, 0x02008004, 
+	0x00000200, 0x02000000, 0x00008004, 0x00008200, 
+	0x02000204, 0x00000004, 0x00008200, 0x02000200, 
+	0x00008000, 0x02008200, 0x02008204, 0x00000204, 
+	0x02000200, 0x02000004, 0x02008000, 0x02008204, 
+	0x00000204, 0x00000000, 0x00000000, 0x02008000, 
+	0x00008200, 0x02000200, 0x02000204, 0x00000004, 
+	0x02008004, 0x00008204, 0x00008204, 0x00000200, 
+	0x02008204, 0x00000204, 0x00000004, 0x00008000, 
+	0x02000004, 0x00008004, 0x02008200, 0x02000204, 
+	0x00008004, 0x00008200, 0x02000000, 0x02008004, 
+	0x00000200, 0x02000000, 0x00008000, 0x02008200 
+    },
+/* Box S5 */ { 
+	0x00000400, 0x08200400, 0x08200000, 0x08000401, 
+	0x00200000, 0x00000400, 0x00000001, 0x08200000, 
+	0x00200401, 0x00200000, 0x08000400, 0x00200401, 
+	0x08000401, 0x08200001, 0x00200400, 0x00000001, 
+	0x08000000, 0x00200001, 0x00200001, 0x00000000, 
+	0x00000401, 0x08200401, 0x08200401, 0x08000400, 
+	0x08200001, 0x00000401, 0x00000000, 0x08000001, 
+	0x08200400, 0x08000000, 0x08000001, 0x00200400, 
+	0x00200000, 0x08000401, 0x00000400, 0x08000000, 
+	0x00000001, 0x08200000, 0x08000401, 0x00200401, 
+	0x08000400, 0x00000001, 0x08200001, 0x08200400, 
+	0x00200401, 0x00000400, 0x08000000, 0x08200001, 
+	0x08200401, 0x00200400, 0x08000001, 0x08200401, 
+	0x08200000, 0x00000000, 0x00200001, 0x08000001, 
+	0x00200400, 0x08000400, 0x00000401, 0x00200000, 
+	0x00000000, 0x00200001, 0x08200400, 0x00000401
+    },
+/* Box S6 */ { 
+	0x80000040, 0x81000000, 0x00010000, 0x81010040, 
+	0x81000000, 0x00000040, 0x81010040, 0x01000000, 
+	0x80010000, 0x01010040, 0x01000000, 0x80000040, 
+	0x01000040, 0x80010000, 0x80000000, 0x00010040, 
+	0x00000000, 0x01000040, 0x80010040, 0x00010000, 
+	0x01010000, 0x80010040, 0x00000040, 0x81000040, 
+	0x81000040, 0x00000000, 0x01010040, 0x81010000, 
+	0x00010040, 0x01010000, 0x81010000, 0x80000000, 
+	0x80010000, 0x00000040, 0x81000040, 0x01010000, 
+	0x81010040, 0x01000000, 0x00010040, 0x80000040, 
+	0x01000000, 0x80010000, 0x80000000, 0x00010040, 
+	0x80000040, 0x81010040, 0x01010000, 0x81000000, 
+	0x01010040, 0x81010000, 0x00000000, 0x81000040, 
+	0x00000040, 0x00010000, 0x81000000, 0x01010040, 
+	0x00010000, 0x01000040, 0x80010040, 0x00000000, 
+	0x81010000, 0x80000000, 0x01000040, 0x80010040 
+    },
+/* Box S7 */ { 
+	0x00800000, 0x10800008, 0x10002008, 0x00000000, 
+	0x00002000, 0x10002008, 0x00802008, 0x10802000, 
+	0x10802008, 0x00800000, 0x00000000, 0x10000008, 
+	0x00000008, 0x10000000, 0x10800008, 0x00002008, 
+	0x10002000, 0x00802008, 0x00800008, 0x10002000, 
+	0x10000008, 0x10800000, 0x10802000, 0x00800008, 
+	0x10800000, 0x00002000, 0x00002008, 0x10802008, 
+	0x00802000, 0x00000008, 0x10000000, 0x00802000, 
+	0x10000000, 0x00802000, 0x00800000, 0x10002008, 
+	0x10002008, 0x10800008, 0x10800008, 0x00000008, 
+	0x00800008, 0x10000000, 0x10002000, 0x00800000, 
+	0x10802000, 0x00002008, 0x00802008, 0x10802000, 
+	0x00002008, 0x10000008, 0x10802008, 0x10800000, 
+	0x00802000, 0x00000000, 0x00000008, 0x10802008, 
+	0x00000000, 0x00802008, 0x10800000, 0x00002000, 
+	0x10000008, 0x10002000, 0x00002000, 0x00800008 
+    },
+/* Box S8 */ { 
+	0x40004100, 0x00004000, 0x00100000, 0x40104100, 
+	0x40000000, 0x40004100, 0x00000100, 0x40000000, 
+	0x00100100, 0x40100000, 0x40104100, 0x00104000, 
+	0x40104000, 0x00104100, 0x00004000, 0x00000100, 
+	0x40100000, 0x40000100, 0x40004000, 0x00004100, 
+	0x00104000, 0x00100100, 0x40100100, 0x40104000, 
+	0x00004100, 0x00000000, 0x00000000, 0x40100100, 
+	0x40000100, 0x40004000, 0x00104100, 0x00100000, 
+	0x00104100, 0x00100000, 0x40104000, 0x00004000, 
+	0x00000100, 0x40100100, 0x00004000, 0x00104100, 
+	0x40004000, 0x00000100, 0x40000100, 0x40100000, 
+	0x40100100, 0x40000000, 0x00100000, 0x40004100, 
+	0x00000000, 0x40104100, 0x00100100, 0x40000100, 
+	0x40100000, 0x40004000, 0x40004100, 0x00000000, 
+	0x40104100, 0x00104000, 0x00104000, 0x00004100, 
+	0x00004100, 0x00100100, 0x40000000, 0x40104000 
+    }
+};
+
+static const HALF PC2[8][64] = {
+/* table 0 */ {
+    0x00000000, 0x00001000, 0x04000000, 0x04001000, 
+    0x00100000, 0x00101000, 0x04100000, 0x04101000, 
+    0x00008000, 0x00009000, 0x04008000, 0x04009000, 
+    0x00108000, 0x00109000, 0x04108000, 0x04109000, 
+    0x00000004, 0x00001004, 0x04000004, 0x04001004, 
+    0x00100004, 0x00101004, 0x04100004, 0x04101004, 
+    0x00008004, 0x00009004, 0x04008004, 0x04009004, 
+    0x00108004, 0x00109004, 0x04108004, 0x04109004, 
+    0x08000000, 0x08001000, 0x0c000000, 0x0c001000, 
+    0x08100000, 0x08101000, 0x0c100000, 0x0c101000, 
+    0x08008000, 0x08009000, 0x0c008000, 0x0c009000, 
+    0x08108000, 0x08109000, 0x0c108000, 0x0c109000, 
+    0x08000004, 0x08001004, 0x0c000004, 0x0c001004, 
+    0x08100004, 0x08101004, 0x0c100004, 0x0c101004, 
+    0x08008004, 0x08009004, 0x0c008004, 0x0c009004, 
+    0x08108004, 0x08109004, 0x0c108004, 0x0c109004
+  },
+/* table 1 */ {
+    0x00000000, 0x00002000, 0x80000000, 0x80002000, 
+    0x00000008, 0x00002008, 0x80000008, 0x80002008, 
+    0x00200000, 0x00202000, 0x80200000, 0x80202000, 
+    0x00200008, 0x00202008, 0x80200008, 0x80202008, 
+    0x20000000, 0x20002000, 0xa0000000, 0xa0002000, 
+    0x20000008, 0x20002008, 0xa0000008, 0xa0002008, 
+    0x20200000, 0x20202000, 0xa0200000, 0xa0202000, 
+    0x20200008, 0x20202008, 0xa0200008, 0xa0202008, 
+    0x00000400, 0x00002400, 0x80000400, 0x80002400, 
+    0x00000408, 0x00002408, 0x80000408, 0x80002408, 
+    0x00200400, 0x00202400, 0x80200400, 0x80202400, 
+    0x00200408, 0x00202408, 0x80200408, 0x80202408, 
+    0x20000400, 0x20002400, 0xa0000400, 0xa0002400, 
+    0x20000408, 0x20002408, 0xa0000408, 0xa0002408, 
+    0x20200400, 0x20202400, 0xa0200400, 0xa0202400, 
+    0x20200408, 0x20202408, 0xa0200408, 0xa0202408
+  },
+/* table 2 */ {
+    0x00000000, 0x00004000, 0x00000020, 0x00004020, 
+    0x00080000, 0x00084000, 0x00080020, 0x00084020, 
+    0x00000800, 0x00004800, 0x00000820, 0x00004820, 
+    0x00080800, 0x00084800, 0x00080820, 0x00084820, 
+    0x00000010, 0x00004010, 0x00000030, 0x00004030, 
+    0x00080010, 0x00084010, 0x00080030, 0x00084030, 
+    0x00000810, 0x00004810, 0x00000830, 0x00004830, 
+    0x00080810, 0x00084810, 0x00080830, 0x00084830, 
+    0x00400000, 0x00404000, 0x00400020, 0x00404020, 
+    0x00480000, 0x00484000, 0x00480020, 0x00484020, 
+    0x00400800, 0x00404800, 0x00400820, 0x00404820, 
+    0x00480800, 0x00484800, 0x00480820, 0x00484820, 
+    0x00400010, 0x00404010, 0x00400030, 0x00404030, 
+    0x00480010, 0x00484010, 0x00480030, 0x00484030, 
+    0x00400810, 0x00404810, 0x00400830, 0x00404830, 
+    0x00480810, 0x00484810, 0x00480830, 0x00484830 
+  },
+/* table 3 */ {
+    0x00000000, 0x40000000, 0x00000080, 0x40000080, 
+    0x00040000, 0x40040000, 0x00040080, 0x40040080, 
+    0x00000040, 0x40000040, 0x000000c0, 0x400000c0, 
+    0x00040040, 0x40040040, 0x000400c0, 0x400400c0, 
+    0x10000000, 0x50000000, 0x10000080, 0x50000080, 
+    0x10040000, 0x50040000, 0x10040080, 0x50040080, 
+    0x10000040, 0x50000040, 0x100000c0, 0x500000c0, 
+    0x10040040, 0x50040040, 0x100400c0, 0x500400c0, 
+    0x00800000, 0x40800000, 0x00800080, 0x40800080, 
+    0x00840000, 0x40840000, 0x00840080, 0x40840080, 
+    0x00800040, 0x40800040, 0x008000c0, 0x408000c0, 
+    0x00840040, 0x40840040, 0x008400c0, 0x408400c0, 
+    0x10800000, 0x50800000, 0x10800080, 0x50800080, 
+    0x10840000, 0x50840000, 0x10840080, 0x50840080, 
+    0x10800040, 0x50800040, 0x108000c0, 0x508000c0, 
+    0x10840040, 0x50840040, 0x108400c0, 0x508400c0 
+  },
+/* table 4 */ {
+    0x00000000, 0x00000008, 0x08000000, 0x08000008, 
+    0x00040000, 0x00040008, 0x08040000, 0x08040008, 
+    0x00002000, 0x00002008, 0x08002000, 0x08002008, 
+    0x00042000, 0x00042008, 0x08042000, 0x08042008, 
+    0x80000000, 0x80000008, 0x88000000, 0x88000008, 
+    0x80040000, 0x80040008, 0x88040000, 0x88040008, 
+    0x80002000, 0x80002008, 0x88002000, 0x88002008, 
+    0x80042000, 0x80042008, 0x88042000, 0x88042008, 
+    0x00080000, 0x00080008, 0x08080000, 0x08080008, 
+    0x000c0000, 0x000c0008, 0x080c0000, 0x080c0008, 
+    0x00082000, 0x00082008, 0x08082000, 0x08082008, 
+    0x000c2000, 0x000c2008, 0x080c2000, 0x080c2008, 
+    0x80080000, 0x80080008, 0x88080000, 0x88080008, 
+    0x800c0000, 0x800c0008, 0x880c0000, 0x880c0008, 
+    0x80082000, 0x80082008, 0x88082000, 0x88082008, 
+    0x800c2000, 0x800c2008, 0x880c2000, 0x880c2008 
+  },
+/* table 5 */ {
+    0x00000000, 0x00400000, 0x00008000, 0x00408000, 
+    0x40000000, 0x40400000, 0x40008000, 0x40408000, 
+    0x00000020, 0x00400020, 0x00008020, 0x00408020, 
+    0x40000020, 0x40400020, 0x40008020, 0x40408020, 
+    0x00001000, 0x00401000, 0x00009000, 0x00409000, 
+    0x40001000, 0x40401000, 0x40009000, 0x40409000, 
+    0x00001020, 0x00401020, 0x00009020, 0x00409020, 
+    0x40001020, 0x40401020, 0x40009020, 0x40409020, 
+    0x00100000, 0x00500000, 0x00108000, 0x00508000, 
+    0x40100000, 0x40500000, 0x40108000, 0x40508000, 
+    0x00100020, 0x00500020, 0x00108020, 0x00508020, 
+    0x40100020, 0x40500020, 0x40108020, 0x40508020, 
+    0x00101000, 0x00501000, 0x00109000, 0x00509000, 
+    0x40101000, 0x40501000, 0x40109000, 0x40509000, 
+    0x00101020, 0x00501020, 0x00109020, 0x00509020, 
+    0x40101020, 0x40501020, 0x40109020, 0x40509020 
+  },
+/* table 6 */ {
+    0x00000000, 0x00000040, 0x04000000, 0x04000040, 
+    0x00000800, 0x00000840, 0x04000800, 0x04000840, 
+    0x00800000, 0x00800040, 0x04800000, 0x04800040, 
+    0x00800800, 0x00800840, 0x04800800, 0x04800840, 
+    0x10000000, 0x10000040, 0x14000000, 0x14000040, 
+    0x10000800, 0x10000840, 0x14000800, 0x14000840, 
+    0x10800000, 0x10800040, 0x14800000, 0x14800040, 
+    0x10800800, 0x10800840, 0x14800800, 0x14800840, 
+    0x00000080, 0x000000c0, 0x04000080, 0x040000c0, 
+    0x00000880, 0x000008c0, 0x04000880, 0x040008c0, 
+    0x00800080, 0x008000c0, 0x04800080, 0x048000c0, 
+    0x00800880, 0x008008c0, 0x04800880, 0x048008c0, 
+    0x10000080, 0x100000c0, 0x14000080, 0x140000c0, 
+    0x10000880, 0x100008c0, 0x14000880, 0x140008c0, 
+    0x10800080, 0x108000c0, 0x14800080, 0x148000c0, 
+    0x10800880, 0x108008c0, 0x14800880, 0x148008c0 
+  },
+/* table 7 */ {
+    0x00000000, 0x00000010, 0x00000400, 0x00000410, 
+    0x00000004, 0x00000014, 0x00000404, 0x00000414, 
+    0x00004000, 0x00004010, 0x00004400, 0x00004410, 
+    0x00004004, 0x00004014, 0x00004404, 0x00004414, 
+    0x20000000, 0x20000010, 0x20000400, 0x20000410, 
+    0x20000004, 0x20000014, 0x20000404, 0x20000414, 
+    0x20004000, 0x20004010, 0x20004400, 0x20004410, 
+    0x20004004, 0x20004014, 0x20004404, 0x20004414, 
+    0x00200000, 0x00200010, 0x00200400, 0x00200410, 
+    0x00200004, 0x00200014, 0x00200404, 0x00200414, 
+    0x00204000, 0x00204010, 0x00204400, 0x00204410, 
+    0x00204004, 0x00204014, 0x00204404, 0x00204414, 
+    0x20200000, 0x20200010, 0x20200400, 0x20200410, 
+    0x20200004, 0x20200014, 0x20200404, 0x20200414, 
+    0x20204000, 0x20204010, 0x20204400, 0x20204410, 
+    0x20204004, 0x20204014, 0x20204404, 0x20204414 
+  }
+};
+
+/*
+ * The PC-1 Permutation
+ * If we number the bits of the 8 bytes of key input like this (in octal):
+ *     00 01 02 03 04 05 06 07 
+ *     10 11 12 13 14 15 16 17 
+ *     20 21 22 23 24 25 26 27 
+ *     30 31 32 33 34 35 36 37 
+ *     40 41 42 43 44 45 46 47 
+ *     50 51 52 53 54 55 56 57 
+ *     60 61 62 63 64 65 66 67 
+ *     70 71 72 73 74 75 76 77 
+ * then after the PC-1 permutation, 
+ * C0 is
+ *     70 60 50 40 30 20 10 00 
+ *     71 61 51 41 31 21 11 01 
+ *     72 62 52 42 32 22 12 02 
+ *     73 63 53 43 
+ * D0 is
+ *     76 66 56 46 36 26 16 06 
+ *     75 65 55 45 35 25 15 05 
+ *     74 64 54 44 34 24 14 04 
+ *                 33 23 13 03 
+ * and these parity bits have been discarded:
+ *     77 67 57 47 37 27 17 07 
+ * 
+ * We achieve this by flipping the input matrix about the diagonal from 70-07,
+ * getting left = 
+ *     77 67 57 47 37 27 17 07 	(these are the parity bits)
+ *     76 66 56 46 36 26 16 06 
+ *     75 65 55 45 35 25 15 05 
+ *     74 64 54 44 34 24 14 04 
+ * right = 
+ *     73 63 53 43 33 23 13 03 
+ *     72 62 52 42 32 22 12 02 
+ *     71 61 51 41 31 21 11 01 
+ *     70 60 50 40 30 20 10 00 
+ * then byte swap right, ala htonl() on a little endian machine.
+ * right = 
+ *     70 60 50 40 30 20 10 00 
+ *     71 67 57 47 37 27 11 07 
+ *     72 62 52 42 32 22 12 02 
+ *     73 63 53 43 33 23 13 03 
+ * then
+ *     c0 = right >> 4;
+ *     d0 = ((left & 0x00ffffff) << 4) | (right & 0xf);
+*/
+
+#define FLIP_RIGHT_DIAGONAL(word, temp) \
+    temp  = (word ^ (word >> 18)) & 0x00003333; \
+    word ^=  temp | (temp << 18); \
+    temp  = (word ^ (word >> 9)) & 0x00550055; \
+    word ^=  temp | (temp << 9);
+
+#define BYTESWAP(word, temp) \
+    word = (word >> 16) | (word << 16); \
+    temp = 0x00ff00ff; \
+    word = ((word & temp) << 8) | ((word >> 8) & temp); 
+
+#define PC1(left, right, c0, d0, temp) \
+    right ^= temp = ((left >> 4) ^ right) & 0x0f0f0f0f; \
+    left  ^= temp << 4; \
+    FLIP_RIGHT_DIAGONAL(left, temp); \
+    FLIP_RIGHT_DIAGONAL(right, temp); \
+    BYTESWAP(right, temp); \
+    c0 = right >> 4; \
+    d0 = ((left & 0x00ffffff) << 4) | (right & 0xf); 
+
+#define LEFT_SHIFT_1( reg ) (((reg << 1) | (reg >> 27)) & 0x0FFFFFFF)
+#define LEFT_SHIFT_2( reg ) (((reg << 2) | (reg >> 26)) & 0x0FFFFFFF)
+
+/*
+ *   setup key schedules from key
+ */
+
+void 
+DES_MakeSchedule( HALF * ks, const BYTE * key,   DESDirection direction)
+{
+    register HALF left, right;
+    register HALF c0, d0;
+    register HALF temp;
+    int           delta;
+    unsigned int  ls;
+
+#if defined(_X86_)
+    left  = HALFPTR(key)[0]; 
+    right = HALFPTR(key)[1]; 
+    BYTESWAP(left, temp);
+    BYTESWAP(right, temp);
+#else
+    if (((ptrdiff_t)key & 0x03) == 0) {
+	left  = HALFPTR(key)[0]; 
+	right = HALFPTR(key)[1]; 
+#if defined(IS_LITTLE_ENDIAN)
+	BYTESWAP(left, temp);
+	BYTESWAP(right, temp);
+#endif
+    } else {
+	left    = ((HALF)key[0] << 24) | ((HALF)key[1] << 16) | 
+		  ((HALF)key[2] << 8)  | key[3];
+	right   = ((HALF)key[4] << 24) | ((HALF)key[5] << 16) | 
+		  ((HALF)key[6] << 8)  | key[7];
+    }
+#endif
+
+    PC1(left, right, c0, d0, temp);
+
+    if (direction == DES_ENCRYPT) {
+	delta = 2 * (int)sizeof(HALF);
+    } else {
+	ks += 30;
+	delta = (-2) * (int)sizeof(HALF);
+    }
+
+    for (ls = 0x8103; ls; ls >>= 1) {
+	if ( ls & 1 ) {
+	    c0 = LEFT_SHIFT_1( c0 );
+	    d0 = LEFT_SHIFT_1( d0 );
+	} else {
+	    c0 = LEFT_SHIFT_2( c0 );
+	    d0 = LEFT_SHIFT_2( d0 );
+	}
+
+#ifdef USE_INDEXING
+#define PC2LOOKUP(b,c) PC2[b][c]
+
+	left   = PC2LOOKUP(0, ((c0 >> 22) & 0x3F) );
+	left  |= PC2LOOKUP(1, ((c0 >> 13) & 0x3F) );
+	left  |= PC2LOOKUP(2, ((c0 >>  4) & 0x38) | (c0 & 0x7) );
+	left  |= PC2LOOKUP(3, ((c0>>18)&0xC) | ((c0>>11)&0x3) | (c0&0x30));
+
+	right  = PC2LOOKUP(4, ((d0 >> 22) & 0x3F) );
+	right |= PC2LOOKUP(5, ((d0 >> 15) & 0x30) | ((d0 >> 14) & 0xf) );
+	right |= PC2LOOKUP(6, ((d0 >>  7) & 0x3F) );
+	right |= PC2LOOKUP(7, ((d0 >>  1) & 0x3C) | (d0 & 0x3));
+#else
+#define PC2LOOKUP(b,c) *(HALF *)((BYTE *)&PC2[b][0]+(c))
+
+	left   = PC2LOOKUP(0, ((c0 >> 20) & 0xFC) );
+	left  |= PC2LOOKUP(1, ((c0 >> 11) & 0xFC) );
+	left  |= PC2LOOKUP(2, ((c0 >>  2) & 0xE0) | ((c0 <<  2) & 0x1C) );
+	left  |= PC2LOOKUP(3, ((c0>>16)&0x30)|((c0>>9)&0xC)|((c0<<2)&0xC0));
+
+	right  = PC2LOOKUP(4, ((d0 >> 20) & 0xFC) );
+	right |= PC2LOOKUP(5, ((d0 >> 13) & 0xC0) | ((d0 >> 12) & 0x3C) );
+	right |= PC2LOOKUP(6, ((d0 >>  5) & 0xFC) );
+	right |= PC2LOOKUP(7, ((d0 <<  1) & 0xF0) | ((d0 << 2) & 0x0C));
+#endif
+	/* left  contains key bits for S1 S3 S2 S4 */
+	/* right contains key bits for S6 S8 S5 S7 */
+	temp = (left  << 16)        /* S2 S4 XX XX */
+	     | (right >> 16);       /* XX XX S6 S8 */
+	ks[0] = temp;
+
+	temp = (left  & 0xffff0000) /* S1 S3 XX XX */
+	     | (right & 0x0000ffff);/* XX XX S5 S7 */
+	ks[1] = temp;
+
+	ks = (HALF*)((BYTE *)ks + delta);
+    }
+}
+
+/*
+ * The DES Initial Permutation
+ * if we number the bits of the 8 bytes of input like this (in octal):
+ *     00 01 02 03 04 05 06 07 
+ *     10 11 12 13 14 15 16 17 
+ *     20 21 22 23 24 25 26 27 
+ *     30 31 32 33 34 35 36 37 
+ *     40 41 42 43 44 45 46 47 
+ *     50 51 52 53 54 55 56 57 
+ *     60 61 62 63 64 65 66 67 
+ *     70 71 72 73 74 75 76 77 
+ * then after the initial permutation, they will be in this order. 
+ *     71 61 51 41 31 21 11 01 
+ *     73 63 53 43 33 23 13 03 
+ *     75 65 55 45 35 25 15 05 
+ *     77 67 57 47 37 27 17 07 
+ *     70 60 50 40 30 20 10 00 
+ *     72 62 52 42 32 22 12 02 
+ *     74 64 54 44 34 24 14 04 
+ *     76 66 56 46 36 26 16 06 
+ *
+ * One way to do this is in two steps:
+ * 1. Flip this matrix about the diagonal from 70-07 as done for PC1.
+ * 2. Rearrange the bytes (rows in the matrix above) with the following code.
+ *
+ * #define swapHiLo(word, temp) \
+ *   temp  = (word ^ (word >> 24)) & 0x000000ff; \
+ *   word ^=  temp | (temp << 24); 
+ *
+ *   right ^= temp = ((left << 8) ^ right) & 0xff00ff00; 
+ *   left  ^= temp >> 8; 
+ *   swapHiLo(left, temp);
+ *   swapHiLo(right,temp);
+ *
+ * However, the two steps can be combined, so that the rows are rearranged
+ * while the matrix is being flipped, reducing the number of bit exchange
+ * operations from 8 ot 5.  
+ *
+ * Initial Permutation */
+#define IP(left, right, temp) \
+    right ^= temp = ((left >> 4) ^  right) & 0x0f0f0f0f; \
+    left  ^= temp << 4; \
+    right ^= temp = ((left >> 16) ^ right) & 0x0000ffff; \
+    left  ^= temp << 16; \
+    right ^= temp = ((left << 2) ^ right) & 0xcccccccc; \
+    left  ^= temp >> 2; \
+    right ^= temp = ((left << 8) ^ right) & 0xff00ff00; \
+    left  ^= temp >> 8; \
+    right ^= temp = ((left >> 1) ^ right) & 0x55555555; \
+    left  ^= temp << 1; 
+
+/* The Final (Inverse Initial) permutation is done by reversing the 
+** steps of the Initital Permutation 
+*/
+
+#define FP(left, right, temp) \
+    right ^= temp = ((left >> 1) ^ right) & 0x55555555; \
+    left  ^= temp << 1; \
+    right ^= temp = ((left << 8) ^ right) & 0xff00ff00; \
+    left  ^= temp >> 8; \
+    right ^= temp = ((left << 2) ^ right) & 0xcccccccc; \
+    left  ^= temp >> 2; \
+    right ^= temp = ((left >> 16) ^ right) & 0x0000ffff; \
+    left  ^= temp << 16; \
+    right ^= temp = ((left >> 4) ^  right) & 0x0f0f0f0f; \
+    left  ^= temp << 4; 
+
+void 
+DES_Do1Block(HALF * ks, const BYTE * inbuf, BYTE * outbuf)
+{
+    register HALF left, right;
+    register HALF temp;
+
+#if defined(_X86_)
+    left  = HALFPTR(inbuf)[0]; 
+    right = HALFPTR(inbuf)[1]; 
+    BYTESWAP(left, temp);
+    BYTESWAP(right, temp);
+#else
+    if (((ptrdiff_t)inbuf & 0x03) == 0) {
+	left  = HALFPTR(inbuf)[0]; 
+	right = HALFPTR(inbuf)[1]; 
+#if defined(IS_LITTLE_ENDIAN)
+	BYTESWAP(left, temp);
+	BYTESWAP(right, temp);
+#endif
+    } else {
+	left    = ((HALF)inbuf[0] << 24) | ((HALF)inbuf[1] << 16) | 
+		  ((HALF)inbuf[2] << 8)  | inbuf[3];
+	right   = ((HALF)inbuf[4] << 24) | ((HALF)inbuf[5] << 16) | 
+		  ((HALF)inbuf[6] << 8)  | inbuf[7];
+    }
+#endif
+
+    IP(left, right, temp);
+
+    /* shift the values left circularly 3 bits. */
+    left  = (left  << 3) | (left  >> 29);
+    right = (right << 3) | (right >> 29);
+
+#ifdef USE_INDEXING
+#define KSLOOKUP(s,b) SP[s][((temp >> (b+2)) & 0x3f)]
+#else
+#define KSLOOKUP(s,b) *(HALF*)((BYTE*)&SP[s][0]+((temp >> b) & 0xFC))
+#endif
+#define ROUND(out, in, r) \
+    temp  = in ^ ks[2*r]; \
+    out ^= KSLOOKUP( 1,  24 ); \
+    out ^= KSLOOKUP( 3,  16 ); \
+    out ^= KSLOOKUP( 5,   8 ); \
+    out ^= KSLOOKUP( 7,   0 ); \
+    temp  = ((in >> 4) | (in << 28)) ^ ks[2*r+1]; \
+    out ^= KSLOOKUP( 0,  24 ); \
+    out ^= KSLOOKUP( 2,  16 ); \
+    out ^= KSLOOKUP( 4,   8 ); \
+    out ^= KSLOOKUP( 6,   0 ); 
+
+    /* Do the 16 Feistel rounds */
+    ROUND(left, right, 0)
+    ROUND(right, left, 1)
+    ROUND(left, right, 2)
+    ROUND(right, left, 3)
+    ROUND(left, right, 4)
+    ROUND(right, left, 5)
+    ROUND(left, right, 6)
+    ROUND(right, left, 7)
+    ROUND(left, right, 8)
+    ROUND(right, left, 9)
+    ROUND(left, right, 10)
+    ROUND(right, left, 11)
+    ROUND(left, right, 12)
+    ROUND(right, left, 13)
+    ROUND(left, right, 14)
+    ROUND(right, left, 15)
+
+    /* now shift circularly right 3 bits to undo the shifting done 
+    ** above.  switch left and right here. 
+    */
+    temp  = (left >> 3) | (left << 29); 
+    left  = (right >> 3) | (right << 29); 
+    right = temp;
+
+    FP(left, right, temp);
+
+#if defined(_X86_)
+    BYTESWAP(left, temp);
+    BYTESWAP(right, temp);
+    HALFPTR(outbuf)[0]  = left; 
+    HALFPTR(outbuf)[1]  = right; 
+#else
+    if (((ptrdiff_t)inbuf & 0x03) == 0) {
+#if defined(IS_LITTLE_ENDIAN)
+	BYTESWAP(left, temp);
+	BYTESWAP(right, temp);
+#endif
+	HALFPTR(outbuf)[0]  = left; 
+	HALFPTR(outbuf)[1]  = right; 
+    } else {
+	outbuf[0] = (BYTE)(left >> 24);
+	outbuf[1] = (BYTE)(left >> 16);
+	outbuf[2] = (BYTE)(left >>  8);
+	outbuf[3] = (BYTE)(left      );
+
+	outbuf[4] = (BYTE)(right >> 24);
+	outbuf[5] = (BYTE)(right >> 16);
+	outbuf[6] = (BYTE)(right >>  8);
+	outbuf[7] = (BYTE)(right      );
+    }
+#endif
+
+}
+
+/* Ackowledgements:
+** Two ideas used in this implementation were shown to me by Dennis Ferguson 
+** in 1990.  He credits them to Richard Outerbridge and Dan Hoey.  They were:
+** 1. The method of computing the Initial and Final permutations.
+** 2. Circularly rotating the SP tables and the initial values of left and 
+**	right to reduce the number of shifts required during the 16 rounds.
+*/

mozilla/security/nss/lib/freebl/des.h

@@ -0,0 +1,69 @@
+/*
+ *  des.h
+ *
+ *  header file for DES-150 library
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is the DES-150 library.
+ *
+ * The Initial Developer of the Original Code is Nelson B. Bolyard,
+ * nelsonb@iname.com.  Portions created by Nelson B. Bolyard are 
+ * Copyright (C) 1990, 2000  Nelson B. Bolyard, All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the GPL.
+ */
+
+#ifndef _DES_H_
+#define _DES_H_ 1
+
+#include "blapi.h"
+
+typedef unsigned char BYTE;
+typedef unsigned int  HALF;
+
+#define HALFPTR(x) ((HALF *)(x))
+#define SHORTPTR(x) ((unsigned short *)(x))
+#define BYTEPTR(x) ((BYTE *)(x))
+
+typedef enum {
+    DES_ENCRYPT = 0x5555,
+    DES_DECRYPT = 0xAAAA
+} DESDirection;
+
+typedef void DESFunc(struct DESContextStr *cx, BYTE *out, const BYTE *in, 
+                     unsigned int len);
+
+struct DESContextStr {
+    /* key schedule, 16 internal keys, each with 8 6-bit parts */
+    HALF ks0 [32];
+    HALF ks1 [32];
+    HALF ks2 [32];
+    HALF iv  [2];
+    DESDirection direction;
+    DESFunc  *worker;
+};
+
+void DES_MakeSchedule( HALF * ks, const BYTE * key,   DESDirection direction);
+void DES_Do1Block(     HALF * ks, const BYTE * inbuf, BYTE * outbuf);
+
+#endif

mozilla/security/nss/lib/freebl/desblapi.c

@@ -0,0 +1,275 @@
+/*
+ *  desblapi.c
+ *
+ *  core source file for DES-150 library
+ *  Implement DES Modes of Operation and Triple-DES.
+ *  Adapt DES-150 to blapi API.
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is the DES-150 library.
+ *
+ * The Initial Developer of the Original Code is Nelson B. Bolyard,
+ * nelsonb@iname.com.  Portions created by Nelson B. Bolyard are 
+ * Copyright (C) 1990, 2000  Nelson B. Bolyard, All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the GPL.
+ */
+
+#include "des.h"
+#include <stddef.h>
+#include "secerr.h"
+
+#if defined(_X86_)
+/* Intel X86 CPUs do unaligned loads and stores without complaint. */
+#define COPY8B(to, from, ptr) \
+    	HALFPTR(to)[0] = HALFPTR(from)[0]; \
+    	HALFPTR(to)[1] = HALFPTR(from)[1]; 
+#elif defined(USE_MEMCPY)
+#define COPY8B(to, from, ptr) memcpy(to, from, 8)
+#else
+#define COPY8B(to, from, ptr) \
+    if (((ptrdiff_t)(ptr) & 0x3) == 0) { \
+    	HALFPTR(to)[0] = HALFPTR(from)[0]; \
+    	HALFPTR(to)[1] = HALFPTR(from)[1]; \
+    } else if (((ptrdiff_t)(ptr) & 0x1) == 0) { \
+    	SHORTPTR(to)[0] = SHORTPTR(from)[0]; \
+    	SHORTPTR(to)[1] = SHORTPTR(from)[1]; \
+    	SHORTPTR(to)[2] = SHORTPTR(from)[2]; \
+    	SHORTPTR(to)[3] = SHORTPTR(from)[3]; \
+    } else { \
+    	BYTEPTR(to)[0] = BYTEPTR(from)[0]; \
+    	BYTEPTR(to)[1] = BYTEPTR(from)[1]; \
+    	BYTEPTR(to)[2] = BYTEPTR(from)[2]; \
+    	BYTEPTR(to)[3] = BYTEPTR(from)[3]; \
+    	BYTEPTR(to)[4] = BYTEPTR(from)[4]; \
+    	BYTEPTR(to)[5] = BYTEPTR(from)[5]; \
+    	BYTEPTR(to)[6] = BYTEPTR(from)[6]; \
+    	BYTEPTR(to)[7] = BYTEPTR(from)[7]; \
+    } 
+#endif
+#define COPY8BTOHALF(to, from) COPY8B(to, from, from)
+#define COPY8BFROMHALF(to, from) COPY8B(to, from, to)
+
+static void 
+DES_ECB(DESContext *cx, BYTE *out, const BYTE *in, unsigned int len)
+{
+    while (len) {
+	DES_Do1Block(cx->ks0, in, out);
+	len -= 8;
+	in  += 8;
+	out += 8;
+    }
+}
+
+static void 
+DES_EDE3_ECB(DESContext *cx, BYTE *out, const BYTE *in, unsigned int len)
+{
+    while (len) {
+	DES_Do1Block(cx->ks0,  in, out);
+	len -= 8;
+	in  += 8;
+	DES_Do1Block(cx->ks1, out, out);
+	DES_Do1Block(cx->ks2, out, out);
+	out += 8;
+    }
+}
+
+static void 
+DES_CBCEn(DESContext *cx, BYTE *out, const BYTE *in, unsigned int len)
+{
+    const BYTE * bufend = in + len;
+    HALF  vec[2];
+
+    while (in != bufend) {
+	COPY8BTOHALF(vec, in);
+	in += 8;
+	vec[0] ^= cx->iv[0];
+	vec[1] ^= cx->iv[1];
+	DES_Do1Block( cx->ks0, (BYTE *)vec, (BYTE *)cx->iv);
+	COPY8BFROMHALF(out, cx->iv);
+	out += 8;
+    }
+}
+
+static void 
+DES_CBCDe(DESContext *cx, BYTE *out, const BYTE *in, unsigned int len)
+{
+    const BYTE * bufend;
+    HALF oldciphertext[2];
+    HALF plaintext    [2];
+
+    for (bufend = in + len; in != bufend; ) {
+	oldciphertext[0] = cx->iv[0];
+	oldciphertext[1] = cx->iv[1];
+	COPY8BTOHALF(cx->iv, in);
+	in += 8;
+	DES_Do1Block(cx->ks0, (BYTE *)cx->iv, (BYTE *)plaintext);
+	plaintext[0] ^= oldciphertext[0];
+	plaintext[1] ^= oldciphertext[1];
+	COPY8BFROMHALF(out, plaintext);
+	out += 8;
+    }
+}
+
+static void 
+DES_EDE3CBCEn(DESContext *cx, BYTE *out, const BYTE *in, unsigned int len)
+{
+    const BYTE * bufend = in + len;
+    HALF  vec[2];
+
+    while (in != bufend) {
+	COPY8BTOHALF(vec, in);
+	in += 8;
+	vec[0] ^= cx->iv[0];
+	vec[1] ^= cx->iv[1];
+	DES_Do1Block( cx->ks0, (BYTE *)vec,    (BYTE *)cx->iv);
+	DES_Do1Block( cx->ks1, (BYTE *)cx->iv, (BYTE *)cx->iv);
+	DES_Do1Block( cx->ks2, (BYTE *)cx->iv, (BYTE *)cx->iv);
+	COPY8BFROMHALF(out, cx->iv);
+	out += 8;
+    }
+}
+
+static void 
+DES_EDE3CBCDe(DESContext *cx, BYTE *out, const BYTE *in, unsigned int len)
+{
+    const BYTE * bufend;
+    HALF oldciphertext[2];
+    HALF plaintext    [2];
+
+    for (bufend = in + len; in != bufend; ) {
+	oldciphertext[0] = cx->iv[0];
+	oldciphertext[1] = cx->iv[1];
+	COPY8BTOHALF(cx->iv, in);
+	in += 8;
+	DES_Do1Block(cx->ks0, (BYTE *)cx->iv,    (BYTE *)plaintext);
+	DES_Do1Block(cx->ks1, (BYTE *)plaintext, (BYTE *)plaintext);
+	DES_Do1Block(cx->ks2, (BYTE *)plaintext, (BYTE *)plaintext);
+	plaintext[0] ^= oldciphertext[0];
+	plaintext[1] ^= oldciphertext[1];
+	COPY8BFROMHALF(out, plaintext);
+	out += 8;
+    }
+}
+
+DESContext *
+DES_CreateContext(const BYTE * key, const BYTE *iv, int mode, PRBool encrypt)
+{
+    DESContext *cx = PORT_ZNew(DESContext);
+    DESDirection opposite;
+    if (!cx) 
+    	return 0;
+    cx->direction = encrypt ? DES_ENCRYPT : DES_DECRYPT;
+    opposite      = encrypt ? DES_DECRYPT : DES_ENCRYPT;
+    switch (mode) {
+    case NSS_DES:	/* DES ECB */
+	DES_MakeSchedule( cx->ks0, key, cx->direction);
+	cx->worker = &DES_ECB;
+	break;
+
+    case NSS_DES_EDE3:	/* DES EDE ECB */
+	cx->worker = &DES_EDE3_ECB;
+	if (encrypt) {
+	    DES_MakeSchedule(cx->ks0, key,      cx->direction);
+	    DES_MakeSchedule(cx->ks1, key +  8, opposite);
+	    DES_MakeSchedule(cx->ks2, key + 16, cx->direction);
+	} else {
+	    DES_MakeSchedule(cx->ks2, key,      cx->direction);
+	    DES_MakeSchedule(cx->ks1, key +  8, opposite);
+	    DES_MakeSchedule(cx->ks0, key + 16, cx->direction);
+	}
+	break;
+
+    case NSS_DES_CBC:	/* DES CBC */
+	COPY8BTOHALF(cx->iv, iv);
+	cx->worker = encrypt ? &DES_CBCEn : &DES_CBCDe;
+	DES_MakeSchedule(cx->ks0, key, cx->direction);
+	break;
+
+    case NSS_DES_EDE3_CBC:	/* DES EDE CBC */
+	COPY8BTOHALF(cx->iv, iv);
+	if (encrypt) {
+	    cx->worker = &DES_EDE3CBCEn;
+	    DES_MakeSchedule(cx->ks0, key,      cx->direction);
+	    DES_MakeSchedule(cx->ks1, key +  8, opposite);
+	    DES_MakeSchedule(cx->ks2, key + 16, cx->direction);
+	} else {
+	    cx->worker = &DES_EDE3CBCDe;
+	    DES_MakeSchedule(cx->ks2, key,      cx->direction);
+	    DES_MakeSchedule(cx->ks1, key +  8, opposite);
+	    DES_MakeSchedule(cx->ks0, key + 16, cx->direction);
+	}
+	break;
+
+    default:
+    	PORT_Free(cx);
+	cx = 0;
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	break;
+    }
+    return cx;
+}
+
+void
+DES_DestroyContext(DESContext *cx, PRBool freeit)
+{
+    if (cx) {
+    	memset(cx, 0, sizeof *cx);
+	if (freeit)
+	    PORT_Free(cx);
+    }
+}
+
+SECStatus
+DES_Encrypt(DESContext *cx, BYTE *out, unsigned int *outLen,
+            unsigned int maxOutLen, const BYTE *in, unsigned int inLen)
+{
+
+    if (inLen < 0 || (inLen % 8) != 0 || maxOutLen < inLen || !cx || 
+        cx->direction != DES_ENCRYPT) {
+    	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+
+    cx->worker(cx, out, in, inLen);
+    if (outLen)
+	*outLen = inLen;
+    return SECSuccess;
+}
+
+SECStatus
+DES_Decrypt(DESContext *cx, BYTE *out, unsigned int *outLen,
+            unsigned int maxOutLen, const BYTE *in, unsigned int inLen)
+{
+
+    if (inLen < 0 || (inLen % 8) != 0 || maxOutLen < inLen || !cx || 
+        cx->direction != DES_DECRYPT) {
+    	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+
+    cx->worker(cx, out, in, inLen);
+    if (outLen)
+	*outLen = inLen;
+    return SECSuccess;
+}

mozilla/security/nss/lib/freebl/dh.c

@@ -0,0 +1,385 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.	Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.	If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+/*
+ * Diffie-Hellman parameter generation, key generation, and secret derivation.
+ * KEA secret generation and verification.
+ *
+ * $Id: dh.c,v 1.6 2001-09-20 22:14:06 relyea%netscape.com Exp $
+ */
+
+#include "prerr.h"
+#include "secerr.h"
+
+#include "blapi.h"
+#include "secitem.h"
+#include "mpi.h"
+#include "mpprime.h"
+#include "secmpi.h"
+
+#define DH_SECRET_KEY_LEN      20
+#define KEA_DERIVED_SECRET_LEN 128
+
+SECStatus 
+DH_GenParam(int primeLen, DHParams **params)
+{
+    PRArenaPool *arena;
+    DHParams *dhparams;
+    unsigned char *pb = NULL;
+    unsigned char *ab = NULL;
+    unsigned long counter = 0;
+    mp_int p, q, a, h, psub1, test;
+    mp_err err = MP_OKAY;
+    SECStatus rv = SECSuccess;
+    if (!params || primeLen < 0) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE);
+    if (!arena) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	return SECFailure;
+    }
+    dhparams = (DHParams *)PORT_ArenaZAlloc(arena, sizeof(DHParams));
+    if (!dhparams) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	PORT_FreeArena(arena, PR_TRUE);
+	return SECFailure;
+    }
+    dhparams->arena = arena;
+    MP_DIGITS(&p) = 0;
+    MP_DIGITS(&q) = 0;
+    MP_DIGITS(&a) = 0;
+    MP_DIGITS(&h) = 0;
+    MP_DIGITS(&psub1) = 0;
+    MP_DIGITS(&test) = 0;
+    CHECK_MPI_OK( mp_init(&p) );
+    CHECK_MPI_OK( mp_init(&q) );
+    CHECK_MPI_OK( mp_init(&a) );
+    CHECK_MPI_OK( mp_init(&h) );
+    CHECK_MPI_OK( mp_init(&psub1) );
+    CHECK_MPI_OK( mp_init(&test) );
+    /* generate prime with MPI, uses Miller-Rabin to generate strong prime. */
+    pb = PORT_Alloc(primeLen);
+    CHECK_SEC_OK( RNG_GenerateGlobalRandomBytes(pb, primeLen) );
+    pb[0]          |= 0x80; /* set high-order bit */
+    pb[primeLen-1] |= 0x01; /* set low-order bit  */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&p, pb, primeLen) );
+    CHECK_MPI_OK( mpp_make_prime(&p, primeLen * 8, PR_TRUE, &counter) );
+    /* construct Sophie-Germain prime q = (p-1)/2. */
+    CHECK_MPI_OK( mp_sub_d(&p, 1, &psub1) );
+    CHECK_MPI_OK( mp_div_2(&psub1, &q)    );
+    /* construct a generator from the prime. */
+    ab = PORT_Alloc(primeLen);
+    /* generate a candidate number a in p's field */
+    CHECK_SEC_OK( RNG_GenerateGlobalRandomBytes(ab, primeLen) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&a, ab, primeLen) );
+    /* force a < p (note that quot(a/p) <= 1) */
+    if ( mp_cmp(&a, &p) > 0 )
+	CHECK_MPI_OK( mp_sub(&a, &p, &a) );
+    do {
+	/* check that a is in the range [2..p-1] */
+	if ( mp_cmp_d(&a, 2) < 0 || mp_cmp(&a, &psub1) >= 0) {
+	    /* a is outside of the allowed range.  Set a=3 and keep going. */
+            mp_set(&a, 3);
+	}
+	/* if a**q mod p != 1 then a is a generator */
+	CHECK_MPI_OK( mp_exptmod(&a, &q, &p, &test) );
+	if ( mp_cmp_d(&test, 1) != 0 )
+	    break;
+	/* increment the candidate and try again. */
+	CHECK_MPI_OK( mp_add_d(&a, 1, &a) );
+    } while (PR_TRUE);
+    MPINT_TO_SECITEM(&p, &dhparams->prime, arena);
+    MPINT_TO_SECITEM(&a, &dhparams->base, arena);
+    *params = dhparams;
+cleanup:
+    mp_clear(&p);
+    mp_clear(&q);
+    mp_clear(&a);
+    mp_clear(&h);
+    mp_clear(&psub1);
+    mp_clear(&test);
+    if (pb) PORT_ZFree(pb, primeLen);
+    if (ab) PORT_ZFree(ab, primeLen);
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
+    }
+    if (rv)
+	PORT_FreeArena(arena, PR_TRUE);
+    return rv;
+}
+
+SECStatus 
+DH_NewKey(DHParams *params, DHPrivateKey **privKey)
+{
+    PRArenaPool *arena;
+    DHPrivateKey *key;
+    mp_int g, xa, p, Ya;
+    mp_err   err = MP_OKAY;
+    SECStatus rv = SECSuccess;
+    if (!params || !privKey) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE);
+    if (!arena) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	return SECFailure;
+    }
+    key = (DHPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(DHPrivateKey));
+    if (!key) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	PORT_FreeArena(arena, PR_TRUE);
+	return SECFailure;
+    }
+    key->arena = arena;
+    MP_DIGITS(&g)  = 0;
+    MP_DIGITS(&xa) = 0;
+    MP_DIGITS(&p)  = 0;
+    MP_DIGITS(&Ya) = 0;
+    CHECK_MPI_OK( mp_init(&g)  );
+    CHECK_MPI_OK( mp_init(&xa) );
+    CHECK_MPI_OK( mp_init(&p)  );
+    CHECK_MPI_OK( mp_init(&Ya) );
+    /* Set private key's p */
+    CHECK_SEC_OK( SECITEM_CopyItem(arena, &key->prime, &params->prime) );
+    SECITEM_TO_MPINT(key->prime, &p);
+    /* Set private key's g */
+    CHECK_SEC_OK( SECITEM_CopyItem(arena, &key->base, &params->base) );
+    SECITEM_TO_MPINT(key->base, &g);
+    /* Generate private key xa */
+    SECITEM_AllocItem(arena, &key->privateValue, DH_SECRET_KEY_LEN);
+    RNG_GenerateGlobalRandomBytes(key->privateValue.data, 
+                                  key->privateValue.len);
+    SECITEM_TO_MPINT( key->privateValue, &xa );
+    /* xa < p */
+    CHECK_MPI_OK( mp_mod(&xa, &p, &xa) );
+    /* Compute public key Ya = g ** xa mod p */
+    CHECK_MPI_OK( mp_exptmod(&g, &xa, &p, &Ya) );
+    MPINT_TO_SECITEM(&Ya, &key->publicValue, key->arena);
+    *privKey = key;
+cleanup:
+    mp_clear(&g);
+    mp_clear(&xa);
+    mp_clear(&p);
+    mp_clear(&Ya);
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
+    }
+    if (rv)
+	PORT_FreeArena(arena, PR_TRUE);
+    return rv;
+}
+
+SECStatus 
+DH_Derive(SECItem *publicValue, 
+          SECItem *prime, 
+          SECItem *privateValue, 
+          SECItem *derivedSecret, 
+          unsigned int maxOutBytes)
+{
+    mp_int p, Xa, Yb, ZZ;
+    mp_err err = MP_OKAY;
+    unsigned int len = 0, nb;
+    unsigned char *secret = NULL;
+    if (!publicValue || !prime || !privateValue || !derivedSecret) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    memset(derivedSecret, 0, sizeof *derivedSecret);
+    MP_DIGITS(&p)  = 0;
+    MP_DIGITS(&Xa) = 0;
+    MP_DIGITS(&Yb) = 0;
+    MP_DIGITS(&ZZ) = 0;
+    CHECK_MPI_OK( mp_init(&p)  );
+    CHECK_MPI_OK( mp_init(&Xa) );
+    CHECK_MPI_OK( mp_init(&Yb) );
+    CHECK_MPI_OK( mp_init(&ZZ) );
+    SECITEM_TO_MPINT(*publicValue,  &Yb);
+    SECITEM_TO_MPINT(*privateValue, &Xa);
+    SECITEM_TO_MPINT(*prime,        &p);
+    /* ZZ = (Yb)**Xa mod p */
+    CHECK_MPI_OK( mp_exptmod(&Yb, &Xa, &p, &ZZ) );
+    /* number of bytes in the derived secret */
+    len = mp_unsigned_octet_size(&ZZ);
+    /* allocate a buffer which can hold the entire derived secret. */
+    secret = PORT_Alloc(len);
+    /* grab the derived secret */
+    err = mp_to_unsigned_octets(&ZZ, secret, len);
+    if (err >= 0) err = MP_OKAY;
+    /* Take minimum of bytes requested and bytes in derived secret,
+    ** if maxOutBytes is 0 take all of the bytes from the derived secret.
+    */
+    if (maxOutBytes > 0)
+	nb = PR_MIN(len, maxOutBytes);
+    else
+	nb = len;
+    SECITEM_AllocItem(NULL, derivedSecret, nb);
+    memcpy(derivedSecret->data, secret, nb);
+cleanup:
+    mp_clear(&p);
+    mp_clear(&Xa);
+    mp_clear(&Yb);
+    mp_clear(&ZZ);
+    if (secret) {
+	/* free the buffer allocated for the full secret. */
+	PORT_ZFree(secret, len);
+    }
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	if (derivedSecret->data) 
+	    PORT_ZFree(derivedSecret->data, derivedSecret->len);
+	return SECFailure;
+    }
+    return SECSuccess;
+}
+
+SECStatus 
+KEA_Derive(SECItem *prime, 
+           SECItem *public1, 
+           SECItem *public2, 
+           SECItem *private1, 
+           SECItem *private2,
+           SECItem *derivedSecret)
+{
+    mp_int p, Y, R, r, x, t, u, w;
+    mp_err err;
+    unsigned char *secret = NULL;
+    unsigned int len = 0, offset;
+    if (!prime || !public1 || !public2 || !private1 || !private2 ||
+        !derivedSecret) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    memset(derivedSecret, 0, sizeof *derivedSecret);
+    MP_DIGITS(&p) = 0;
+    MP_DIGITS(&Y) = 0;
+    MP_DIGITS(&R) = 0;
+    MP_DIGITS(&r) = 0;
+    MP_DIGITS(&x) = 0;
+    MP_DIGITS(&t) = 0;
+    MP_DIGITS(&u) = 0;
+    MP_DIGITS(&w) = 0;
+    CHECK_MPI_OK( mp_init(&p) );
+    CHECK_MPI_OK( mp_init(&Y) );
+    CHECK_MPI_OK( mp_init(&R) );
+    CHECK_MPI_OK( mp_init(&r) );
+    CHECK_MPI_OK( mp_init(&x) );
+    CHECK_MPI_OK( mp_init(&t) );
+    CHECK_MPI_OK( mp_init(&u) );
+    CHECK_MPI_OK( mp_init(&w) );
+    SECITEM_TO_MPINT(*prime,    &p);
+    SECITEM_TO_MPINT(*public1,  &Y);
+    SECITEM_TO_MPINT(*public2,  &R);
+    SECITEM_TO_MPINT(*private1, &r);
+    SECITEM_TO_MPINT(*private2, &x);
+    /* t = DH(Y, r, p) = Y ** r mod p */
+    CHECK_MPI_OK( mp_exptmod(&Y, &r, &p, &t) );
+    /* u = DH(R, x, p) = R ** x mod p */
+    CHECK_MPI_OK( mp_exptmod(&R, &x, &p, &u) );
+    /* w = (t + u) mod p */
+    CHECK_MPI_OK( mp_addmod(&t, &u, &p, &w) );
+    /* allocate a buffer for the full derived secret */
+    len = mp_unsigned_octet_size(&w);
+    secret = PORT_Alloc(len);
+    /* grab the secret */
+    err = mp_to_unsigned_octets(&w, secret, len);
+    if (err > 0) err = MP_OKAY;
+    /* allocate output buffer */
+    SECITEM_AllocItem(NULL, derivedSecret, KEA_DERIVED_SECRET_LEN);
+    memset(derivedSecret->data, 0, derivedSecret->len);
+    /* copy in the 128 lsb of the secret */
+    if (len >= KEA_DERIVED_SECRET_LEN) {
+	memcpy(derivedSecret->data, secret + (len - KEA_DERIVED_SECRET_LEN),
+	       KEA_DERIVED_SECRET_LEN);
+    } else {
+	offset = KEA_DERIVED_SECRET_LEN - len;
+	memcpy(derivedSecret->data + offset, secret, len);
+    }
+cleanup:
+    mp_clear(&p);
+    mp_clear(&Y);
+    mp_clear(&R);
+    mp_clear(&r);
+    mp_clear(&x);
+    mp_clear(&t);
+    mp_clear(&u);
+    mp_clear(&w);
+    if (secret)
+	PORT_ZFree(secret, len);
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	return SECFailure;
+    }
+    return SECSuccess;
+}
+
+PRBool 
+KEA_Verify(SECItem *Y, SECItem *prime, SECItem *subPrime)
+{
+    mp_int p, q, y, r;
+    mp_err err;
+    int cmp = 1;  /* default is false */
+    if (!Y || !prime || !subPrime) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    MP_DIGITS(&p) = 0;
+    MP_DIGITS(&q) = 0;
+    MP_DIGITS(&y) = 0;
+    MP_DIGITS(&r) = 0;
+    CHECK_MPI_OK( mp_init(&p) );
+    CHECK_MPI_OK( mp_init(&q) );
+    CHECK_MPI_OK( mp_init(&y) );
+    CHECK_MPI_OK( mp_init(&r) );
+    SECITEM_TO_MPINT(*prime,    &p);
+    SECITEM_TO_MPINT(*subPrime, &q);
+    SECITEM_TO_MPINT(*Y,        &y);
+    /* compute r = y**q mod p */
+    CHECK_MPI_OK( mp_exptmod(&y, &q, &p, &r) );
+    /* compare to 1 */
+    cmp = mp_cmp_d(&r, 1);
+cleanup:
+    mp_clear(&p);
+    mp_clear(&q);
+    mp_clear(&y);
+    mp_clear(&r);
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	return PR_FALSE;
+    }
+    return (cmp == 0) ? PR_TRUE : PR_FALSE;
+}

mozilla/security/nss/lib/freebl/dh_bsf.c

@@ -0,0 +1,82 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.	Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.	If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include "prerr.h"
+#include "secerr.h"
+
+#include "blapi.h"
+
+SECStatus 
+DH_GenParam(int primeLen, DHParams ** params)
+{
+	PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+	return SECFailure;
+}
+
+SECStatus 
+DH_NewKey(DHParams *           params, 
+          DHPrivateKey **      privKey)
+{
+	PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+	return SECFailure;
+}
+
+SECStatus 
+DH_Derive(SECItem *    publicValue, 
+          SECItem *    prime, 
+          SECItem *    privateValue, 
+          SECItem *    derivedSecret,
+          unsigned int maxOutBytes)
+{
+	PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+	return SECFailure;
+}
+
+SECStatus 
+KEA_Derive(SECItem *prime, 
+           SECItem *public1, 
+           SECItem *public2, 
+           SECItem *private1, 
+           SECItem *private2,
+           SECItem *derivedSecret)
+{
+	PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+	return SECFailure;
+}
+
+PRBool 
+KEA_Verify(SECItem *Y, SECItem *prime, SECItem *subPrime)
+{
+	PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+	return PR_FALSE;
+}

mozilla/security/nss/lib/freebl/dsa.c

@@ -0,0 +1,420 @@
+/*
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ *
+ * $Id: dsa.c,v 1.11 2003-02-25 23:45:23 nelsonb%netscape.com Exp $
+ */
+
+#include "secerr.h"
+
+#include "prtypes.h"
+#include "prinit.h"
+#include "blapi.h"
+#include "nssilock.h"
+#include "secitem.h"
+#include "blapi.h"
+#include "mpi.h"
+
+ /* XXX to be replaced by define in blapit.h */
+#define NSS_FREEBL_DSA_DEFAULT_CHUNKSIZE 2048
+
+#define CHECKOK(func) if (MP_OKAY > (err = func)) goto cleanup
+
+#define SECITEM_TO_MPINT(it, mp) \
+    CHECKOK(mp_read_unsigned_octets((mp), (it).data, (it).len))
+
+/* DSA-specific random number functions defined in prng_fips1861.c. */
+extern SECStatus 
+DSA_RandomUpdate(void *data, size_t bytes, unsigned char *q);
+
+extern SECStatus 
+DSA_GenerateGlobalRandomBytes(void *dest, size_t len, unsigned char *q);
+
+static void translate_mpi_error(mp_err err)
+{
+    switch (err) {
+    case MP_MEM:    PORT_SetError(SEC_ERROR_NO_MEMORY);       break;
+    case MP_RANGE:  PORT_SetError(SEC_ERROR_BAD_DATA);        break;
+    case MP_BADARG: PORT_SetError(SEC_ERROR_INVALID_ARGS);    break;
+    default:        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); break;
+    }
+}
+
+SECStatus 
+dsa_NewKey(const PQGParams *params, DSAPrivateKey **privKey, 
+           const unsigned char *xb)
+{
+    unsigned int y_len;
+    mp_int p, g;
+    mp_int x, y;
+    mp_err err;
+    PRArenaPool *arena;
+    DSAPrivateKey *key;
+    /* Check args. */
+    if (!params || !privKey) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    /* Initialize an arena for the DSA key. */
+    arena = PORT_NewArena(NSS_FREEBL_DSA_DEFAULT_CHUNKSIZE);
+    if (!arena) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	return SECFailure;
+    }
+    key = (DSAPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(DSAPrivateKey));
+    if (!key) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	PORT_FreeArena(arena, PR_TRUE);
+	return SECFailure;
+    }
+    key->params.arena = arena;
+    /* Initialize MPI integers. */
+    MP_DIGITS(&p) = 0;
+    MP_DIGITS(&g) = 0;
+    MP_DIGITS(&x) = 0;
+    MP_DIGITS(&y) = 0;
+    CHECKOK( mp_init(&p) );
+    CHECKOK( mp_init(&g) );
+    CHECKOK( mp_init(&x) );
+    CHECKOK( mp_init(&y) );
+    /* Copy over the PQG params */
+    CHECKOK( SECITEM_CopyItem(arena, &key->params.prime, &params->prime) );
+    CHECKOK( SECITEM_CopyItem(arena, &key->params.subPrime, &params->subPrime));
+    CHECKOK( SECITEM_CopyItem(arena, &key->params.base, &params->base) );
+    /* Convert stored p, g, and received x into MPI integers. */
+    SECITEM_TO_MPINT(params->prime, &p);
+    SECITEM_TO_MPINT(params->base,  &g);
+    CHECKOK( mp_read_unsigned_octets(&x, xb, DSA_SUBPRIME_LEN) );
+    /* Store x in private key */
+    SECITEM_AllocItem(arena, &key->privateValue, DSA_SUBPRIME_LEN);
+    memcpy(key->privateValue.data, xb, DSA_SUBPRIME_LEN);
+    /* Compute public key y = g**x mod p */
+    CHECKOK( mp_exptmod(&g, &x, &p, &y) );
+    /* Store y in public key */
+    y_len = mp_unsigned_octet_size(&y);
+    SECITEM_AllocItem(arena, &key->publicValue, y_len);
+    err = mp_to_unsigned_octets(&y, key->publicValue.data, y_len);
+    /*   mp_to_unsigned_octets returns bytes written (y_len) if okay */
+    if (err < 0) goto cleanup; else err = MP_OKAY;
+    *privKey = key;
+    key = NULL;
+cleanup:
+    mp_clear(&p);
+    mp_clear(&g);
+    mp_clear(&x);
+    mp_clear(&y);
+    if (key)
+	PORT_FreeArena(key->params.arena, PR_TRUE);
+    if (err) {
+	translate_mpi_error(err);
+	return SECFailure;
+    }
+    return SECSuccess;
+}
+
+/*
+** Generate and return a new DSA public and private key pair,
+**	both of which are encoded into a single DSAPrivateKey struct.
+**	"params" is a pointer to the PQG parameters for the domain
+**	Uses a random seed.
+*/
+SECStatus 
+DSA_NewKey(const PQGParams *params, DSAPrivateKey **privKey)
+{
+    SECStatus rv;
+    unsigned char seed[DSA_SUBPRIME_LEN];
+    /* Generate seed bytes for x according to FIPS 186-1 appendix 3 */
+    if (DSA_GenerateGlobalRandomBytes(seed, DSA_SUBPRIME_LEN, 
+                                      params->subPrime.data))
+	return SECFailure;
+    /* Generate a new DSA key using random seed. */
+    rv = dsa_NewKey(params, privKey, seed);
+    return rv;
+}
+
+/* For FIPS compliance testing. Seed must be exactly 20 bytes long */
+SECStatus 
+DSA_NewKeyFromSeed(const PQGParams *params, 
+                   const unsigned char *seed,
+                   DSAPrivateKey **privKey)
+{
+    SECStatus rv;
+    rv = dsa_NewKey(params, privKey, seed);
+    return rv;
+}
+
+static SECStatus 
+dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest,
+               const unsigned char *kb)
+{
+    mp_int p, q, g;  /* PQG parameters */
+    mp_int x, k;     /* private key & pseudo-random integer */
+    mp_int r, s;     /* tuple (r, s) is signature) */
+    mp_err err   = MP_OKAY;
+    SECStatus rv = SECSuccess;
+
+    /* FIPS-compliance dictates that digest is a SHA1 hash. */
+    /* Check args. */
+    if (!key || !signature || !digest ||
+        (signature->len != DSA_SIGNATURE_LEN) ||
+	(digest->len != SHA1_LENGTH)) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    /* Initialize MPI integers. */
+    MP_DIGITS(&p) = 0;
+    MP_DIGITS(&q) = 0;
+    MP_DIGITS(&g) = 0;
+    MP_DIGITS(&x) = 0;
+    MP_DIGITS(&k) = 0;
+    MP_DIGITS(&r) = 0;
+    MP_DIGITS(&s) = 0;
+    CHECKOK( mp_init(&p) );
+    CHECKOK( mp_init(&q) );
+    CHECKOK( mp_init(&g) );
+    CHECKOK( mp_init(&x) );
+    CHECKOK( mp_init(&k) );
+    CHECKOK( mp_init(&r) );
+    CHECKOK( mp_init(&s) );
+    /*
+    ** Convert stored PQG and private key into MPI integers.
+    */
+    SECITEM_TO_MPINT(key->params.prime,    &p);
+    SECITEM_TO_MPINT(key->params.subPrime, &q);
+    SECITEM_TO_MPINT(key->params.base,     &g);
+    SECITEM_TO_MPINT(key->privateValue,    &x);
+    CHECKOK( mp_read_unsigned_octets(&k, kb, DSA_SUBPRIME_LEN) );
+    /*
+    ** FIPS 186-1, Section 5, Step 1
+    **
+    ** r = (g**k mod p) mod q
+    */
+    CHECKOK( mp_exptmod(&g, &k, &p, &r) ); /* r = g**k mod p */
+    CHECKOK(     mp_mod(&r, &q, &r) );     /* r = r mod q    */
+    /*                                  
+    ** FIPS 186-1, Section 5, Step 2
+    **
+    ** s = (k**-1 * (SHA1(M) + x*r)) mod q
+    */
+    SECITEM_TO_MPINT(*digest, &s);         /* s = SHA1(M)     */
+    CHECKOK( mp_invmod(&k, &q, &k) );      /* k = k**-1 mod q */
+    CHECKOK( mp_mulmod(&x, &r, &q, &x) );  /* x = x * r mod q */
+    CHECKOK( mp_addmod(&s, &x, &q, &s) );  /* s = s + x mod q */
+    CHECKOK( mp_mulmod(&s, &k, &q, &s) );  /* s = s * k mod q */
+    /*
+    ** verify r != 0 and s != 0
+    ** mentioned as optional in FIPS 186-1.
+    */
+    if (mp_cmp_z(&r) == 0 || mp_cmp_z(&s) == 0) {
+	PORT_SetError(SEC_ERROR_NEED_RANDOM);
+	rv = SECFailure;
+	goto cleanup;
+    }
+    /*
+    ** Step 4
+    **
+    ** Signature is tuple (r, s)
+    */
+    err = mp_to_fixlen_octets(&r, signature->data, DSA_SUBPRIME_LEN);
+    if (err < 0) goto cleanup; 
+    err = mp_to_fixlen_octets(&s, signature->data + DSA_SUBPRIME_LEN, 
+                                  DSA_SUBPRIME_LEN);
+    if (err < 0) goto cleanup; 
+    err = MP_OKAY;
+cleanup:
+    mp_clear(&p);
+    mp_clear(&q);
+    mp_clear(&g);
+    mp_clear(&x);
+    mp_clear(&k);
+    mp_clear(&r);
+    mp_clear(&s);
+    if (err) {
+	translate_mpi_error(err);
+	rv = SECFailure;
+    }
+    return rv;
+}
+
+/* signature is caller-supplied buffer of at least 20 bytes.
+** On input,  signature->len == size of buffer to hold signature.
+**            digest->len    == size of digest.
+** On output, signature->len == size of signature in buffer.
+** Uses a random seed.
+*/
+SECStatus 
+DSA_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest)
+{
+    SECStatus rv;
+    int       retries = 10;
+    unsigned char kSeed[DSA_SUBPRIME_LEN];
+
+    PORT_SetError(0);
+    do {
+	rv = DSA_GenerateGlobalRandomBytes(kSeed, DSA_SUBPRIME_LEN, 
+					   key->params.subPrime.data);
+	if (rv != SECSuccess) 
+	    break;
+	rv = dsa_SignDigest(key, signature, digest, kSeed);
+    } while (rv != SECSuccess && PORT_GetError() == SEC_ERROR_NEED_RANDOM &&
+	     --retries > 0);
+    return rv;
+}
+
+/* For FIPS compliance testing. Seed must be exactly 20 bytes. */
+SECStatus 
+DSA_SignDigestWithSeed(DSAPrivateKey * key,
+                       SECItem *       signature,
+                       const SECItem * digest,
+                       const unsigned char * seed)
+{
+    SECStatus rv;
+    rv = dsa_SignDigest(key, signature, digest, seed);
+    return rv;
+}
+
+/* signature is caller-supplied buffer of at least 20 bytes.
+** On input,  signature->len == size of buffer to hold signature.
+**            digest->len    == size of digest.
+*/
+SECStatus 
+DSA_VerifyDigest(DSAPublicKey *key, const SECItem *signature, 
+                 const SECItem *digest)
+{
+    /* FIPS-compliance dictates that digest is a SHA1 hash. */
+    mp_int p, q, g;      /* PQG parameters */
+    mp_int r_, s_;       /* tuple (r', s') is received signature) */
+    mp_int u1, u2, v, w; /* intermediate values used in verification */
+    mp_int y;            /* public key */
+    mp_err err;
+    SECStatus verified = SECFailure;
+
+    /* Check args. */
+    if (!key || !signature || !digest ||
+        (signature->len != DSA_SIGNATURE_LEN) ||
+	(digest->len != SHA1_LENGTH)) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+    /* Initialize MPI integers. */
+    MP_DIGITS(&p)  = 0;
+    MP_DIGITS(&q)  = 0;
+    MP_DIGITS(&g)  = 0;
+    MP_DIGITS(&y)  = 0;
+    MP_DIGITS(&r_) = 0;
+    MP_DIGITS(&s_) = 0;
+    MP_DIGITS(&u1) = 0;
+    MP_DIGITS(&u2) = 0;
+    MP_DIGITS(&v)  = 0;
+    MP_DIGITS(&w)  = 0;
+    CHECKOK( mp_init(&p)  );
+    CHECKOK( mp_init(&q)  );
+    CHECKOK( mp_init(&g)  );
+    CHECKOK( mp_init(&y)  );
+    CHECKOK( mp_init(&r_) );
+    CHECKOK( mp_init(&s_) );
+    CHECKOK( mp_init(&u1) );
+    CHECKOK( mp_init(&u2) );
+    CHECKOK( mp_init(&v)  );
+    CHECKOK( mp_init(&w)  );
+    /*
+    ** Convert stored PQG and public key into MPI integers.
+    */
+    SECITEM_TO_MPINT(key->params.prime,    &p);
+    SECITEM_TO_MPINT(key->params.subPrime, &q);
+    SECITEM_TO_MPINT(key->params.base,     &g);
+    SECITEM_TO_MPINT(key->publicValue,     &y);
+    /*
+    ** Convert received signature (r', s') into MPI integers.
+    */
+    CHECKOK( mp_read_unsigned_octets(&r_, signature->data, DSA_SUBPRIME_LEN) );
+    CHECKOK( mp_read_unsigned_octets(&s_, signature->data + DSA_SUBPRIME_LEN, 
+                                          DSA_SUBPRIME_LEN) );
+    /*
+    ** Verify that 0 < r' < q and 0 < s' < q
+    */
+    if (mp_cmp_z(&r_) <= 0 || mp_cmp_z(&s_) <= 0 ||
+        mp_cmp(&r_, &q) >= 0 || mp_cmp(&s_, &q) >= 0)
+	goto cleanup; /* will return verified == SECFailure */
+    /*
+    ** FIPS 186-1, Section 6, Step 1
+    **
+    ** w = (s')**-1 mod q
+    */
+    CHECKOK( mp_invmod(&s_, &q, &w) );      /* w = (s')**-1 mod q */
+    /*
+    ** FIPS 186-1, Section 6, Step 2
+    **
+    ** u1 = ((SHA1(M')) * w) mod q
+    */
+    SECITEM_TO_MPINT(*digest, &u1);         /* u1 = SHA1(M')     */
+    CHECKOK( mp_mulmod(&u1, &w, &q, &u1) ); /* u1 = u1 * w mod q */
+    /*
+    ** FIPS 186-1, Section 6, Step 3
+    **
+    ** u2 = ((r') * w) mod q
+    */
+    CHECKOK( mp_mulmod(&r_, &w, &q, &u2) );
+    /*
+    ** FIPS 186-1, Section 6, Step 4
+    **
+    ** v = ((g**u1 * y**u2) mod p) mod q
+    */
+    CHECKOK( mp_exptmod(&g, &u1, &p, &g) ); /* g = g**u1 mod p */
+    CHECKOK( mp_exptmod(&y, &u2, &p, &y) ); /* y = y**u2 mod p */
+    CHECKOK(  mp_mulmod(&g, &y, &p, &v)  ); /* v = g * y mod p */
+    CHECKOK(     mp_mod(&v, &q, &v)      ); /* v = v mod q     */
+    /*
+    ** Verification:  v == r'
+    */
+    if (mp_cmp(&v, &r_)) {
+	PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+	verified = SECFailure; /* Signature failed to verify. */
+    } else {
+	verified = SECSuccess; /* Signature verified. */
+    }
+cleanup:
+    mp_clear(&p);
+    mp_clear(&q);
+    mp_clear(&g);
+    mp_clear(&y);
+    mp_clear(&r_);
+    mp_clear(&s_);
+    mp_clear(&u1);
+    mp_clear(&u2);
+    mp_clear(&v);
+    mp_clear(&w);
+    if (err) {
+	translate_mpi_error(err);
+    }
+    return verified;
+}

mozilla/security/nss/lib/freebl/ec.c

@@ -0,0 +1,977 @@
+/*
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Elliptic Curve Cryptography library.
+ *
+ * The Initial Developer of the Original Code is Sun Microsystems, Inc.
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *	Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ */
+
+#include "blapi.h"
+#include "prerr.h"
+#include "secerr.h"
+#include "secmpi.h"
+#include "secitem.h"
+#include "ec.h"
+#include "GFp_ecl.h"
+#include "GF2m_ecl.h"
+
+#ifdef NSS_ENABLE_ECC
+
+/* 
+ * Returns true if pointP is the point at infinity, false otherwise
+ */
+PRBool
+ec_point_at_infinity(SECItem *pointP)
+{
+    int i;
+
+    for (i = 1; i < pointP->len; i++) {
+	if (pointP->data[i] != 0x00) return PR_FALSE;
+    }
+
+    return PR_TRUE;
+}
+
+/* 
+ * Computes point addition R = P + Q for the curve whose 
+ * parameters are encoded in params. Two or more of P, Q, 
+ * R may point to the same memory location.
+ */
+SECStatus
+ec_point_add(ECParams *params, SECItem *pointP,
+             SECItem *pointQ, SECItem *pointR)
+{
+    mp_int Px, Py, Qx, Qy, Rx, Ry;
+    mp_int irreducible, a;
+    SECStatus rv = SECFailure;
+    mp_err err = MP_OKAY;
+    int len;
+
+#if EC_DEBUG
+    int i;
+
+    printf("ec_point_add: params [len=%d]:", params->DEREncoding.len);
+    for (i = 0; i < params->DEREncoding.len; i++) 
+	    printf("%02x:", params->DEREncoding.data[i]);
+    printf("\n");
+
+    printf("ec_point_add: pointP [len=%d]:", pointP->len);
+    for (i = 0; i < pointP->len; i++) 
+	    printf("%02x:", pointP->data[i]);
+    printf("\n");
+
+    printf("ec_point_add: pointQ [len=%d]:", pointQ->len);
+    for (i = 0; i < pointQ->len; i++) 
+	    printf("%02x:", pointQ->data[i]);
+    printf("\n");
+#endif
+
+    /* NOTE: We only support prime field curves for now */
+    len = (params->fieldID.size + 7) >> 3;
+    if ((pointP->data[0] != EC_POINT_FORM_UNCOMPRESSED) ||
+	(pointP->len != (2 * len + 1)) ||
+	(pointQ->data[0] != EC_POINT_FORM_UNCOMPRESSED) ||
+	(pointQ->len != (2 * len + 1))) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+
+    MP_DIGITS(&Px) = 0;
+    MP_DIGITS(&Py) = 0;
+    MP_DIGITS(&Qx) = 0;
+    MP_DIGITS(&Qy) = 0;
+    MP_DIGITS(&Rx) = 0;
+    MP_DIGITS(&Ry) = 0;
+    MP_DIGITS(&irreducible) = 0;
+    MP_DIGITS(&a) = 0;
+    CHECK_MPI_OK( mp_init(&Px) );
+    CHECK_MPI_OK( mp_init(&Py) );
+    CHECK_MPI_OK( mp_init(&Qx) );
+    CHECK_MPI_OK( mp_init(&Qy) );
+    CHECK_MPI_OK( mp_init(&Rx) );
+    CHECK_MPI_OK( mp_init(&Ry) );
+    CHECK_MPI_OK( mp_init(&irreducible) );
+    CHECK_MPI_OK( mp_init(&a) );
+
+    /* Initialize Px and Py */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Px, pointP->data + 1, 
+	                                  (mp_size) len) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Py, pointP->data + 1 + len, 
+	                                  (mp_size) len) );
+
+    /* Initialize Qx and Qy */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Qx, pointQ->data + 1, 
+	                                  (mp_size) len) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Qy, pointQ->data + 1 + len, 
+	                                  (mp_size) len) );
+
+    /* Set up the curve coefficient */
+    SECITEM_TO_MPINT( params->curve.a, &a );
+
+    /* Compute R = P + Q */
+    if (params->fieldID.type == ec_field_GFp) {
+	SECITEM_TO_MPINT( params->fieldID.u.prime, &irreducible );
+	if (GFp_ec_pt_add(&irreducible, &a, &Px, &Py, &Qx, &Qy, 
+	    &Rx, &Ry) != SECSuccess)
+	    goto cleanup;
+    } else {
+	SECITEM_TO_MPINT( params->fieldID.u.poly, &irreducible );
+	if (GF2m_ec_pt_add(&irreducible, &a, &Px, &Py, &Qx, &Qy, &Rx, &Ry) 
+	    != SECSuccess) 
+	    goto cleanup;
+    }
+
+    /* Construct the SECItem representation of the result */
+    pointR->data[0] = EC_POINT_FORM_UNCOMPRESSED;
+    CHECK_MPI_OK( mp_to_fixlen_octets(&Rx, pointR->data + 1,
+	                              (mp_size) len) );
+    CHECK_MPI_OK( mp_to_fixlen_octets(&Ry, pointR->data + 1 + len,
+	                              (mp_size) len) );
+    rv = SECSuccess;
+
+#if EC_DEBUG
+    printf("ec_point_add: pointR [len=%d]:", pointR->len);
+    for (i = 0; i < pointR->len; i++) 
+	    printf("%02x:", pointR->data[i]);
+    printf("\n");
+#endif
+
+cleanup:
+    mp_clear(&Px);
+    mp_clear(&Py);
+    mp_clear(&Qx);
+    mp_clear(&Qy);
+    mp_clear(&Rx);
+    mp_clear(&Ry);
+    mp_clear(&irreducible);
+    mp_clear(&a);
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
+    }
+
+    return rv;
+}
+
+/* 
+ * Computes scalar point multiplication pointQ = k * pointP for
+ * the curve whose parameters are encoded in params.
+ */
+SECStatus
+ec_point_mul(ECParams *params, mp_int *k,
+             SECItem *pointP, SECItem *pointQ)
+{
+    mp_int Px, Py, Qx, Qy;
+    mp_int irreducible, a, b;
+    SECStatus rv = SECFailure;
+    mp_err err = MP_OKAY;
+    int len;
+
+#if EC_DEBUG
+    int i;
+    char mpstr[256];
+
+    printf("ec_point_mul: params [len=%d]:", params->DEREncoding.len);
+    for (i = 0; i < params->DEREncoding.len; i++) 
+	    printf("%02x:", params->DEREncoding.data[i]);
+    printf("\n");
+
+    mp_tohex(k, mpstr);
+    printf("ec_point_mul: scalar : %s\n", mpstr);
+    mp_todecimal(k, mpstr);
+    printf("ec_point_mul: scalar : %s (dec)\n", mpstr);
+
+    printf("ec_point_mul: pointP [len=%d]:", pointP->len);
+    for (i = 0; i < pointP->len; i++) 
+	    printf("%02x:", pointP->data[i]);
+    printf("\n");
+#endif
+
+    /* NOTE: We only support prime field curves for now */
+    len = (params->fieldID.size + 7) >> 3;
+    if ((pointP->data[0] != EC_POINT_FORM_UNCOMPRESSED) ||
+	(pointP->len != (2 * len + 1))) {
+	    return SECFailure;
+    };
+
+    MP_DIGITS(&Px) = 0;
+    MP_DIGITS(&Py) = 0;
+    MP_DIGITS(&Qx) = 0;
+    MP_DIGITS(&Qy) = 0;
+    MP_DIGITS(&irreducible) = 0;
+    MP_DIGITS(&a) = 0;
+    MP_DIGITS(&b) = 0;
+    CHECK_MPI_OK( mp_init(&Px) );
+    CHECK_MPI_OK( mp_init(&Py) );
+    CHECK_MPI_OK( mp_init(&Qx) );
+    CHECK_MPI_OK( mp_init(&Qy) );
+    CHECK_MPI_OK( mp_init(&irreducible) );
+    CHECK_MPI_OK( mp_init(&a) );
+    CHECK_MPI_OK( mp_init(&b) );
+
+    /* Initialize Px and Py */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Px, pointP->data + 1, 
+	                                  (mp_size) len) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Py, pointP->data + 1 + len, 
+	                                  (mp_size) len) );
+
+    /* Set up mp_ints containing the curve coefficients */
+    SECITEM_TO_MPINT( params->curve.a, &a );
+    SECITEM_TO_MPINT( params->curve.b, &b );
+
+    /* Compute Q = k * P */
+    if (params->fieldID.type == ec_field_GFp) {
+	SECITEM_TO_MPINT( params->fieldID.u.prime, &irreducible );
+	if (GFp_ec_pt_mul(&irreducible, &a, &b, &Px, &Py, k, &Qx, &Qy) 
+	    != SECSuccess) 
+	    goto cleanup;
+    } else {
+	SECITEM_TO_MPINT( params->fieldID.u.poly, &irreducible );
+	if (GF2m_ec_pt_mul(&irreducible, &a, &b, &Px, &Py, k, &Qx, &Qy) 
+	    != SECSuccess) {
+	    goto cleanup;
+	}
+    }
+
+    /* Construct the SECItem representation of point Q */
+    pointQ->data[0] = EC_POINT_FORM_UNCOMPRESSED;
+    CHECK_MPI_OK( mp_to_fixlen_octets(&Qx, pointQ->data + 1,
+	                              (mp_size) len) );
+    CHECK_MPI_OK( mp_to_fixlen_octets(&Qy, pointQ->data + 1 + len,
+	                              (mp_size) len) );
+
+    rv = SECSuccess;
+
+#if EC_DEBUG
+    printf("ec_point_mul: pointQ [len=%d]:", pointQ->len);
+    for (i = 0; i < pointQ->len; i++) 
+	    printf("%02x:", pointQ->data[i]);
+    printf("\n");
+#endif
+
+cleanup:
+    mp_clear(&Px);
+    mp_clear(&Py);
+    mp_clear(&Qx);
+    mp_clear(&Qy);
+    mp_clear(&irreducible);
+    mp_clear(&a);
+    mp_clear(&b);
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
+    }
+
+    return rv;
+}
+
+static unsigned char bitmask[] = {
+	0xff, 0x7f, 0x3f, 0x1f,
+	0x0f, 0x07, 0x03, 0x01
+};
+#endif /* NSS_ENABLE_ECC */
+
+/* Generates a new EC key pair. The private key is a supplied
+ * random value (in seed) and the public key is the result of 
+ * performing a scalar point multiplication of that value with 
+ * the curve's base point.
+ */
+SECStatus 
+EC_NewKeyFromSeed(ECParams *ecParams, ECPrivateKey **privKey, 
+    const unsigned char *seed, int seedlen)
+{
+    SECStatus rv = SECFailure;
+#ifdef NSS_ENABLE_ECC
+    PRArenaPool *arena;
+    ECPrivateKey *key;
+    mp_int k;
+    mp_err err = MP_OKAY;
+    int len;
+
+#if EC_DEBUG
+    printf("EC_NewKeyFromSeed called\n");
+#endif
+
+    if (!ecParams || !privKey || !seed || (seedlen < 0)) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+
+    /* Initialize an arena for the EC key. */
+    if (!(arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE)))
+	return SECFailure;
+
+    key = (ECPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(ECPrivateKey));
+    if (!key) {
+	PORT_FreeArena(arena, PR_TRUE);
+	return SECFailure;
+    }
+
+
+    /* Copy all of the fields from the ECParams argument to the
+     * ECParams structure within the private key.
+     */
+    key->ecParams.arena = arena;
+    key->ecParams.type = ecParams->type;
+    key->ecParams.fieldID.size = ecParams->fieldID.size;
+    key->ecParams.fieldID.type = ecParams->fieldID.type;
+    if (ecParams->fieldID.type == ec_field_GFp) {
+	CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.fieldID.u.prime,
+	    &ecParams->fieldID.u.prime));
+    } else {
+	CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.fieldID.u.poly,
+	    &ecParams->fieldID.u.poly));
+    }
+    key->ecParams.fieldID.k1 = ecParams->fieldID.k1;
+    key->ecParams.fieldID.k2 = ecParams->fieldID.k2;
+    key->ecParams.fieldID.k3 = ecParams->fieldID.k3;
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.curve.a,
+	&ecParams->curve.a));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.curve.b,
+	&ecParams->curve.b));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.curve.seed,
+	&ecParams->curve.seed));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.base,
+	&ecParams->base));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.order,
+	&ecParams->order));
+    key->ecParams.cofactor = ecParams->cofactor;
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.DEREncoding,
+	&ecParams->DEREncoding));
+
+    len = (ecParams->fieldID.size + 7) >> 3;  
+    SECITEM_AllocItem(arena, &key->privateValue, len);
+    SECITEM_AllocItem(arena, &key->publicValue, 2*len + 1);
+
+    /* Copy private key */
+    if (seedlen >= len) {
+	memcpy(key->privateValue.data, seed, len);
+    } else {
+	memset(key->privateValue.data, 0, (len - seedlen));
+	memcpy(key->privateValue.data + (len - seedlen), seed, seedlen);
+    }
+
+    /* Compute corresponding public key */
+    MP_DIGITS(&k) = 0;
+    CHECK_MPI_OK( mp_init(&k) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&k, key->privateValue.data, 
+	(mp_size) len) );
+
+    rv = ec_point_mul(ecParams, &k, &(ecParams->base), &(key->publicValue));
+    if (rv != SECSuccess) goto cleanup;
+    *privKey = key;
+
+cleanup:
+    mp_clear(&k);
+    if (rv)
+	PORT_FreeArena(arena, PR_TRUE);
+
+#if EC_DEBUG
+    printf("EC_NewKeyFromSeed returning %s\n", 
+	(rv == SECSuccess) ? "success" : "failure");
+#endif
+#else
+    PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+#endif /* NSS_ENABLE_ECC */
+
+    return rv;
+
+}
+
+/* Generates a new EC key pair. The private key is a random value and
+ * the public key is the result of performing a scalar point multiplication
+ * of that value with the curve's base point.
+ */
+SECStatus 
+EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey)
+{
+    SECStatus rv = SECFailure;
+#ifdef NSS_ENABLE_ECC
+    int len;
+    unsigned char *seed;
+
+    if (!ecParams || !privKey) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+
+    /* Generate random private key */
+    len = (ecParams->fieldID.size + 7) >> 3;
+    if ((seed = PORT_Alloc(len)) == NULL) goto cleanup;
+    if (RNG_GenerateGlobalRandomBytes(seed, len) != SECSuccess) goto cleanup;
+
+    /* Fit private key to the field size */
+    seed[0] &= bitmask[len * 8 - ecParams->fieldID.size];
+    rv = EC_NewKeyFromSeed(ecParams, privKey, seed, len);
+
+cleanup:
+    if (!seed) {
+	PORT_ZFree(seed, len);
+    }
+#if EC_DEBUG
+    printf("EC_NewKey returning %s\n", 
+	(rv == SECSuccess) ? "success" : "failure");
+#endif
+#else
+    PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+#endif /* NSS_ENABLE_ECC */
+    
+    return rv;
+}
+
+/* Validates an EC public key as described in Section 5.2.2 of
+ * X9.63. The ECDH primitive when used without the cofactor does
+ * not address small subgroup attacks, which may occur when the
+ * public key is not valid. These attacks can be prevented by 
+ * validating the public key before using ECDH.
+ */
+SECStatus 
+EC_ValidatePublicKey(ECParams *ecParams, SECItem *publicValue)
+{
+#ifdef NSS_ENABLE_ECC
+    if (!ecParams || !publicValue) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+
+    /* XXX Add actual checks here. */
+    return SECSuccess;
+#else
+    PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+    return SECFailure;
+#endif /* NSS_ENABLE_ECC */
+}
+
+/* 
+** Performs an ECDH key derivation by computing the scalar point
+** multiplication of privateValue and publicValue (with or without the
+** cofactor) and returns the x-coordinate of the resulting elliptic
+** curve point in derived secret.  If successful, derivedSecret->data
+** is set to the address of the newly allocated buffer containing the
+** derived secret, and derivedSecret->len is the size of the secret
+** produced. It is the caller's responsibility to free the allocated
+** buffer containing the derived secret.
+*/
+SECStatus 
+ECDH_Derive(SECItem  *publicValue, 
+            ECParams *ecParams,
+            SECItem  *privateValue,
+            PRBool    withCofactor,
+            SECItem  *derivedSecret)
+{
+    SECStatus rv = SECFailure;
+#ifdef NSS_ENABLE_ECC
+    unsigned int len = 0;
+    SECItem pointQ = {siBuffer, NULL, 0};
+    mp_int k; /* to hold the private value */
+    mp_int cofactor;
+    mp_err err = MP_OKAY;
+#if EC_DEBUG
+    int i;
+#endif
+
+    if (!publicValue || !ecParams || !privateValue || 
+	!derivedSecret) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	return SECFailure;
+    }
+
+    memset(derivedSecret, 0, sizeof *derivedSecret);
+    len = (ecParams->fieldID.size + 7) >> 3;  
+    pointQ.len = 2*len + 1;
+    if ((pointQ.data = PORT_Alloc(2*len + 1)) == NULL) goto cleanup;
+
+    MP_DIGITS(&k) = 0;
+    CHECK_MPI_OK( mp_init(&k) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&k, privateValue->data, 
+	                                  (mp_size) privateValue->len) );
+
+    if (withCofactor && (ecParams->cofactor != 1)) {
+	    /* multiply k with the cofactor */
+	    MP_DIGITS(&cofactor) = 0;
+	    CHECK_MPI_OK( mp_init(&cofactor) );
+	    mp_set(&cofactor, ecParams->cofactor);
+	    CHECK_MPI_OK( mp_mul(&k, &cofactor, &k) );
+    }
+
+    /* Multiply our private key and peer's public point */
+    if ((ec_point_mul(ecParams, &k, publicValue, &pointQ) != SECSuccess) ||
+	ec_point_at_infinity(&pointQ))
+	goto cleanup;
+
+    /* Allocate memory for the derived secret and copy
+     * the x co-ordinate of pointQ into it.
+     */
+    SECITEM_AllocItem(NULL, derivedSecret, len);
+    memcpy(derivedSecret->data, pointQ.data + 1, len);
+
+    rv = SECSuccess;
+
+#if EC_DEBUG
+    printf("derived_secret:\n");
+    for (i = 0; i < derivedSecret->len; i++) 
+	printf("%02x:", derivedSecret->data[i]);
+    printf("\n");
+#endif
+
+cleanup:
+    mp_clear(&k);
+
+    if (pointQ.data) {
+	PORT_ZFree(pointQ.data, 2*len + 1);
+    }
+#else
+    PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+#endif /* NSS_ENABLE_ECC */
+
+    return rv;
+}
+
+/* Computes the ECDSA signature (a concatenation of two values r and s)
+ * on the digest using the given key and the random value kb (used in
+ * computing s).
+ */
+SECStatus 
+ECDSA_SignDigestWithSeed(ECPrivateKey *key, SECItem *signature, 
+    const SECItem *digest, const unsigned char *kb, const int kblen)
+{
+    SECStatus rv = SECFailure;
+#ifdef NSS_ENABLE_ECC
+    mp_int x1;
+    mp_int d, k;     /* private key, random integer */
+    mp_int r, s;     /* tuple (r, s) is the signature */
+    mp_int n;
+    mp_err err = MP_OKAY;
+    ECParams *ecParams = NULL;
+    SECItem kGpoint = { siBuffer, NULL, 0};
+    int len = 0;
+
+#if EC_DEBUG
+    char mpstr[256];
+#endif
+
+    /* Check args */
+    if (!key || !signature || !digest || !kb || (kblen < 0) ||
+	(digest->len != SHA1_LENGTH)) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	goto cleanup;
+    }
+
+    ecParams = &(key->ecParams);
+    len = (ecParams->fieldID.size + 7) >> 3;  
+    if (signature->len < 2*len) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	goto cleanup;
+    }
+
+    /* Initialize MPI integers. */
+    MP_DIGITS(&x1) = 0;
+    MP_DIGITS(&d) = 0;
+    MP_DIGITS(&k) = 0;
+    MP_DIGITS(&r) = 0;
+    MP_DIGITS(&s) = 0;
+    MP_DIGITS(&n) = 0;
+    CHECK_MPI_OK( mp_init(&x1) );
+    CHECK_MPI_OK( mp_init(&d) );
+    CHECK_MPI_OK( mp_init(&k) );
+    CHECK_MPI_OK( mp_init(&r) );
+    CHECK_MPI_OK( mp_init(&s) );
+    CHECK_MPI_OK( mp_init(&n) );
+
+    SECITEM_TO_MPINT( ecParams->order, &n );
+    SECITEM_TO_MPINT( key->privateValue, &d );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&k, kb, kblen) );
+    /* Make sure k is in the interval [1, n-1] */
+    if ((mp_cmp_z(&k) <= 0) || (mp_cmp(&k, &n) >= 0)) {
+	PORT_SetError(SEC_ERROR_NEED_RANDOM);
+	goto cleanup;
+    }
+
+    /* 
+    ** ANSI X9.62, Section 5.3.2, Step 2
+    **
+    ** Compute kG
+    */
+    kGpoint.len = 2*len + 1;
+    kGpoint.data = PORT_Alloc(2*len + 1);
+    if ((kGpoint.data == NULL) ||
+	(ec_point_mul(ecParams, &k, &(ecParams->base), &kGpoint)
+	    != SECSuccess))
+	goto cleanup;
+
+    /* 
+    ** ANSI X9.62, Section 5.3.3, Step 1
+    **
+    ** Extract the x co-ordinate of kG into x1
+    */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&x1, kGpoint.data + 1, 
+	                                  (mp_size) len) );
+
+    /* 
+    ** ANSI X9.62, Section 5.3.3, Step 2
+    **
+    ** r = x1 mod n  NOTE: n is the order of the curve
+    */
+    CHECK_MPI_OK( mp_mod(&x1, &n, &r) );
+
+    /*
+    ** ANSI X9.62, Section 5.3.3, Step 3
+    **
+    ** verify r != 0 
+    */
+    if (mp_cmp_z(&r) == 0) {
+	PORT_SetError(SEC_ERROR_NEED_RANDOM);
+	goto cleanup;
+    }
+
+    /*                                  
+    ** ANSI X9.62, Section 5.3.3, Step 4
+    **
+    ** s = (k**-1 * (SHA1(M) + d*r)) mod n 
+    */
+    SECITEM_TO_MPINT(*digest, &s);        /* s = SHA1(M)     */
+
+#if EC_DEBUG
+    mp_todecimal(&n, mpstr);
+    printf("n : %s (dec)\n", mpstr);
+    mp_todecimal(&d, mpstr);
+    printf("d : %s (dec)\n", mpstr);
+    mp_tohex(&x1, mpstr);
+    printf("x1: %s\n", mpstr);
+    mp_todecimal(&s, mpstr);
+    printf("digest: %s (decimal)\n", mpstr);
+    mp_todecimal(&r, mpstr);
+    printf("r : %s (dec)\n", mpstr);
+#endif
+
+    CHECK_MPI_OK( mp_invmod(&k, &n, &k) );      /* k = k**-1 mod n */
+    CHECK_MPI_OK( mp_mulmod(&d, &r, &n, &d) );  /* d = d * r mod n */
+    CHECK_MPI_OK( mp_addmod(&s, &d, &n, &s) );  /* s = s + d mod n */
+    CHECK_MPI_OK( mp_mulmod(&s, &k, &n, &s) );  /* s = s * k mod n */
+
+#if EC_DEBUG
+    mp_todecimal(&s, mpstr);
+    printf("s : %s (dec)\n", mpstr);
+#endif
+
+    /*
+    ** ANSI X9.62, Section 5.3.3, Step 5
+    **
+    ** verify s != 0
+    */
+    if (mp_cmp_z(&s) == 0) {
+	PORT_SetError(SEC_ERROR_NEED_RANDOM);
+	goto cleanup;
+    }
+
+   /*
+    **
+    ** Signature is tuple (r, s)
+    */
+    CHECK_MPI_OK( mp_to_fixlen_octets(&r, signature->data, len) );
+    CHECK_MPI_OK( mp_to_fixlen_octets(&s, signature->data + len, len) );
+    signature->len = 2*len;
+
+    rv = SECSuccess;
+    err = MP_OKAY;
+cleanup:
+    mp_clear(&x1);
+    mp_clear(&d);
+    mp_clear(&k);
+    mp_clear(&r);
+    mp_clear(&s);
+    mp_clear(&n);
+
+    if (kGpoint.data) {
+	PORT_ZFree(kGpoint.data, 2*len + 1);
+    }
+
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
+    }
+
+#if EC_DEBUG
+    printf("ECDSA signing with seed %s\n",
+	(rv == SECSuccess) ? "succeeded" : "failed");
+#endif
+#else
+    PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+#endif /* NSS_ENABLE_ECC */
+
+   return rv;
+}
+
+/*
+** Computes the ECDSA signature on the digest using the given key 
+** and a random seed.
+*/
+SECStatus 
+ECDSA_SignDigest(ECPrivateKey *key, SECItem *signature, const SECItem *digest)
+{
+    SECStatus rv = SECFailure;
+#ifdef NSS_ENABLE_ECC
+    int prerr = 0;
+    int n = (key->ecParams.fieldID.size + 7) >> 3;
+    unsigned char mask = bitmask[n * 8 - key->ecParams.fieldID.size];
+    unsigned char *kseed = NULL;
+
+    /* Generate random seed of appropriate size as dictated 
+     * by field size.
+     */
+    if ((kseed = PORT_Alloc(n)) == NULL) return SECFailure;
+
+    do {
+        if (RNG_GenerateGlobalRandomBytes(kseed, n) != SECSuccess) 
+	    goto cleanup;
+	*kseed &= mask;
+	rv = ECDSA_SignDigestWithSeed(key, signature, digest, kseed, n);
+	if (rv) prerr = PORT_GetError();
+    } while ((rv != SECSuccess) && (prerr == SEC_ERROR_NEED_RANDOM));
+
+cleanup:    
+    if (kseed) PORT_ZFree(kseed, n);
+
+#if EC_DEBUG
+    printf("ECDSA signing %s\n",
+	(rv == SECSuccess) ? "succeeded" : "failed");
+#endif
+#else
+    PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+#endif /* NSS_ENABLE_ECC */
+
+    return rv;
+}
+
+/*
+** Checks the signature on the given digest using the key provided.
+*/
+SECStatus 
+ECDSA_VerifyDigest(ECPublicKey *key, const SECItem *signature, 
+                 const SECItem *digest)
+{
+    SECStatus rv = SECFailure;
+#ifdef NSS_ENABLE_ECC
+    mp_int r_, s_;           /* tuple (r', s') is received signature) */
+    mp_int c, u1, u2, v;     /* intermediate values used in verification */
+    mp_int x1, y1;
+    mp_int x2, y2;
+    mp_int n;
+    mp_err err = MP_OKAY;
+    PRArenaPool *arena = NULL;
+    ECParams *ecParams = NULL;
+    SECItem pointA = { siBuffer, NULL, 0 };
+    SECItem pointB = { siBuffer, NULL, 0 };
+    SECItem pointC = { siBuffer, NULL, 0 };
+    int len;
+
+#if EC_DEBUG
+    char mpstr[256];
+    printf("ECDSA verification called\n");
+#endif
+
+    /* Check args */
+    if (!key || !signature || !digest ||
+	(digest->len != SHA1_LENGTH)) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	goto cleanup;
+    }
+
+    ecParams = &(key->ecParams);
+    len = (ecParams->fieldID.size + 7) >> 3;  
+    if (signature->len < 2*len) {
+	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	goto cleanup;
+    }
+
+    /* Initialize an arena for pointA, pointB and pointC */
+    if ((arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE)) == NULL)
+	goto cleanup;
+
+    SECITEM_AllocItem(arena, &pointA, 2*len + 1);
+    SECITEM_AllocItem(arena, &pointB, 2*len + 1);
+    SECITEM_AllocItem(arena, &pointC, 2*len + 1);
+    if (pointA.data == NULL || pointB.data == NULL || pointC.data == NULL)
+	goto cleanup;
+
+    /* Initialize MPI integers. */
+    MP_DIGITS(&r_) = 0;
+    MP_DIGITS(&s_) = 0;
+    MP_DIGITS(&c) = 0;
+    MP_DIGITS(&u1) = 0;
+    MP_DIGITS(&u2) = 0;
+    MP_DIGITS(&x1) = 0;
+    MP_DIGITS(&y1) = 0;
+    MP_DIGITS(&x2) = 0;
+    MP_DIGITS(&y2) = 0;
+    MP_DIGITS(&v)  = 0;
+    MP_DIGITS(&n)  = 0;
+    CHECK_MPI_OK( mp_init(&r_) );
+    CHECK_MPI_OK( mp_init(&s_) );
+    CHECK_MPI_OK( mp_init(&c)  );
+    CHECK_MPI_OK( mp_init(&u1) );
+    CHECK_MPI_OK( mp_init(&u2) );
+    CHECK_MPI_OK( mp_init(&x1)  );
+    CHECK_MPI_OK( mp_init(&y1)  );
+    CHECK_MPI_OK( mp_init(&x2)  );
+    CHECK_MPI_OK( mp_init(&y2)  );
+    CHECK_MPI_OK( mp_init(&v)  );
+    CHECK_MPI_OK( mp_init(&n)  );
+
+    /*
+    ** Convert received signature (r', s') into MPI integers.
+    */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&r_, signature->data, len) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&s_, signature->data + len, len) );
+                                          
+    /* 
+    ** ANSI X9.62, Section 5.4.2, Steps 1 and 2
+    **
+    ** Verify that 0 < r' < n and 0 < s' < n
+    */
+    SECITEM_TO_MPINT(ecParams->order, &n);
+    if (mp_cmp_z(&r_) <= 0 || mp_cmp_z(&s_) <= 0 ||
+        mp_cmp(&r_, &n) >= 0 || mp_cmp(&s_, &n) >= 0)
+	goto cleanup; /* will return rv == SECFailure */
+
+    /*
+    ** ANSI X9.62, Section 5.4.2, Step 3
+    **
+    ** c = (s')**-1 mod n
+    */
+    CHECK_MPI_OK( mp_invmod(&s_, &n, &c) );      /* c = (s')**-1 mod n */
+
+    /*
+    ** ANSI X9.62, Section 5.4.2, Step 4
+    **
+    ** u1 = ((SHA1(M')) * c) mod n
+    */
+    SECITEM_TO_MPINT(*digest, &u1);         /* u1 = SHA1(M')     */
+
+#if EC_DEBUG
+    mp_todecimal(&r_, mpstr);
+    printf("r_: %s (dec)\n", mpstr);
+    mp_todecimal(&s_, mpstr);
+    printf("s_: %s (dec)\n", mpstr);
+    mp_todecimal(&c, mpstr);
+    printf("c : %s (dec)\n", mpstr);
+    mp_todecimal(&u1, mpstr);
+    printf("digest: %s (dec)\n", mpstr);
+#endif
+
+    CHECK_MPI_OK( mp_mulmod(&u1, &c, &n, &u1) );  /* u1 = u1 * c mod n */
+
+    /*
+    ** ANSI X9.62, Section 5.4.2, Step 4
+    **
+    ** u2 = ((r') * c) mod n
+    */
+    CHECK_MPI_OK( mp_mulmod(&r_, &c, &n, &u2) );
+
+    /*
+    ** ANSI X9.62, Section 5.4.3, Step 1
+    **
+    ** Compute u1*G + u2*Q
+    ** Here, A = u1.G     B = u2.Q    and   C = A + B
+    ** If the result, C, is the point at infinity, reject the signature
+    */
+    if ((ec_point_mul(ecParams, &u1, &ecParams->base, &pointA) 
+	    == SECFailure) ||
+	(ec_point_mul(ecParams, &u2, &key->publicValue, &pointB) 
+	    == SECFailure) ||
+	(ec_point_add(ecParams, &pointA, &pointB, &pointC) == SECFailure) ||
+	ec_point_at_infinity(&pointC)) {
+	    rv = SECFailure;
+	    goto cleanup;
+    }
+
+    CHECK_MPI_OK( mp_read_unsigned_octets(&x1, pointC.data + 1, len) );
+
+    /*
+    ** ANSI X9.62, Section 5.4.4, Step 2
+    **
+    ** v = x1 mod n
+    */
+    CHECK_MPI_OK( mp_mod(&x1, &n, &v) );
+
+    /*
+    ** ANSI X9.62, Section 5.4.4, Step 3
+    **
+    ** Verification:  v == r'
+    */
+    if (mp_cmp(&v, &r_)) {
+	PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+	rv = SECFailure; /* Signature failed to verify. */
+    } else {
+	rv = SECSuccess; /* Signature verified. */
+    }
+
+#if EC_DEBUG
+    mp_todecimal(&u1, mpstr);
+    printf("u1: %s (dec)\n", mpstr);
+    mp_todecimal(&u2, mpstr);
+    printf("u2: %s (dec)\n", mpstr);
+    mp_tohex(&x1, mpstr);
+    printf("x1: %s\n", mpstr);
+    mp_todecimal(&v, mpstr);
+    printf("v : %s (dec)\n", mpstr);
+#endif
+
+cleanup:
+    mp_clear(&r_);
+    mp_clear(&s_);
+    mp_clear(&c);
+    mp_clear(&u1);
+    mp_clear(&u2);
+    mp_clear(&x1);
+    mp_clear(&y1);
+    mp_clear(&x2);
+    mp_clear(&y2);
+    mp_clear(&v);
+    mp_clear(&n);
+
+    if (arena) PORT_FreeArena(arena, PR_TRUE);	
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
+    }
+
+#if EC_DEBUG
+    printf("ECDSA verification %s\n",
+	(rv == SECSuccess) ? "succeeded" : "failed");
+#endif
+#else
+    PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+#endif /* NSS_ENABLE_ECC */
+
+    return rv;
+}
+

mozilla/security/nss/lib/freebl/ec.h

@@ -1,5 +1,4 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
+/* 
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -12,14 +11,14 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Mozilla Party Tool
+ * The Original Code is the Elliptic Curve Cryptography library.
  *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
+ * The Initial Developer of the Original Code is Sun Microsystems, Inc.
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
  *
  * Contributor(s):
+ *	Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -33,19 +32,19 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
- * ***** END LICENSE BLOCK ***** */
-class Feed extends AppModel {
-  var $name = 'Feeds';
-  var $useTable = "parties";
+ */
 
-  function getComments($aParty) {
-    $rv = $this->query("SELECT * FROM comments WHERE assoc = ".$aParty." LIMIT 10");
-    return $rv;
-  }
+#ifndef __ec_h_
+#define __ec_h_
 
-  function getUserCount() {
-    $rv = $this->query("SELECT COUNT(*) FROM users");
-    return $rv[0][0]['COUNT(*)'];
-  }
-}
-?>
+#define EC_DEBUG                          0
+#define EC_POINT_FORM_COMPRESSED_Y0    0x02
+#define EC_POINT_FORM_COMPRESSED_Y1    0x03
+#define EC_POINT_FORM_UNCOMPRESSED     0x04
+#define EC_POINT_FORM_HYBRID_Y0        0x06
+#define EC_POINT_FORM_HYBRID_Y1        0x07
+
+#define ANSI_X962_CURVE_OID_TOTAL_LEN    10
+#define SECG_CURVE_OID_TOTAL_LEN          7
+
+#endif /* __ec_h_ */

mozilla/security/nss/lib/freebl/fblstdlib.c

@@ -0,0 +1,120 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.	Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.	If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <plstr.h>
+#include "aglobal.h"
+#include "bsafe.h"
+#include "secport.h"
+
+void CALL_CONV T_memset (p, c, count)
+POINTER p;
+int c;
+unsigned int count;
+{
+	if (count >= 0)
+		memset(p, c, count);
+}
+
+void CALL_CONV T_memcpy (d, s, count)
+POINTER d, s;
+unsigned int count;
+{
+	if (count >= 0)
+		memcpy(d, s, count);
+}
+
+void CALL_CONV T_memmove (d, s, count)
+POINTER d, s;
+unsigned int count;
+{
+	if (count >= 0)
+		PORT_Memmove(d, s, count);
+}
+
+int CALL_CONV T_memcmp (s1, s2, count)
+POINTER s1, s2;
+unsigned int count;
+{
+	if (count == 0)
+		return (0);
+	else
+		return(memcmp(s1, s2, count));
+}
+
+POINTER CALL_CONV T_malloc (size)
+unsigned int size;
+{
+	return((POINTER)PORT_Alloc(size == 0 ? 1 : size));
+}
+
+POINTER CALL_CONV T_realloc (p, size)
+POINTER p;
+unsigned int size;
+{
+	POINTER result;
+  
+	if (p == NULL_PTR)
+		return (T_malloc(size));
+
+	if ((result = (POINTER)PORT_Realloc(p, size == 0 ? 1 : size)) == NULL_PTR)
+		PORT_Free(p);
+  return (result);
+}
+
+void CALL_CONV T_free (p)
+POINTER p;
+{
+	if (p != NULL_PTR)
+		PORT_Free(p);
+}
+
+unsigned int CALL_CONV T_strlen(p)
+char *p;
+{
+    return PL_strlen(p);
+}
+
+void CALL_CONV T_strcpy(dest, src)
+char *dest;
+char *src;
+{
+    PL_strcpy(dest, src);
+}
+
+int CALL_CONV T_strcmp (a, b)
+char *a, *b;
+{
+  return (PL_strcmp (a, b));
+}

mozilla/security/nss/lib/freebl/ldvector.c

@@ -0,0 +1,196 @@
+/*
+ * ldvector.c - platform dependent DSO containing freebl implementation.
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ *
+ * $Id: ldvector.c,v 1.6 2003-02-27 01:31:13 nelsonb%netscape.com Exp $
+ */
+
+#include "loader.h"
+
+static const struct FREEBLVectorStr vector = {
+
+    sizeof vector,
+    FREEBL_VERSION,
+
+    RSA_NewKey,
+    RSA_PublicKeyOp,
+    RSA_PrivateKeyOp,
+    DSA_NewKey,
+    DSA_SignDigest,
+    DSA_VerifyDigest,
+    DSA_NewKeyFromSeed,
+    DSA_SignDigestWithSeed,
+    DH_GenParam,
+    DH_NewKey,
+    DH_Derive,
+    KEA_Derive,
+    KEA_Verify,
+    RC4_CreateContext,
+    RC4_DestroyContext,
+    RC4_Encrypt,
+    RC4_Decrypt,
+    RC2_CreateContext,
+    RC2_DestroyContext,
+    RC2_Encrypt,
+    RC2_Decrypt,
+    RC5_CreateContext,
+    RC5_DestroyContext,
+    RC5_Encrypt,
+    RC5_Decrypt,
+    DES_CreateContext,
+    DES_DestroyContext,
+    DES_Encrypt,
+    DES_Decrypt,
+    AES_CreateContext,
+    AES_DestroyContext,
+    AES_Encrypt,
+    AES_Decrypt,
+    MD5_Hash,
+    MD5_HashBuf,
+    MD5_NewContext,
+    MD5_DestroyContext,
+    MD5_Begin,
+    MD5_Update,
+    MD5_End,
+    MD5_FlattenSize,
+    MD5_Flatten,
+    MD5_Resurrect,
+    MD5_TraceState,
+    MD2_Hash,
+    MD2_NewContext,
+    MD2_DestroyContext,
+    MD2_Begin,
+    MD2_Update,
+    MD2_End,
+    MD2_FlattenSize,
+    MD2_Flatten,
+    MD2_Resurrect,
+    SHA1_Hash,
+    SHA1_HashBuf,
+    SHA1_NewContext,
+    SHA1_DestroyContext,
+    SHA1_Begin,
+    SHA1_Update,
+    SHA1_End,
+    SHA1_TraceState,
+    SHA1_FlattenSize,
+    SHA1_Flatten,
+    SHA1_Resurrect,
+    RNG_RNGInit,
+    RNG_RandomUpdate,
+    RNG_GenerateGlobalRandomBytes,
+    RNG_RNGShutdown,
+    PQG_ParamGen,
+    PQG_ParamGenSeedLen,
+    PQG_VerifyParams,
+
+    /* End of Version 3.001. */
+
+    RSA_PrivateKeyOpDoubleChecked,
+    RSA_PrivateKeyCheck,
+    BL_Cleanup,
+
+    /* End of Version 3.002. */
+
+    SHA256_NewContext,
+    SHA256_DestroyContext,
+    SHA256_Begin,
+    SHA256_Update,
+    SHA256_End,
+    SHA256_HashBuf,
+    SHA256_Hash,
+    SHA256_TraceState,
+    SHA256_FlattenSize,
+    SHA256_Flatten,
+    SHA256_Resurrect,
+
+    SHA512_NewContext,
+    SHA512_DestroyContext,
+    SHA512_Begin,
+    SHA512_Update,
+    SHA512_End,
+    SHA512_HashBuf,
+    SHA512_Hash,
+    SHA512_TraceState,
+    SHA512_FlattenSize,
+    SHA512_Flatten,
+    SHA512_Resurrect,
+
+    SHA384_NewContext,
+    SHA384_DestroyContext,
+    SHA384_Begin,
+    SHA384_Update,
+    SHA384_End,
+    SHA384_HashBuf,
+    SHA384_Hash,
+    SHA384_TraceState,
+    SHA384_FlattenSize,
+    SHA384_Flatten,
+    SHA384_Resurrect,
+
+    /* End of Version 3.003. */
+
+    AESKeyWrap_CreateContext,
+    AESKeyWrap_DestroyContext,
+    AESKeyWrap_Encrypt,
+    AESKeyWrap_Decrypt,
+
+    /* End of Version 3.004. */
+
+    BLAPI_SHVerify,
+    BLAPI_VerifySelf,
+
+    /* End of Version 3.005. */
+
+    EC_NewKey,
+    EC_NewKeyFromSeed,
+    EC_ValidatePublicKey,
+    ECDH_Derive,
+    ECDSA_SignDigest,
+    ECDSA_VerifyDigest,
+    ECDSA_SignDigestWithSeed,
+
+    /* End of Version 3.006. */
+};
+
+
+const FREEBLVector * 
+FREEBL_GetVector(void)
+{
+  return &vector;
+}
+

mozilla/security/nss/lib/freebl/loader.h

@@ -0,0 +1,386 @@
+/*
+ * loader.h - load platform dependent DSO containing freebl implementation.
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+ * Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Contributor(s):
+ *	Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ *
+ * $Id: loader.h,v 1.9 2003-02-27 01:31:14 nelsonb%netscape.com Exp $
+ */
+
+#ifndef _LOADER_H_
+#define _LOADER_H_ 1
+
+#include "blapi.h"
+
+#define FREEBL_VERSION 0x0306
+
+struct FREEBLVectorStr {
+
+  unsigned short length;  /* of this struct in bytes */
+  unsigned short version; /* of this struct. */
+
+  RSAPrivateKey * (* p_RSA_NewKey)(int         keySizeInBits,
+				 SECItem *   publicExponent);
+
+  SECStatus (* p_RSA_PublicKeyOp) (RSAPublicKey *   key,
+				 unsigned char *  output,
+				 const unsigned char *  input);
+
+  SECStatus (* p_RSA_PrivateKeyOp)(RSAPrivateKey *  key,
+				  unsigned char *  output,
+				  const unsigned char *  input);
+
+  SECStatus (* p_DSA_NewKey)(const PQGParams *    params, 
+		            DSAPrivateKey **      privKey);
+
+  SECStatus (* p_DSA_SignDigest)(DSAPrivateKey *   key,
+				SECItem *         signature,
+				const SECItem *   digest);
+
+  SECStatus (* p_DSA_VerifyDigest)(DSAPublicKey *  key,
+				  const SECItem *  signature,
+				  const SECItem *  digest);
+
+  SECStatus (* p_DSA_NewKeyFromSeed)(const PQGParams *params, 
+				     const unsigned char * seed,
+                                     DSAPrivateKey **privKey);
+
+  SECStatus (* p_DSA_SignDigestWithSeed)(DSAPrivateKey * key,
+				        SECItem *             signature,
+				        const SECItem *       digest,
+				        const unsigned char * seed);
+
+ SECStatus (* p_DH_GenParam)(int primeLen, DHParams ** params);
+
+ SECStatus (* p_DH_NewKey)(DHParams *           params, 
+                           DHPrivateKey **	privKey);
+
+ SECStatus (* p_DH_Derive)(SECItem *    publicValue, 
+		           SECItem *    prime, 
+			   SECItem *    privateValue, 
+			   SECItem *    derivedSecret,
+			   unsigned int maxOutBytes);
+
+ SECStatus (* p_KEA_Derive)(SECItem *prime, 
+                            SECItem *public1, 
+                            SECItem *public2, 
+			    SECItem *private1, 
+			    SECItem *private2,
+			    SECItem *derivedSecret);
+
+ PRBool (* p_KEA_Verify)(SECItem *Y, SECItem *prime, SECItem *subPrime);
+
+ RC4Context * (* p_RC4_CreateContext)(const unsigned char *key, int len);
+
+ void (* p_RC4_DestroyContext)(RC4Context *cx, PRBool freeit);
+
+ SECStatus (* p_RC4_Encrypt)(RC4Context *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ SECStatus (* p_RC4_Decrypt)(RC4Context *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ RC2Context * (* p_RC2_CreateContext)(const unsigned char *key, 
+                     unsigned int len, const unsigned char *iv, 
+		     int mode, unsigned effectiveKeyLen);
+
+ void (* p_RC2_DestroyContext)(RC2Context *cx, PRBool freeit);
+
+ SECStatus (* p_RC2_Encrypt)(RC2Context *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ SECStatus (* p_RC2_Decrypt)(RC2Context *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ RC5Context *(* p_RC5_CreateContext)(const SECItem *key, unsigned int rounds,
+                     unsigned int wordSize, const unsigned char *iv, int mode);
+
+ void (* p_RC5_DestroyContext)(RC5Context *cx, PRBool freeit);
+
+ SECStatus (* p_RC5_Encrypt)(RC5Context *cx, unsigned char *output,
+                            unsigned int *outputLen, unsigned int maxOutputLen,
+                            const unsigned char *input, unsigned int inputLen);
+
+ SECStatus (* p_RC5_Decrypt)(RC5Context *cx, unsigned char *output,
+                            unsigned int *outputLen, unsigned int maxOutputLen,
+                            const unsigned char *input, unsigned int inputLen);
+
+ DESContext *(* p_DES_CreateContext)(const unsigned char *key, 
+                                     const unsigned char *iv,
+				     int mode, PRBool encrypt);
+
+ void (* p_DES_DestroyContext)(DESContext *cx, PRBool freeit);
+
+ SECStatus (* p_DES_Encrypt)(DESContext *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ SECStatus (* p_DES_Decrypt)(DESContext *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ AESContext * (* p_AES_CreateContext)(const unsigned char *key, 
+                            const unsigned char *iv, 
+			    int mode, int encrypt, unsigned int keylen, 
+			    unsigned int blocklen);
+
+ void (* p_AES_DestroyContext)(AESContext *cx, PRBool freeit);
+
+ SECStatus (* p_AES_Encrypt)(AESContext *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ SECStatus (* p_AES_Decrypt)(AESContext *cx, unsigned char *output,
+			    unsigned int *outputLen, unsigned int maxOutputLen,
+			    const unsigned char *input, unsigned int inputLen);
+
+ SECStatus (* p_MD5_Hash)(unsigned char *dest, const char *src);
+
+ SECStatus (* p_MD5_HashBuf)(unsigned char *dest, const unsigned char *src,
+			     uint32 src_length);
+
+ MD5Context *(* p_MD5_NewContext)(void);
+
+ void (* p_MD5_DestroyContext)(MD5Context *cx, PRBool freeit);
+
+ void (* p_MD5_Begin)(MD5Context *cx);
+
+ void (* p_MD5_Update)(MD5Context *cx,
+		       const unsigned char *input, unsigned int inputLen);
+
+ void (* p_MD5_End)(MD5Context *cx, unsigned char *digest,
+		    unsigned int *digestLen, unsigned int maxDigestLen);
+
+ unsigned int (* p_MD5_FlattenSize)(MD5Context *cx);
+
+ SECStatus (* p_MD5_Flatten)(MD5Context *cx,unsigned char *space);
+
+ MD5Context * (* p_MD5_Resurrect)(unsigned char *space, void *arg);
+
+ void (* p_MD5_TraceState)(MD5Context *cx);
+
+ SECStatus (* p_MD2_Hash)(unsigned char *dest, const char *src);
+
+ MD2Context *(* p_MD2_NewContext)(void);
+
+ void (* p_MD2_DestroyContext)(MD2Context *cx, PRBool freeit);
+
+ void (* p_MD2_Begin)(MD2Context *cx);
+
+ void (* p_MD2_Update)(MD2Context *cx,
+		       const unsigned char *input, unsigned int inputLen);
+
+ void (* p_MD2_End)(MD2Context *cx, unsigned char *digest,
+		    unsigned int *digestLen, unsigned int maxDigestLen);
+
+ unsigned int (* p_MD2_FlattenSize)(MD2Context *cx);
+
+ SECStatus (* p_MD2_Flatten)(MD2Context *cx,unsigned char *space);
+
+ MD2Context * (* p_MD2_Resurrect)(unsigned char *space, void *arg);
+
+ SECStatus (* p_SHA1_Hash)(unsigned char *dest, const char *src);
+
+ SECStatus (* p_SHA1_HashBuf)(unsigned char *dest, const unsigned char *src,
+			      uint32 src_length);
+
+ SHA1Context *(* p_SHA1_NewContext)(void);
+
+ void (* p_SHA1_DestroyContext)(SHA1Context *cx, PRBool freeit);
+
+ void (* p_SHA1_Begin)(SHA1Context *cx);
+
+ void (* p_SHA1_Update)(SHA1Context *cx, const unsigned char *input,
+			unsigned int inputLen);
+
+ void (* p_SHA1_End)(SHA1Context *cx, unsigned char *digest,
+		     unsigned int *digestLen, unsigned int maxDigestLen);
+
+ void (* p_SHA1_TraceState)(SHA1Context *cx);
+
+ unsigned int (* p_SHA1_FlattenSize)(SHA1Context *cx);
+
+ SECStatus (* p_SHA1_Flatten)(SHA1Context *cx,unsigned char *space);
+
+ SHA1Context * (* p_SHA1_Resurrect)(unsigned char *space, void *arg);
+
+ SECStatus (* p_RNG_RNGInit)(void);
+
+ SECStatus (* p_RNG_RandomUpdate)(const void *data, size_t bytes);
+
+ SECStatus (* p_RNG_GenerateGlobalRandomBytes)(void *dest, size_t len);
+
+ void  (* p_RNG_RNGShutdown)(void);
+
+ SECStatus (* p_PQG_ParamGen)(unsigned int j, PQGParams **pParams,  
+	                      PQGVerify **pVfy);    
+
+ SECStatus (* p_PQG_ParamGenSeedLen)( unsigned int j, unsigned int seedBytes, 
+                                     PQGParams **pParams, PQGVerify **pVfy); 
+
+ SECStatus (* p_PQG_VerifyParams)(const PQGParams *params, 
+                                  const PQGVerify *vfy, SECStatus *result);
+
+  /* Version 3.001 came to here */
+
+  SECStatus (* p_RSA_PrivateKeyOpDoubleChecked)(RSAPrivateKey *key,
+                              unsigned char *output,
+                              const unsigned char *input);
+
+  SECStatus (* p_RSA_PrivateKeyCheck)(RSAPrivateKey *key);
+
+  void (* p_BL_Cleanup)(void);
+
+  /* Version 3.002 came to here */
+
+ SHA256Context *(* p_SHA256_NewContext)(void);
+ void (* p_SHA256_DestroyContext)(SHA256Context *cx, PRBool freeit);
+ void (* p_SHA256_Begin)(SHA256Context *cx);
+ void (* p_SHA256_Update)(SHA256Context *cx, const unsigned char *input,
+			unsigned int inputLen);
+ void (* p_SHA256_End)(SHA256Context *cx, unsigned char *digest,
+		     unsigned int *digestLen, unsigned int maxDigestLen);
+ SECStatus (* p_SHA256_HashBuf)(unsigned char *dest, const unsigned char *src,
+			      uint32 src_length);
+ SECStatus (* p_SHA256_Hash)(unsigned char *dest, const char *src);
+ void (* p_SHA256_TraceState)(SHA256Context *cx);
+ unsigned int (* p_SHA256_FlattenSize)(SHA256Context *cx);
+ SECStatus (* p_SHA256_Flatten)(SHA256Context *cx,unsigned char *space);
+ SHA256Context * (* p_SHA256_Resurrect)(unsigned char *space, void *arg);
+
+ SHA512Context *(* p_SHA512_NewContext)(void);
+ void (* p_SHA512_DestroyContext)(SHA512Context *cx, PRBool freeit);
+ void (* p_SHA512_Begin)(SHA512Context *cx);
+ void (* p_SHA512_Update)(SHA512Context *cx, const unsigned char *input,
+			unsigned int inputLen);
+ void (* p_SHA512_End)(SHA512Context *cx, unsigned char *digest,
+		     unsigned int *digestLen, unsigned int maxDigestLen);
+ SECStatus (* p_SHA512_HashBuf)(unsigned char *dest, const unsigned char *src,
+			      uint32 src_length);
+ SECStatus (* p_SHA512_Hash)(unsigned char *dest, const char *src);
+ void (* p_SHA512_TraceState)(SHA512Context *cx);
+ unsigned int (* p_SHA512_FlattenSize)(SHA512Context *cx);
+ SECStatus (* p_SHA512_Flatten)(SHA512Context *cx,unsigned char *space);
+ SHA512Context * (* p_SHA512_Resurrect)(unsigned char *space, void *arg);
+
+ SHA384Context *(* p_SHA384_NewContext)(void);
+ void (* p_SHA384_DestroyContext)(SHA384Context *cx, PRBool freeit);
+ void (* p_SHA384_Begin)(SHA384Context *cx);
+ void (* p_SHA384_Update)(SHA384Context *cx, const unsigned char *input,
+			unsigned int inputLen);
+ void (* p_SHA384_End)(SHA384Context *cx, unsigned char *digest,
+		     unsigned int *digestLen, unsigned int maxDigestLen);
+ SECStatus (* p_SHA384_HashBuf)(unsigned char *dest, const unsigned char *src,
+			      uint32 src_length);
+ SECStatus (* p_SHA384_Hash)(unsigned char *dest, const char *src);
+ void (* p_SHA384_TraceState)(SHA384Context *cx);
+ unsigned int (* p_SHA384_FlattenSize)(SHA384Context *cx);
+ SECStatus (* p_SHA384_Flatten)(SHA384Context *cx,unsigned char *space);
+ SHA384Context * (* p_SHA384_Resurrect)(unsigned char *space, void *arg);
+
+  /* Version 3.003 came to here */
+
+ AESKeyWrapContext * (* p_AESKeyWrap_CreateContext)(const unsigned char *key, 
+                   const unsigned char *iv, int encrypt, unsigned int keylen);
+
+ void (* p_AESKeyWrap_DestroyContext)(AESKeyWrapContext *cx, PRBool freeit);
+
+ SECStatus (* p_AESKeyWrap_Encrypt)(AESKeyWrapContext *cx, 
+            unsigned char *output,
+            unsigned int *outputLen, unsigned int maxOutputLen,
+            const unsigned char *input, unsigned int inputLen);
+
+ SECStatus (* p_AESKeyWrap_Decrypt)(AESKeyWrapContext *cx, 
+            unsigned char *output,
+            unsigned int *outputLen, unsigned int maxOutputLen,
+            const unsigned char *input, unsigned int inputLen);
+
+  /* Version 3.004 came to here */
+
+ PRBool (*p_BLAPI_SHVerify)(const char *name, PRFuncPtr addr);
+ PRBool (*p_BLAPI_VerifySelf)(const char *name);
+
+  /* Version 3.005 came to here */
+
+ SECStatus (* p_EC_NewKey)(ECParams *           params, 
+                           ECPrivateKey **	privKey);
+
+ SECStatus (* p_EC_NewKeyFromSeed)(ECParams *   params, 
+                             ECPrivateKey **	privKey,
+                             const unsigned char * seed,
+                             int                seedlen);
+
+ SECStatus (* p_EC_ValidatePublicKey)(ECParams *   params, 
+			     SECItem *	        publicValue);
+
+ SECStatus (* p_ECDH_Derive)(SECItem *          publicValue, 
+                             ECParams *         params,
+                             SECItem *          privateValue,
+                             PRBool             withCofactor,
+                             SECItem *          derivedSecret);
+
+ SECStatus (* p_ECDSA_SignDigest)(ECPrivateKey * key,
+                             SECItem *          signature,
+                             const SECItem *    digest);
+
+ SECStatus (* p_ECDSA_VerifyDigest)(ECPublicKey * key,
+                             const SECItem *    signature,
+                             const SECItem *    digest);
+
+ SECStatus (* p_ECDSA_SignDigestWithSeed)(ECPrivateKey * key,
+                             SECItem *          signature,
+                             const SECItem *    digest,
+                             const unsigned char * seed,
+                             const int          seedlen);
+
+  /* Version 3.006 came to here */
+
+};
+
+typedef struct FREEBLVectorStr FREEBLVector;
+
+SEC_BEGIN_PROTOS
+
+typedef const FREEBLVector * FREEBLGetVectorFn(void);
+
+extern FREEBLGetVectorFn FREEBL_GetVector;
+
+SEC_END_PROTOS
+
+#endif

mozilla/security/nss/lib/freebl/mac_rand.c

@@ -0,0 +1,315 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#ifdef notdef
+#include "xp_core.h"
+#include "xp_file.h"
+#endif
+#include "secrng.h"
+#include "mcom_db.h"
+#ifdef XP_MAC
+#include <Events.h>
+#include <OSUtils.h>
+#include <QDOffscreen.h>
+#include <PPCToolbox.h>
+#include <Processes.h>
+#include <LowMem.h>
+#include <Scrap.h>
+
+/* Static prototypes */
+static size_t CopyLowBits(void *dst, size_t dstlen, void *src, size_t srclen);
+void FE_ReadScreen();
+
+static size_t CopyLowBits(void *dst, size_t dstlen, void *src, size_t srclen)
+{
+    union endianness {
+        int32 i;
+        char c[4];
+    } u;
+
+    if (srclen <= dstlen) {
+        memcpy(dst, src, srclen);
+        return srclen;
+    }
+    u.i = 0x01020304;
+    if (u.c[0] == 0x01) {
+        /* big-endian case */
+        memcpy(dst, (char*)src + (srclen - dstlen), dstlen);
+    } else {
+        /* little-endian case */
+        memcpy(dst, src, dstlen);
+    }
+    return dstlen;
+}
+
+size_t RNG_GetNoise(void *buf, size_t maxbytes)
+{
+    UnsignedWide microTickCount;
+    Microseconds(&microTickCount);
+    return CopyLowBits(buf, maxbytes,  &microTickCount, sizeof(microTickCount));
+}
+
+void RNG_FileForRNG(const char *filename)
+{   
+    unsigned char buffer[BUFSIZ];
+    size_t bytes;
+#ifdef notdef /*sigh*/
+    XP_File file;
+	unsigned long totalFileBytes = 0;
+
+	if (filename == NULL)	/* For now, read in global history if filename is null */
+		file = XP_FileOpen(NULL, xpGlobalHistory,XP_FILE_READ_BIN);
+	else
+		file = XP_FileOpen(NULL, xpURL,XP_FILE_READ_BIN);
+    if (file != NULL) {
+        for (;;) {
+            bytes = XP_FileRead(buffer, sizeof(buffer), file);
+            if (bytes == 0) break;
+            RNG_RandomUpdate( buffer, bytes);
+            totalFileBytes += bytes;
+            if (totalFileBytes > 100*1024) break;	/* No more than 100 K */
+        }
+		XP_FileClose(file);
+    }
+#endif
+    /*
+     * Pass yet another snapshot of our highest resolution clock into
+     * the hash function.
+     */
+    bytes = RNG_GetNoise(buffer, sizeof(buffer));
+    RNG_RandomUpdate(buffer, sizeof(buffer));
+}
+
+void RNG_SystemInfoForRNG()
+{
+/* Time */
+	{
+		unsigned long sec;
+		size_t bytes;
+		GetDateTime(&sec);	/* Current time since 1970 */
+		RNG_RandomUpdate( &sec, sizeof(sec));
+	    bytes = RNG_GetNoise(&sec, sizeof(sec));
+	    RNG_RandomUpdate(&sec, bytes);
+    }
+/* User specific variables */
+	{
+		MachineLocation loc;
+		ReadLocation(&loc);
+		RNG_RandomUpdate( &loc, sizeof(loc));
+	}
+#if !TARGET_CARBON
+/* User name */
+	{
+		unsigned long userRef;
+		Str32 userName;
+		GetDefaultUser(&userRef, userName);
+		RNG_RandomUpdate( &userRef, sizeof(userRef));
+		RNG_RandomUpdate( userName, sizeof(userName));
+	}
+#endif
+/* Mouse location */
+	{
+		Point mouseLoc;
+		GetMouse(&mouseLoc);
+		RNG_RandomUpdate( &mouseLoc, sizeof(mouseLoc));
+	}
+/* Keyboard time threshold */
+	{
+		SInt16 keyTresh = LMGetKeyThresh();
+		RNG_RandomUpdate( &keyTresh, sizeof(keyTresh));
+	}
+/* Last key pressed */
+	{
+		SInt8 keyLast;
+		keyLast = LMGetKbdLast();
+		RNG_RandomUpdate( &keyLast, sizeof(keyLast));
+	}
+/* Volume */
+	{
+		UInt8 volume = LMGetSdVolume();
+		RNG_RandomUpdate( &volume, sizeof(volume));
+	}
+#if !TARGET_CARBON
+/* Current directory */
+	{
+		SInt32 dir = LMGetCurDirStore();
+		RNG_RandomUpdate( &dir, sizeof(dir));
+	}
+#endif
+/* Process information about all the processes in the machine */
+	{
+		ProcessSerialNumber 	process;
+		ProcessInfoRec pi;
+	
+		process.highLongOfPSN = process.lowLongOfPSN  = kNoProcess;
+		
+		while (GetNextProcess(&process) == noErr)
+		{
+			FSSpec fileSpec;
+			pi.processInfoLength = sizeof(ProcessInfoRec);
+			pi.processName = NULL;
+			pi.processAppSpec = &fileSpec;
+			GetProcessInformation(&process, &pi);
+			RNG_RandomUpdate( &pi, sizeof(pi));
+			RNG_RandomUpdate( &fileSpec, sizeof(fileSpec));
+		}
+	}
+	
+#if !TARGET_CARBON
+/* Heap */
+	{
+		THz zone = LMGetTheZone();
+		RNG_RandomUpdate( &zone, sizeof(zone));
+	}
+#endif
+	
+/* Screen */
+	{
+		GDHandle h = GetMainDevice();		/* GDHandle is **GDevice */
+		RNG_RandomUpdate( *h, sizeof(GDevice));
+	}
+
+#if !TARGET_CARBON
+/* Scrap size */
+	{
+		SInt32 scrapSize = LMGetScrapSize();
+		RNG_RandomUpdate( &scrapSize, sizeof(scrapSize));
+	}
+/* Scrap count */
+	{
+		SInt16 scrapCount = LMGetScrapCount();
+		RNG_RandomUpdate( &scrapCount, sizeof(scrapCount));
+	}
+#else
+	{
+	    ScrapRef scrap;
+        if (GetCurrentScrap(&scrap) == noErr) {
+            UInt32 flavorCount;
+            if (GetScrapFlavorCount(scrap, &flavorCount) == noErr) {
+                ScrapFlavorInfo* flavorInfo = (ScrapFlavorInfo*) malloc(flavorCount * sizeof(ScrapFlavorInfo));
+                if (flavorInfo != NULL) {
+                    if (GetScrapFlavorInfoList(scrap, &flavorCount, flavorInfo) == noErr) {
+                        UInt32 i;
+                        RNG_RandomUpdate(&flavorCount, sizeof(flavorCount));
+                        for (i = 0; i < flavorCount; ++i) {
+                            Size flavorSize;
+                            if (GetScrapFlavorSize(scrap, flavorInfo[i].flavorType, &flavorSize) == noErr)
+                                RNG_RandomUpdate(&flavorSize, sizeof(flavorSize));
+                        }
+                    }
+                    free(flavorInfo);
+                }
+            }
+        }
+    }
+#endif
+/*  File stuff, last modified, etc. */
+	{
+		HParamBlockRec			pb;
+		GetVolParmsInfoBuffer	volInfo;
+		pb.ioParam.ioVRefNum = 0;
+		pb.ioParam.ioNamePtr = nil;
+		pb.ioParam.ioBuffer = (Ptr) &volInfo;
+		pb.ioParam.ioReqCount = sizeof(volInfo);
+		PBHGetVolParmsSync(&pb);
+		RNG_RandomUpdate( &volInfo, sizeof(volInfo));
+	}
+#if !TARGET_CARBON
+/* Event queue */
+	{
+		EvQElPtr		eventQ;
+		for (eventQ = (EvQElPtr) LMGetEventQueue()->qHead; 
+				eventQ; 
+				eventQ = (EvQElPtr)eventQ->qLink)
+			RNG_RandomUpdate( &eventQ->evtQWhat, sizeof(EventRecord));
+	}
+#endif
+	FE_ReadScreen();
+	RNG_FileForRNG(NULL);
+}
+
+void FE_ReadScreen()
+{
+	UInt16				coords[4];
+	PixMapHandle 		pmap;
+	GDHandle			gh;	
+	UInt16				screenHeight;
+	UInt16				screenWidth;			/* just what they say */
+	UInt32				bytesToRead;			/* number of bytes we're giving */
+	UInt32				offset;					/* offset into the graphics buffer */
+	UInt16				rowBytes;
+	UInt32				rowsToRead;
+	float				bytesPerPixel;			/* dependent on buffer depth */
+	Ptr					p;						/* temporary */
+	UInt16				x, y, w, h;
+
+	gh = LMGetMainDevice();
+	if ( !gh )
+		return;
+	pmap = (**gh).gdPMap;
+	if ( !pmap )
+		return;
+		
+	RNG_GenerateGlobalRandomBytes( coords, sizeof( coords ) );
+	
+	/* make x and y inside the screen rect */	
+	screenHeight = (**pmap).bounds.bottom - (**pmap).bounds.top;
+	screenWidth = (**pmap).bounds.right - (**pmap).bounds.left;
+	x = coords[0] % screenWidth;
+	y = coords[1] % screenHeight;
+	w = ( coords[2] & 0x7F ) | 0x40;		/* Make sure that w is in the range 64..128 */
+	h = ( coords[3] & 0x7F ) | 0x40;		/* same for h */
+
+	bytesPerPixel = (**pmap).pixelSize / 8;
+	rowBytes = (**pmap).rowBytes & 0x7FFF;
+
+	/* starting address */
+	offset = ( rowBytes * y ) + (UInt32)( (float)x * bytesPerPixel );
+	
+	/* don't read past the end of the pixmap's rowbytes */
+	bytesToRead = PR_MIN(	(UInt32)( w * bytesPerPixel ),
+						(UInt32)( rowBytes - ( x * bytesPerPixel ) ) );
+
+	/* don't read past the end of the graphics device pixmap */
+	rowsToRead = PR_MIN(	h, 
+						( screenHeight - y ) );
+	
+	p = GetPixBaseAddr( pmap ) + offset;
+	
+	while ( rowsToRead-- )
+	{
+		RNG_RandomUpdate( p, bytesToRead );
+		p += rowBytes;
+	}
+}
+#endif

mozilla/security/nss/lib/freebl/manifest.mn

@@ -0,0 +1,146 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+# Sun Microsystems, Inc. All Rights Reserved.
+#
+# Contributor(s):
+#      Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+CORE_DEPTH = ../../..
+
+MODULE = nss
+
+ifndef FREEBL_RECURSIVE_BUILD
+  LIBRARY_NAME = freebl
+else
+  ifdef USE_PURE_32
+    CORE_DEPTH = ../../../..
+    LIBRARY_NAME = freebl_pure32
+  else
+    LIBRARY_NAME = freebl_hybrid
+  endif
+endif
+
+# same version as rest of freebl
+LIBRARY_VERSION = _3
+
+DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\"
+
+REQUIRES = 
+
+EXPORTS = \
+	blapi.h \
+	blapit.h \
+	secrng.h \
+	shsign.h \
+	$(NULL)
+
+PRIVATE_EXPORTS = \
+	secmpi.h \
+	ec.h \
+	$(NULL)
+
+MPI_HDRS = mpi-config.h mpi.h mpi-priv.h mplogic.h mpprime.h logtab.h mp_gf2m.h
+MPI_SRCS = mpprime.c mpmontg.c mplogic.c mpi.c mp_gf2m.c
+
+ifdef MOZILLA_BSAFE_BUILD
+CSRCS = \
+	fblstdlib.c \
+	sha_fast.c \
+	md2.c \
+	md5.c \
+	blapi_bsf.c \
+	$(MPI_SRCS) \
+	dh.c \
+	$(NULL)
+else
+CSRCS = \
+	ldvector.c \
+	prng_fips1861.c \
+	sysrand.c \
+	sha_fast.c \
+	md2.c \
+	md5.c \
+	sha512.c \
+	alg2268.c \
+	arcfour.c \
+	arcfive.c \
+	desblapi.c \
+	des.c \
+	rijndael.c \
+	aeskeywrap.c \
+	dh.c \
+	ec.c \
+	GFp_ecl.c \
+	GF2m_ecl.c \
+	pqg.c \
+	dsa.c \
+	rsa.c \
+	shvfy.c \
+	$(MPI_SRCS) \
+	$(NULL)
+endif
+
+ALL_CSRCS := $(CSRCS)
+
+ALL_HDRS =  \
+	blapi.h \
+	blapit.h \
+	des.h \
+	ec.h \
+	GFp_ecl.h \
+	GF2m_ecl.h \
+	loader.h \
+	rijndael.h \
+	secmpi.h \
+	sha.h \
+	sha_fast.h \
+	shsign.h \
+	vis_proto.h \
+	$(NULL)
+
+ifdef AES_GEN_TBL
+DEFINES += -DRIJNDAEL_GENERATE_TABLES
+else 
+ifdef AES_GEN_TBL_M
+DEFINES += -DRIJNDAEL_GENERATE_TABLES_MACRO
+else
+ifdef AES_GEN_VAL
+DEFINES += -DRIJNDAEL_GENERATE_VALUES
+else
+ifdef AES_GEN_VAL_M
+DEFINES += -DRIJNDAEL_GENERATE_VALUES_MACRO
+else
+DEFINES += -DRIJNDAEL_INCLUDE_TABLES
+endif
+endif
+endif
+endif

mozilla/security/nss/lib/freebl/mapfile.Solaris

@@ -0,0 +1,39 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+libfreebl_3.so {
+	global:
+		FREEBL_GetVector;
+	local:
+		*;
+};

mozilla/webtools/partytool/.htaccess

@@ -1,5 +0,0 @@
-<IfModule mod_rewrite.c>
-    RewriteEngine on
-    RewriteRule    ^$    webroot/    [L]
-    RewriteRule    (.*) webroot/$1    [L]
- </IfModule>

mozilla/webtools/partytool/README

@@ -1,25 +0,0 @@
-SERVER REQUIREMENTS
-- Apache 1.3 or higher with mod_rewrite enabled
-- PHP 4.3.2 or higher
-- CakePHP 1.1.7.3363 or higher
-- MySQL (preferred) or PostgreSQL
-
-INSTALLATION:
-- All files accompanying this README should be placed into the /app directory of
-  your CakePHP install. Once complete, you should have a directory structure similar
-  to the following where (/) is the base of your domain:
-  /
-    app/
-      config/
-      controllers/
-      models/
-      webroot/
-      ...
-    cake/
-    vendors/
-
-- Import the database schema (/app/config/dist.sql) into your database
-- Rename database.dist.php to database.php and edit the file to reflect your
-  database configuration
-- Rename bootstrap.dist.php to bootstrap.php and follow the editing instructions
-  within. All fields except APP_* and MAX_YEAR are optional.

mozilla/webtools/partytool/app_controller.php

@@ -1,4 +0,0 @@
-<?php
-class AppController extends Controller {
-}
-?>

mozilla/webtools/partytool/app_model.php

@@ -1,4 +0,0 @@
-<?php
-class AppModel extends Model {
-}
-?>

mozilla/webtools/partytool/config/acl.ini.php

@@ -1,76 +0,0 @@
-;<?php die() ?>
-; SVN FILE: $Id: acl.ini.php,v 1.3 2006-10-08 03:39:21 reed%reedloden.com Exp $
-;/**
-; * Short description for file.
-; *
-; *
-; * PHP versions 4 and 5
-; *
-; * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
-; * Copyright (c)	2006, Cake Software Foundation, Inc.
-; *							1785 E. Sahara Avenue, Suite 490-204
-; *							Las Vegas, Nevada 89104
-; *
-; *  Licensed under The MIT License
-; *  Redistributions of files must retain the above copyright notice.
-; *
-; * @filesource
-; * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
-; * @link			http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
-; * @package		cake
-; * @subpackage	cake.app.config
-; * @since			CakePHP v 0.10.0.1076
-; * @version		$Revision: 1.3 $
-; * @modifiedby	$LastChangedBy: phpnut $
-; * @lastmodified	$Date: 2006-10-08 03:39:21 $
-; * @license		http://www.opensource.org/licenses/mit-license.php The MIT License
-; */
-
-; acl.ini.php - Cake ACL Configuration
-; ---------------------------------------------------------------------
-; Use this file to specify user permissions.
-; aco = access control object (something in your application)
-; aro = access request object (something requesting access)
-;
-; User records are added as follows:
-;
-; [uid]
-; groups = group1, group2, group3
-; allow = aco1, aco2, aco3
-; deny = aco4, aco5, aco6
-;
-; Group records are added in a similar manner:
-;
-; [gid]
-; allow = aco1, aco2, aco3
-; deny = aco4, aco5, aco6
-;
-; The allow, deny, and groups sections are all optional.
-; NOTE: groups names *cannot* ever be the same as usernames!
-;
-; ACL permissions are checked in the following order:
-; 1. Check for user denies (and DENY if specified)
-; 2. Check for user allows (and ALLOW if specified)
-; 3. Gather user's groups
-; 4. Check group denies (and DENY if specified)
-; 5. Check group allows (and ALLOW if specified)
-; 6. If no aro, aco, or group information is found, DENY
-;
-; ---------------------------------------------------------------------
-
-;-------------------------------------
-;Users
-;-------------------------------------
-
-[username-goes-here]
-groups = group1, group2
-deny = aco1, aco2
-allow = aco3, aco4
-
-;-------------------------------------
-;Groups
-;-------------------------------------
-
-[groupname-goes-here]
-deny = aco5, aco6
-allow = aco7, aco8

mozilla/webtools/partytool/config/bootstrap.dist.php

@@ -1,32 +0,0 @@
-<?php
-/* REQUIRED - APP_NAME is used on all <title>s and mail names/subjects. APP_BASE
- * should be a FQDN with protocol minus the trailing slash e.g. http://example.tld/party 
- */
-define('APP_NAME', '');
-define('APP_EMAIL', '');
-define('APP_BASE', '');
-
-/* You should specify a Google Map API key here. Without it, all mapping features
- * will be disabled. To obtain a key, visit http://www.google.com/apis/maps/
- */ 
-define('GMAP_API_KEY', '');
-
-/* The search API key is used to generate spelling suggestions for locations not
- * not found during a Geocode operation. You may obtain a key here: http://code.google.com/apis/soapsearch/
- */
-define('GSEARCH_API_KEY', '');
-
-/* The maximum year shown for party registrations */
-define('MAX_YEAR', 2007);
-
-/* The Flickr API is used to show photos of each party on the individual party 
- * pages and home page. See http://flickr.com/services/api/keys/ to obtain a key
- */
-define('FLICKR_API_KEY', '');
-
-/* The tag prefix is used to limit the results returned to a specific party.
- * e.g. any photo tagged with FirefoxParty11 will be shown on party 11's page.
- * Photos tagged with only the prefix are shown on the front page (so choose wisely! ;) ).
- */
-define('FLICKR_TAG_PREFIX', '');
-?>

mozilla/webtools/partytool/config/core.php

@@ -1,147 +0,0 @@
-<?php
-/* SVN FILE: $Id: core.php,v 1.4 2006-10-08 03:39:21 reed%reedloden.com Exp $ */
-/**
- * This is core configuration file.
- *
- * Use it to configure core behaviour ofCake.
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c)	2006, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package			cake
- * @subpackage		cake.app.config
- * @since			CakePHP v 0.2.9
- * @version			$Revision: 1.4 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2006-10-08 03:39:21 $
- * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-/**
- * If you do not have mod rewrite on your system
- * or if you prefer to use CakePHP pretty urls.
- * uncomment the line below.
- * Note: If you do have mod rewrite but prefer the
- * CakePHP pretty urls, you also have to remove the
- * .htaccess files
- * release/.htaccess
- * release/app/.htaccess
- * release/app/webroot/.htaccess
- */
-//	define ('BASE_URL', env('SCRIPT_NAME'));
-/**
- * Set debug level here:
- * - 0: production
- * - 1: development
- * - 2: full debug with sql
- * - 3: full debug with sql and dump of the current object
- *
- * In production, the "flash messages" redirect after a time interval.
- * With the other debug levels you get to click the "flash message" to continue.
- *
- */
-	define('DEBUG', 0);
-/**
- * Turn of caching checking wide.
- * You must still use the controller var cacheAction inside you controller class.
- * You can either set it controller wide, or in each controller method.
- * use var $cacheAction = true; or in the controller method $this->cacheAction = true;
- */
-	define('CACHE_CHECK', false);
-/**
- * Error constant. Used for differentiating error logging and debugging.
- * Currently PHP supports LOG_DEBUG
- */
-	define('LOG_ERROR', 2);
-/**
- * CakePHP includes 3 types of session saves
- * database or file. Set this to your preferred method.
- * If you want to use your own save handler place it in
- * app/config/name.php DO NOT USE file or database as the name.
- * and use just the name portion below.
- *
- * Setting this to cake will save files to /cakedistro/tmp directory
- * Setting it to php will use the php default save path
- * Setting it to database will use the database
- *
- *
- */
-	define('CAKE_SESSION_SAVE', 'database');
-/**
- * If using you own table name for storing sessions
- * set the table name here.
- * DO NOT INCLUDE PREFIX IF YOU HAVE SET ONE IN database.php
- *
- */
-	define('CAKE_SESSION_TABLE', 'sessions');
-/**
- * Set a random string of used in session.
- *
- */
-	define('CAKE_SESSION_STRING', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
-/**
- * Set the name of session cookie
- *
- */
-	define('CAKE_SESSION_COOKIE', 'sess');
-/**
- * Set level of Cake security.
- *
- */
-	define('CAKE_SECURITY', 'high');
-/**
- * Set Cake Session time out.
- * If CAKE_SECURITY define is set
- * high: multiplied by 10
- * medium: is multiplied by 100
- * low is: multiplied by 300
- *
- *  Number below is seconds.
- */
-	define('CAKE_SESSION_TIMEOUT', '120');
-/**
- * Uncomment the define below to use cake built in admin routes.
- * You can set this value to anything you want.
- * All methods related to the admin route should be prefixed with the
- * name you set CAKE_ADMIN to.
- * For example: admin_index, admin_edit
- */
-//	define('CAKE_ADMIN', 'admin');
-/**
- *  The define below is used to turn cake built webservices
- *  on or off. Default setting is off.
- */
-	define('WEBSERVICES', 'off');
-/**
- * Compress output CSS (removing comments, whitespace, repeating tags etc.)
- * This requires a/var/cache directory to be writable by the web server (caching).
- * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use Controller::cssTag().
- */
-	define('COMPRESS_CSS', false);
-/**
- * If set to true, helpers would output data instead of returning it.
- */
-	define('AUTO_OUTPUT', false);
-/**
- * If set to false, session would not automatically be started.
- */
-	define('AUTO_SESSION', true);
-/**
- * Set the max size of file to use md5() .
- */
-	define('MAX_MD5SIZE', (5 * 1024) * 1024);
-/**
- * To use Access Control Lists with Cake...
- */
-	define('ACL_CLASSNAME', 'DB_ACL');
-	define('ACL_FILENAME', 'dbacl' . DS . 'db_acl');
-?>

mozilla/webtools/partytool/config/database.dist.php

@@ -1,11 +0,0 @@
-<?php
-
-class DATABASE_CONFIG {
-  var $default = array('driver' => 'mysql',
-                       'connect' => 'mysql_connect',
-                       'host' => 'localhost',
-                       'login' => '',
-                       'password' => '',
-                       'database' => '');
-}
-?>

mozilla/webtools/partytool/config/inflections.php

@@ -1,72 +0,0 @@
-<?php
-/* SVN FILE: $Id: inflections.php,v 1.3 2006-10-08 03:39:21 reed%reedloden.com Exp $ */
-/**
- * Custom Inflected Words.
- *
- * This file is used to hold words that are not matched in the normail Inflector::pluralize() and
- * Inflector::singularize()
- *
- * PHP versions 4 and %
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c)	2006, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package			cake
- * @subpackage		cake.app.config
- * @since			CakePHP v 1.0.0.2312
- * @version			$Revision: 1.3 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2006-10-08 03:39:21 $
- * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-/**
- * This is a key => value array of regex used to match words.
- * If key matches then the value is returned.
- *
- *  $pluralRules = array('/(s)tatus$/i' => '\1\2tatuses', '/^(ox)$/i' => '\1\2en', '/([m|l])ouse$/i' => '\1ice');
- */
-	$pluralRules = array();
-/**
- * This is a key only array of plural words that should not be inflected.
- * Notice the last comma
- *
- * $uninflectedPlural = array('.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox');
- */
-	$uninflectedPlural = array();
-/**
- * This is a key => value array of plural irregular words.
- * If key matches then the value is returned.
- *
- *  $irregularPlural = array('atlas' => 'atlases', 'beef' => 'beefs', 'brother' => 'brothers')
- */
-	$irregularPlural = array();
-/**
- * This is a key => value array of regex used to match words.
- * If key matches then the value is returned.
- *
- *  $singularRules = array('/(s)tatuses$/i' => '\1\2tatus', '/(matr)ices$/i' =>'\1ix','/(vert|ind)ices$/i')
- */
-	$singularRules = array();
-/**
- * This is a key only array of singular words that should not be inflected.
- * You should not have to change this value below if you do change it use same format
- * as the $uninflectedPlural above.
- */
-	$uninflectedSingular = $uninflectedPlural;
-/**
- * This is a key => value array of singular irregular words.
- * Most of the time this will be a reverse of the above $irregularPlural array
- * You should not have to change this value below if you do change it use same format
- *
- * $irregularSingular = array('atlases' => 'atlas', 'beefs' => 'beef', 'brothers' => 'brother')
- */
-	$irregularSingular = array_flip($irregularPlural);
-?>

mozilla/webtools/partytool/config/routes.php

@@ -1,43 +0,0 @@
-<?php
-/* SVN FILE: $Id: routes.php,v 1.5 2006-10-10 20:18:59 reed%reedloden.com Exp $ */
-/**
- * Short description for file.
- *
- * In this file, you set up routes to your controllers and their actions.
- * Routes are very important mechanism that allows you to freely connect
- * different urls to chosen controllers and their actions (functions).
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c)	2006, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package			cake
- * @subpackage		cake.app.config
- * @since			CakePHP v 0.2.9
- * @version			$Revision: 1.5 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2006-10-10 20:18:59 $
- * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-/**
- * Here, we are connecting '/' (base path) to controller called 'Pages',
- * its action called 'display', and we pass a param to select the view file
- * to use (in this case, /app/views/pages/home.thtml)...
- */
-  $Route->connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
-/**
- * ...and connect the rest of 'Pages' controller's urls.
- */
-  $Route->connect('/pages/edit', array('controller' => 'pages', 'action' => 'edit'));
-  $Route->connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
-  $Route->connect('/privacy-policy', array('controller' => 'pages', 'action' => 'privacy'));
-?>

mozilla/webtools/partytool/config/sql/dist.sql

@@ -1,80 +0,0 @@
-CREATE TABLE `comments` (
-  `id` int(10) NOT NULL auto_increment,
-  `assoc` int(10) NOT NULL default '0',
-  `owner` int(10) NOT NULL default '0',
-  `time` int(15) NOT NULL default '0',
-  `text` text collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `guests` (
-  `id` int(10) NOT NULL auto_increment,
-  `pid` int(10) NOT NULL default '0',
-  `uid` int(10) NOT NULL default '0',
-  `invited` tinyint(1) NOT NULL default '1',
-  PRIMARY KEY  (`id`),
-  KEY `pid` (`pid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `pages` (
-  `id` int(10) NOT NULL auto_increment,
-  `text` text collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `pages` (`id`, `text`) VALUES (1, '<h2>Join the Fun!</h2>\n<p>All over the world, we're celebrating the launch of Firefox 2. Join the fun by hosting or attending a party. We're targeting the weekend of October 27th for the shared celebration, but if you're hosting, you make the call.</p>\n\n<p>To join the fun, <a href="/users/register">register</a> for a Firefox Party account, and sign up to host or attend.</p>\n\n<p style="border: 1px solid #555; background: #faffd4; padding: 5px; font-weight: bold">Be one of the first 50 party hosts registered and get three extra launch exclusive t-shirts with your purchase of the <a href="">Firefox 2 Party Pack</a>.  We're selling the party packs and shirts at cost, so it's a great deal, and for parties with unusually large attendance, we'll be sending out additional swag for door prizes and other give-aways. Stay tuned for updates!</p>');
-INSERT INTO `pages` (`id`, `text`) VALUES (2, '1162007940');
-
-CREATE TABLE `parties` (
-  `id` int(10) NOT NULL auto_increment,
-  `owner` int(10) NOT NULL default '0',
-  `name` tinytext collate utf8_unicode_ci NOT NULL,
-  `vname` tinytext collate utf8_unicode_ci NOT NULL,
-  `address` tinytext collate utf8_unicode_ci NOT NULL,
-  `tz` int(2) NOT NULL default '0',
-  `website` text collate utf8_unicode_ci NOT NULL,
-  `notes` text collate utf8_unicode_ci NOT NULL,
-  `date` int(10) NOT NULL default '0',
-  `duration` tinyint(2) NOT NULL default '2',
-  `confirmed` tinyint(1) NOT NULL default '1',
-  `canceled` tinyint(1) NOT NULL default '0',
-  `guestcomments` tinyint(1) NOT NULL default '0',
-  `inviteonly` tinyint(1) NOT NULL default '0',
-  `invitecode` tinytext collate utf8_unicode_ci NOT NULL,
-  `lat` float NOT NULL default '0',
-  `long` float NOT NULL default '0',
-  `zoom` tinyint(2) NOT NULL default '1',
-  `useflickr` tinyint(1) NOT NULL default '0',
-  `flickrperms` tinyint(1) NOT NULL default '0',
-  `flickrid` tinytext collate utf8_unicode_ci NOT NULL,
-  `flickrusr` tinytext collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `sessions` (
-  `id` varchar(255) character set latin1 NOT NULL default '',
-  `data` text character set latin1,
-  `expires` int(11) default NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `users` (
-  `id` int(10) NOT NULL auto_increment,
-  `role` tinyint(1) NOT NULL default '0',
-  `email` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `active` varchar(10) collate utf8_unicode_ci NOT NULL default '0',
-  `password` varchar(75) collate utf8_unicode_ci NOT NULL default '',
-  `salt` varchar(9) collate utf8_unicode_ci NOT NULL default '',
-  `name` tinytext collate utf8_unicode_ci NOT NULL,
-  `location` tinytext collate utf8_unicode_ci NOT NULL,
-  `tz` tinyint(2) NOT NULL default '0',
-  `website` text collate utf8_unicode_ci NOT NULL,
-  `lat` float NOT NULL default '0',
-  `long` float NOT NULL default '0',
-  `zoom` tinyint(2) NOT NULL default '1',
-  `showemail` tinyint(1) NOT NULL default '0',
-  `showloc` tinyint(1) NOT NULL default '1',
-  `showmap` tinyint(1) NOT NULL default '1',
-  UNIQUE KEY `email` (`email`),
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

mozilla/webtools/partytool/controllers/admin_controller.php

@@ -1,163 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-uses('sanitize');
-class AdminController extends AppController {
-  var $name = 'Admin';
-  var $uses = array('Party', 'User', 'Comment');
-  var $components = array('Unicode');
-
-  function beforeFilter() {
-    if (empty($_SESSION['User']) || $_SESSION['User']['role'] != 1) {
-      $this->redirect('/');
-      die();
-    }
-  }
-
-  function index() {
-    $this->set('parties', $this->Party->findAll(null, null, "id ASC"));
-  }
-  
-  function users() {
-    $this->set('users', $this->User->findAll(null, null, "id ASC"));
-  }
-  
-  function comments() {
-    $this->set('comments', $this->Comment->findAll(null, null, "id ASC"));
-  }
-  
-  function edit($type, $id) {
-    if (empty($this->data)) {
-      switch($type) {
-        case 'user':
-          $this->User->id = $id;
-          $user = $this->User->read();
-          $this->set('user', $user);
-          $this->data = $user;
-          break;
-      
-        case 'party':
-          $this->Party->id = $id;
-          $party = $this->Party->read();
-          $this->set('party', $party);
-          $this->data = $party;
-          $this->data['Party']['name'] = preg_replace("/&#(\d{2,5});/e", 
-                                                      '$this->Unicode->unicode2utf(${1})',
-                                                      html_entity_decode($this->data['Party']['name']));
-          $this->data['Party']['vname'] = preg_replace("/&#(\d{2,5});/e", 
-                                                       '$this->Unicode->unicode2utf(${1})',
-                                                       html_entity_decode($this->data['Party']['vname']));
-          $this->data['Party']['website'] = preg_replace("/&#(\d{2,5});/e", 
-                                                         '$this->Unicode->unicode2utf(${1})',
-                                                         html_entity_decode($this->data['Party']['website']));
-          $this->data['Party']['address'] = preg_replace("/&#(\d{2,5});/e", 
-                                                         '$this->Unicode->unicode2utf(${1})',
-                                                         html_entity_decode($this->data['Party']['address']));
-          $this->data['Party']['notes'] = preg_replace("/&#(\d{2,5});/e", 
-                                                       '$this->Unicode->unicode2utf(${1})',
-                                                       html_entity_decode($this->data['Party']['notes']));
-          $this->data['Party']['flickrusr'] = preg_replace("/&#(\d{2,5});/e", 
-                                                           '$this->Unicode->unicode2utf(${1})',
-                                                           html_entity_decode($this->data['Party']['flickrusr']));
-          break;
-        
-        case 'comment':
-          $this->Comment->id = $id;
-          $comment = $this->Comment->read();
-          $this->set('comment', $comment);
-
-          $uid = $this->User->findById($comment['Comment']['owner']);
-          $this->set('owner', $uid['User']['name']);
-
-          $this->data = $comment;
-          break;
-      }
-    }
-    
-    else {
-      switch($type) {
-        case 'user':
-          $this->User->id = $id;
-          $this->User->save($this->data);
-          break;
-      
-        case 'party':
-          $this->Party->id = $id;
-          $clean = new Sanitize();
-          $clean->cleanArray($this->data);
-          $this->Party->save($this->data);
-          break;
-        
-        case 'comment':
-          $this->Comment->id = $id;
-          $this->Comment->save($this->data);
-          break;
-      }
-    
-      if ($type != 'party')
-        $this->redirect('/admin/'.$type.'s');
-
-      else
-        $this->redirect('/admin/');
-    }
-  }
-  
-  function delete($type, $id) {
-    switch($type) {
-      case 'user':
-        $this->User->del($id);
-        $this->User->query("DELETE FROM guests WHERE uid = $id");
-        break;
-      
-      case 'party':
-        $this->Party->del($id);
-        $this->Party->query("DELETE FROM guests WHERE pid = $id");
-        $this->Party->query("DELETE FROM comments WHERE assoc = $id");
-        break;
-        
-      case 'comment':
-        $this->Comment->del($id);
-        break;
-    }
-    
-    if ($type != 'party')
-      $this->redirect('/admin/'.$type.'s');
-
-    else
-      $this->redirect('/admin/');
-  }
-}
-?>

mozilla/webtools/partytool/controllers/comments_controller.php

@@ -1,71 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-uses('sanitize');
-
-class CommentsController extends AppController {
-  var $name = 'Comments';
-  var $components = array('Security');
-  
-  function beforeFilter() {
-    $this->Security->requirePost('add');
-  }
-
-  function add($pid, $uid) {
-    if (!$this->Session->check('User') || $uid != $_SESSION['User']['id'])
-      $this->redirect('/');
-
-    if (!empty($this->data) && $this->Comment->canComment($pid, $uid)) {
-      // Explictly destroy the last model to avoid an edit instead of an insert
-      $this->Comment->create();
-
-      $clean = new Sanitize();
-      $text = $clean->html($this->data['Comment']['text']);
-      $this->data['Comment']['text'] = nl2br($text);
-      $this->data['Comment']['owner'] = $uid;
-      $this->data['Comment']['assoc'] = $pid;
-      $this->data['Comment']['time'] = mktime();
-
-      if ($this->Comment->save($this->data)) {
-        $this->redirect('/parties/view/'.$pid.'#c'.$this->Comment->getLastInsertID());
-      }
-    }
-
-    else
-      $this->redirect('/parties/view/'.$pid);
-  }
-}
-?>

mozilla/webtools/partytool/controllers/components/hash.php

@@ -1,54 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class HashComponent extends Object {
-
-  function password($pass, $data) {
-    $string = $pass.uniqid(rand(), true).$data;
-    $salt = substr(md5($string), 0, 9);
-    $p = sha1($pass.$salt);
-    $rv = array('pass' => $p, 'salt' => $salt);
-    return $rv;
-  }
-
-  function keygen($chars) {
-    $key = null;
-    $pool = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    for ($i = 0; $i < $chars; $i++)
-      $key .= $pool{rand(0,61)};
-    return $key;
-  }
-}

mozilla/webtools/partytool/controllers/components/mail.php

@@ -1,83 +0,0 @@
-<?php
-class MailComponent extends Object {
-  var $from;
-  var $to;
-  var $reply;
-  var $subject;
-  var $message;
-  var $envelope;
-  var $head = "<strong>Firefox Party!</strong><br/>";
-  var $foot;
-
-
-  function mail($params) {
-    if (array_key_exists('from', $params))
-      $this->from = $params['from'];
-
-    if (array_key_exists('to', $params))
-      $this->to = $params['to'];
-
-    if (array_key_exists('reply', $params))
-      $this->reply = $params['reply'];
-
-    if (array_key_exists('subject', $params))
-      $this->subject = $params['subject'];
-
-    if (array_key_exists('message', $params))
-      $this->message = $params['message'];
-
-    if (array_key_exists('envelope', $params))
-      $this->envelope = $params['envelope'];
-
-    if (array_key_exists('type', $params)) {
-      switch($params['type']) {
-        case 'act':
-          $this->message = $this->head."<br/>\nThank you for registering! To activate your account, <a href=\"".$params['link']."\">click here</a> or paste the link below into your browser:<br/> ".$params['link'].$this->foot;
-          break;
-
-        case 'prec':
-          $this->message = $this->head."<br/>\nTo reset your password, <a href=\"".$params['link']."\">click here</a> or paste the link below into your browser:<br/> ".$params['link'].$this->foot;
-          break;
-
-        case 'invite':
-          $this->message = $this->head."<br/>\nYou've been invited by a friend to join them in celebrating the release of Firefox 2. Simply <a href=\"".$params['link']."\">click here</a> to confirm or cancel this invitation. If you don't already have an account, you'll need to create one.\n
-                           If you're unable to use the link above, simply paste the following URL into your browser: ".$params['link'].$this->foot;
-          break;
-
-        case 'cancel':
-          $this->message = $this->head."<br/>\nThe party you were attending has been canceled. For more information, please <a href=\"".$params['link']."\">click here</a>, or see the link below.\n ".$params['link'].$this->foot;
-          break;
-      }
-    }
-  }
-
-  function make_headers($type='html') {
-    $headers = '';
-
-    switch($type) {
-      case 'html':
-        $headers .= 'MIME-Version: 1.0' . "\r\n";
-        $headers .= 'Content-type: text/html; charset=iso-8859-1' . "\r\n";
-        break;
-    }
-
-    if (!empty($this->from)) {
-      $headers .= "From: {$this->from}\r\n";
-
-      if (!empty($this->reply))
-        $headers .= "Reply-To: {$this->reply}\r\n";
-    }
-    return $headers;
-  }
-
-  function make_additional_parameters() {
-    if (!empty($this->envelope)) {
-      return '-f'.$this->envelope;
-    }
-  }
-
-  function send() {
-    mail($this->to, $this->subject, $this->message, $this->make_headers(), $this->make_additional_parameters());
-  }
-}
-?>

mozilla/webtools/partytool/controllers/components/unicode.php

@@ -1,75 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class UnicodeComponent extends Object {
-  /**
-   * Unicode utilities. Converts and encodes characters up to 0xFFFF (65535)
-   */
-  function unicode2utf($char) {
-    if ($char < 128) {
-      $rv = chr($char);
-    }
-
-    else if ($char < 2048) {
-      $rv = chr(192 + (($char - ($char % 64)) / 64));
-      $rv .= chr(128 + ($char % 64));
-    }
-
-    else {
-      $rv = chr(224 + (($char - ($char % 4096)) / 4096));
-      $rv .= chr(128 + ((($char % 4096) - ($char % 64)) / 64));
-      $rv .= chr(128 + ($char % 64));
-    }
-
-    return $rv;
-  }
-
-  function utf2unicode($char) {
-    if (ord($char{0}) < 128)
-      $rv = ord($char);
-
-    else if (ord($char{0}) < 224)
-      $rv = ((ord($char{0}) - 192) * 64) + (ord($char{1}) - 128);
-
-    else if (ord($char{0}) < 240)
-      $rv = ((ord($char{0}) - 224) * 4096) + ((ord($char{1}) - 128) * 64 + (ord($char{2}) - 128));
-
-    else
-      $rv = ((ord($char{0}) - 240) * 262144) + ((ord($char{1}) - 128) * 4096) + ((ord($char{2}) - 128) * 64) + (ord($char{3}) - 128);
-
-    return $rv;
-  }
-}

mozilla/webtools/partytool/controllers/feeds_controller.php

@@ -1,143 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-vendor('webServices');
-class FeedsController extends AppController {
-  var $name = 'Feeds';
-  var $components = array('Unicode');
-
-  function index() {
-    header('Content-type: application/rss+xml');
-    $this->layout = 'ajax';
-    $this->set('count', $this->Feed->findCount());
-  }
-
-  function latest() {
-    header('Content-type: application/rss+xml');
-    $this->layout = 'ajax';
-    $this->set('latest', $this->Feed->findAll('', '', 'id DESC', 10, 1));
-  }
-
-  function users() {
-    header('Content-type: application/rss+xml');
-    $this->layout = 'ajax';
-    $this->set('count', $this->Feed->getUserCount());
-  }
-
-  function comments($id = null) {
-    $this->layout = 'ajax';
-    header('Content-type: application/rss+xml');
-    if (!is_numeric($id))
-      return;
-
-    $this->set('comments', $this->Feed->getComments($id));
-    $this->set('pid', $id);
-  }
-  
-  function photos($id = null) {
-    $this->layout = 'ajax';
-    header('Content-type: application/atom+xml');
-    if (!is_numeric($id))
-      return;
-
-    $party = $this->Feed->findById($id);
-    $this->set('party', $party);
-
-    if (FLICKR_API_KEY != null && !$party['Feeds']['canceled']) {
-      if ($party['Feeds']['useflickr'] == 1) {
-        $data = array('type' => 'flickr', 'userid' => $party['Feeds']['flickrid'], 'randomize' => false);
-        $flickr = new webServices($data);
-        $photoset = $flickr->fetchPhotos(FLICKR_TAG_PREFIX.$id, 30, !$party['Feeds']['flickrperms']);
-        $this->set('flickr', $photoset);
-      }
-    }
-  }
-
-  function upcoming($limit = null) {
-    $this->layout = 'ajax';
-    header('Content-type: application/rss+xml');
-
-    ($limit == null) ? $limit = 25 : $limit = intval($limit);
-
-    $this->set('latest', $this->Feed->findAll('WHERE date > '. time(), '', 'date ASC', $limit, 1));
-  }
-
-  function ical() {
-    $this->layout = 'ajax';
-    header('Content-type: text/calendar');
-    header("Content-Disposition: inline; filename=partylist.ics");
-    $back = time() - 172800;
-    $events = $this->Feed->findAll('WHERE date > '. $back, '', 'date ASC', null, 1);
-    
-    $cal = array();
-    
-    foreach($events as $event) {
-      $event['Feeds']['name'] = 
-        preg_replace(array("/&#(\d{2,5});/e", "/(\n|\r|\f)/", "/\,/"),
-                     array('$this->Unicode->unicode2utf(${1})', ' ', '\,'),
-                     html_entity_decode($event['Feeds']['name']));
-      $event['Feeds']['address'] = 
-        preg_replace(array("/&#(\d{2,5});/e", "/(\n|\r|\f)/", "/\,/"),
-                     array('$this->Unicode->unicode2utf(${1})', ' ', '\,'),
-                     html_entity_decode($event['Feeds']['address']));
-      $event['Feeds']['notes'] = 
-        preg_replace(array("/&#(\d{2,5});/e", "/(\n|\r|\f)/", "/\,/"),
-                     array('$this->Unicode->unicode2utf(${1})', ' ', '\,'),
-                     html_entity_decode($event['Feeds']['notes']));
-      array_push($cal, $event);
-    }
-    $this->set('events', $cal);
-  }
-  
-  function topguests($limit = null) {
-    $this->layout = 'ajax';
-    header('Content-type: application/rss+xml');
-
-    ($limit == null) ? $limit = 25 : $limit = intval($limit);
-
-    $rv = $this->Feed->query("SELECT parties.name AS name,
-                                guests.pid AS id,
-                                COUNT(guests.pid) AS count
-                              FROM guests
-                              LEFT JOIN parties
-                                ON guests.pid = parties.id
-                              GROUP BY guests.pid
-                              ORDER BY count DESC
-                              LIMIT $limit");
-    $this->set('items', $rv);
-  }
-}
-?>

mozilla/webtools/partytool/controllers/pages_controller.php

@@ -1,92 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-uses('sanitize');
-class PagesController extends AppController {
-  var $name = 'Pages';
-  var $components = array('Unicode');
-
-  function display() {
-    $this->pageTitle = 'Home';
-    $this->set('current', 'home');
-    $this->set('pcount', $this->Page->findCount());
-    $this->set('ucount', $this->Page->getUsers());
-    $text = $this->Page->query('SELECT text FROM pages WHERE id = 1');
-    $time = $this->Page->query('SELECT text FROM pages WHERE id = 2');
-    $this->set('time', $time[0]['pages']['text']);
-    $this->set('front_text', preg_replace("/&#(\d{2,5});/e", 
-                                          '$this->Unicode->unicode2utf(${1})',
-                                          html_entity_decode($text[0]['pages']['text'])));
-  }
-
-  function privacy() {
-    $this->pageTitle = 'Privacy Policy';
-  }
-  
-  function edit() {
-    if (isset($_SESSION['User']['id']) && $_SESSION['User']['role'] == 1) {
-      if (empty($this->data)) {
-        $text = $this->Page->query('SELECT text FROM pages WHERE id = 1');
-        $time = $this->Page->query('SELECT text FROM pages WHERE id = 2');
-        $this->data['Pages']['text'] = preg_replace("/&#(\d{2,5});/e", 
-                                                    '$this->Unicode->unicode2utf(${1})',
-                                                    html_entity_decode($text[0]['pages']['text']));
-        $this->set('selected', date('Y-m-d H:i:s', $time[0]['pages']['text']));
-      }
-    
-      else {
-        // Paranoid? Nah...
-        if ($_SESSION['User']['role'] == 1) {
-          $clean = new Sanitize();
-          $clean->cleanArray($this->data);
-          $date = mktime($this->data['Pages']['date_hour'],
-                         $this->data['Pages']['date_min'],
-                         0,
-                         $this->data['Pages']['date_month'],
-                         $this->data['Pages']['date_day'],
-                         $this->data['Pages']['date_year']);
-
-          $this->Page->execute('UPDATE pages SET text = "'.$this->data['Pages']['text'].'" WHERE pages.id = 1');
-          $this->Page->execute('UPDATE pages SET text = "'.$date.'" WHERE pages.id = 2');
-          $this->redirect('/');
-        }
-      }
-    }
-    else
-     die();
-  }
-}
-?>

mozilla/webtools/partytool/controllers/parties_controller.php

@@ -1,472 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-uses('sanitize');
-vendor('webServices');
-class PartiesController extends AppController {
-  var $name = 'Parties';
-  var $uses = array('Party', 'Comment');
-  var $helpers = array('Html', 'Form');
-  var $components = array('Hash', 'Mail', 'Unicode');
-
-  function index() {
-    $this->pageTitle = 'Party Map';
-    $this->set('current', 'map');
-
-    if (!empty($this->data)) {
-      $gcoder = new webServices(array('type' => 'geocode'));
-      $loc = $gcoder->geocode($this->data['Party']['mloc']);
-      
-      if ($loc)
-        $this->set('map', 'initMashUp('.$loc['lat'].', '.$loc['lng'].');');
-
-      else
-        $this->set('map', 'initMashUp();');
-    }
-
-    else
-      $this->set('map', 'initMashUp();');
-  }
-
-  function add() {
-    if (!$this->Session->check('User'))
-      $this->redirect('/users/login');
-
-    $this->pageTitle = 'Create Party';
-    $this->set('current', 'create');
-    $this->set('map', 'mapInit()');
-
-    if(empty($this->data)) {
-      $this->set('utz', $_SESSION['User']['tz']);
-      $this->render();
-    }
-
-    else {
-        $temp = array('lat'  => $this->data['Party']['lat'],
-                      'long' => $this->data['Party']['long'],
-                      'tz'   => $this->data['Party']['tz']);
-
-        $clean = new Sanitize();
-        $clean->cleanArray($this->data);
-
-        $this->data['Party']['lat']  = floatval($temp['lat']);
-        $this->data['Party']['long'] = floatval($temp['long']);
-        $this->data['Party']['tz']   = intval($temp['tz']);
-        $this->set('utz', $this->data['Party']['tz']);
-
-        // Convert the selected time to GMT
-        $secoffset = ($this->data['Party']['tz'] * 60 * 60);
-        $offsetdate = gmmktime($this->data['Party']['hour_hour'],
-                             $this->data['Party']['minute_min'],
-                             0,
-                             $this->data['Party']['month_hour'],
-                             $this->data['Party']['day_day'],
-                             $this->data['Party']['year_year']);
-        $this->data['Party']['date'] = ($offsetdate + $secoffset);
-        $this->data['Party']['duration'] = intval($this->data['Party']['duration']);
-
-        $this->data['Party']['invitecode'] = $this->Hash->keygen(10);
-        $this->data['Party']['owner'] = $_SESSION['User']['id'];
-
-        if (!preg_match("/^(http|https)\:\/\//i", $this->data['Party']['website']) &&
-          !empty($this->data['Party']['website']))
-          $this->Party->invalidate('website');
-
-        if ($this->Party->validates($this->data)) {
-          if($this->Party->save($this->data)) {
-            $this->Session->setFlash('Your party has been created!', 'infoFlash');
-            $this->redirect('/parties/view/'.$this->Party->getLastInsertId());
-          }
-        }
-        
-        else {
-          $this->Session->setFlash('Please correct the errors below.', 'errorFlash');
-        }
-    }
-  }
-
-  function edit($id) {
-      $this->Party->id = $id;
-    $party = $this->Party->read();
-    $this->set('party', $party);
-    $this->pageTitle = 'Edit Party';
-    $this->set('current', 'create');
-
-    if (empty($_SESSION['User']['id']))
-      $this->redirect('/users/login/');
-
-    if ($party['Party']['owner'] != $_SESSION['User']['id'])
-      $this->redirect('/parties/view/'.$id);
-
-    else {
-      if (empty($this->data)) {
-        $this->data = $party;
-        
-        $date = array('hour' => intval(date('h', $party['Party']['date'])),
-                      'min'  => intval(date('i', $party['Party']['date'])),
-                      'mon'  => intval(date('m', $party['Party']['date'])),
-                      'day'  => intval(date('d', $party['Party']['date'])),
-                      'year' => intval(date('Y', $party['Party']['date'])),
-                      'tz'   => $party['Party']['tz']);
-                      
-        $this->set('date', $date);
-        $this->data['Party']['name'] = preg_replace("/&#(\d{2,5});/e", 
-                                                    '$this->Unicode->unicode2utf(${1})',
-                                                    html_entity_decode($this->data['Party']['name']));
-        $this->data['Party']['vname'] = preg_replace("/&#(\d{2,5});/e", 
-                                                     '$this->Unicode->unicode2utf(${1})',
-                                                     html_entity_decode($this->data['Party']['vname']));
-        $this->data['Party']['website'] = preg_replace("/&#(\d{2,5});/e", 
-                                                       '$this->Unicode->unicode2utf(${1})',
-                                                       html_entity_decode($this->data['Party']['website']));
-        $this->data['Party']['address'] = preg_replace("/&#(\d{2,5});/e", 
-                                                       '$this->Unicode->unicode2utf(${1})',
-                                                       html_entity_decode($this->data['Party']['address']));
-        $this->data['Party']['notes'] = preg_replace("/&#(\d{2,5});/e", 
-                                                     '$this->Unicode->unicode2utf(${1})',
-                                                     html_entity_decode($this->data['Party']['notes']));
-        $this->data['Party']['flickrusr'] = preg_replace("/&#(\d{2,5});/e", 
-                                                         '$this->Unicode->unicode2utf(${1})',
-                                                         html_entity_decode($this->data['Party']['flickrusr']));
-
-        if (GMAP_API_KEY != null) {
-          if ($this->data['Party']['lat'])
-            $this->set('map', 'mapInit('.$this->data['Party']['lat'].','.$this->data['Party']['long'].','.$this->data['Party']['zoom'].')');
-          else
-            $this->set('map', 'mapInit()');
-        }
-      }
-
-      else {
-        $clean = new Sanitize();
-        $temp = array('lat'  => $clean->sql($this->data['Party']['lat']),
-                      'long' => $clean->sql($this->data['Party']['long']),
-                      'tz'   => $clean->sql($this->data['Party']['tz']));
-
-        $clean->cleanArray($this->data);
-
-        $this->data['Party']['lat'] = floatval($temp['lat']);
-        $this->data['Party']['long'] = floatval($temp['long']);
-        $this->data['Party']['tz'] = intval($temp['tz']);
-
-        $secoffset = ($this->data['Party']['tz'] * 60 * 60);
-
-        $offsetdate = gmmktime($this->data['Party']['hour_hour'],
-                               $this->data['Party']['minute_min'],
-                               0,
-                               $this->data['Party']['month_hour'],
-                               $this->data['Party']['day_day'],
-                               $this->data['Party']['year_year']);
-
-        $this->data['Party']['date'] = ($offsetdate - $secoffset);
-        $this->data['Party']['owner'] = $party['Party']['owner'];
-        $this->data['Party']['duration'] = intval($this->data['Party']['duration']);
-
-        $date = array('hour' => intval(date('h', $party['Party']['date'])),
-                      'min'  => intval(date('i', $party['Party']['date'])),
-                      'mon'  => intval(date('m', $party['Party']['date'])),
-                      'day'  => intval(date('d', $party['Party']['date'])),
-                      'year' => intval(date('Y', $party['Party']['date'])),
-                      'tz'   => $party['Party']['tz']);
-        $this->set('date', $date);
-
-        if (!preg_match("/^(http|https)\:\/\//i", $this->data['Party']['website']) &&
-          !empty($this->data['Party']['website']))
-          $this->Party->invalidate('website');
-
-        if ($this->data['Party']['flickrusr'] != $party['Party']['flickrusr']) {
-          $params = array('type' => 'flickr', 'username' => $this->data['Party']['flickrusr']);
-          $flick = new webServices($params);
-          $this->data['Party']['flickrid'] = $flick->getFlickrId();
-        }
-
-        if ($this->Party->validates($this->data)) {
-          if ($this->Party->save($this->data)) {
-            $this->Session->setFlash('Party edited successfully.', 'infoFlash');
-            $this->redirect('parties/view/'.$id);
-          }
-        }
-      }
-    }
-  }
-
-  function view($id = null, $page = null) {
-    if ($id == 'all') {
-      $this->pageTitle = 'All Parties';
-      $this->set('current', 'parties');
-
-      //Paginate!
-      $count = $this->Party->findCount();
-      $pages = ceil($count/100);
-      if ($page == null)
-        $page = 1;
-      if ($page > 1)
-        $this->set('prev', $page - 1);
-      if ($page < $pages)
-        $this->set('next', $page + 1);
-
-      $deck = $this->Party->findAll(null, null, "id ASC", 100, $page);
-      shuffle($deck);
-      $this->set('parties', $deck);
-    }
-
-    else if (is_numeric($id)) {
-      $party = $this->Party->findById($id);
-      if (empty($party['Party']['id']))
-        $this->redirect('/parties/view/all');
-
-      $this->set('current', 'parties');
-      $this->set('host', $this->Party->getHost($party['Party']['owner']));
-      $this->set('party', $party);
-      $this->set('isguest', $this->Party->isGuest($id, @$_SESSION['User']['id']));
-      $this->pageTitle = $party['Party']['name'];
-      $this->set('map', 'mapInit('.$party['Party']['lat'].','.$party['Party']['long'].
-                        ','.$party['Party']['zoom'].',\'stationary\')');
-      $this->set('guests', $this->Party->getGuests($party['Party']['id']));
-      $this->set('comments', $this->Party->getComments($id));
-
-      if (FLICKR_API_KEY != null) {
-        if ($party['Party']['useflickr'] == 1) {
-          $data = array('type' => 'flickr', 'userid' => $party['Party']['flickrid'], 'randomize' => true);
-          $flickr = new webServices($data);
-          $photoset = $flickr->fetchPhotos(FLICKR_TAG_PREFIX.$party['Party']['id'], 15, (($party['Party']['flickrperms']) ? false : true));
-          $this->set('flickr', array_slice($photoset, 0, 9));
-        }
-      }
-    }
-
-    else
-      $this->redirect('/parties/view/all');
-  }
-
-  function invite($id = null) {
-    $this->pageTitle = "Invite a Guest";
-    if (is_numeric($id)) {
-      $party = $this->Party->findById($id);
-      if (empty($party['Party']['id']) ||
-          $party['Party']['owner'] != $_SESSION['User']['id'] ||
-          $party['Party']['canceled'] == 1)
-        $this->redirect('/parties/view/all');
-
-      else {
-        $this->set('partyid', $party['Party']['id']);
-        $this->set('inviteurl', APP_BASE.'/parties/invited/'.$party['Party']['invitecode']);
-
-        $clean = new Sanitize();
-        $uid = $clean->sql($_SESSION['User']['id']);
-        $email = $this->Party->query("SELECT email FROM users WHERE id = ".$uid);
-
-        if (!empty($this->data)) {
-          if ($this->Party->validates($this->data)) {
-            $message = array('from'     => APP_NAME.' <'.APP_EMAIL.'>',
-                             'envelope' => APP_EMAIL,
-                             'to'       => $this->data['Party']['einvite'],
-                             'reply'    => $email[0]['users']['email'],
-                             'subject'  => 'You\'ve been invited to '.APP_NAME.'!',
-                             'link'     => APP_BASE.'/parties/invited/'.$party['Party']['invitecode'],
-                             'type'     => 'invite');
-
-            $this->Mail->mail($message);
-            $this->Mail->send();
-
-            $this->Session->setFlash($this->data['Party']['einvite'].' has been
-              invited. You can invite another guest below or <a href="'.APP_BASE.'/parties/view/'.$id.'/">click here</a>
-              to return to your party.', 'infoFlash');
-            $this->data['Party']['einvite'] = null;
-          }
-          else {
-            $this->validateErrors($this->Party);
-            $this->render();
-          }
-        }
-      }
-    }
-  }
-
-  function invited($icode = null, $conf = null) {
-    $this->pageTitle = "Confirm Invite";
-    if ($icode == 'cancel') {
-      $this->Session->delete('invite');
-      $this->Session->delete('invitestep');
-      $this->redirect('/');
-    }
-
-    else {
-      $clean = new Sanitize();
-      $icode = $clean->sql($icode);
-      $party = $this->Party->findByInvitecode($icode);
-
-      if (empty($party['Party']['id'])) {
-        $this->Session->setFlash('Could not find a party matching that invite code, please check it and try again.', 'errorFlash');
-      }
-
-      else {
-        if (!empty($_SESSION['User']['id']) && !empty($_SESSION['invitestep']) && $conf == 'confirm') {
-          $this->Party->addGuest($_SESSION['User']['id'], $_SESSION['invite']);
-          $this->Session->setFlash('You have been successfully added to this party.', 'infoFlash');
-          $this->redirect('/parties/view/'.$party['Party']['id']);
-        }
-
-        else if (!empty($_SESSION['User']['id'])) {
-          $this->set('confirm_only', true);
-          $this->set('party', $party);
-          $this->set('icode', $icode);
-          $this->Session->write('invitestep', 'true');
-          $this->Session->write('invite', $icode);
-        }
-
-        else {
-          $this->Session->write('invite', $icode);
-          $this->set('party', $party);
-          $this->set('icode', $icode);
-        }
-      }
-    }
-  }
-
-  function rsvp($pid) {
-    if (is_numeric($pid) && isset($_SESSION['User']['id'])) {
-      $party = $this->Party->findById($pid);
-      if (empty($party['Party']['id'])) {
-        $this->Session->setFlash('Invalid party id.', 'errorFlash');
-        $this->redirect('/parties/view/all');
-      }
-
-      else {
-        if ($party['Party']['inviteonly']) {
-          $this->Session->setFlash('This party invite only, you\'ll need an
-            invitation from the host to join in', 'errorFlash');
-        }
-
-        else {
-          $this->Party->rsvp($pid, $_SESSION['User']['id']);
-          $this->Session->setFlash('You have been successfully added to this party.', 'infoFlash');
-          $this->redirect('/parties/view/'.$pid);
-        }
-      }
-    }
-
-    else
-      $this->redirect('/parties/view/all');
-  }
-
-  function unrsvp($pid) {
-    if (is_numeric($pid) && isset($_SESSION['User']['id'])) {
-      $party = $this->Party->findById($pid);
-      if (empty($party['Party']['id'])) {
-        $this->Session->setFlash('Invalid party id.', 'errorFlash');
-        $this->redirect('/parties/view/all');
-      }
-
-      else {
-        $this->Party->unrsvp($pid, $_SESSION['User']['id']);
-        $this->Session->setFlash('You have been successfully removed from this party.', 'infoFlash');
-        $this->redirect('/parties/view/'.$pid);
-      }
-    }
-
-    else
-      $this->redirect('/parties/view/all');
-  }
-  
-  function cancel($pid) {
-    $this->pageTitle = "Cancel Party";
-    if (!is_numeric($pid) || !isset($_SESSION['User']['id']))
-      $this->redirect('/');
-
-    else
-      $this->set('pid', $pid);
-
-    $party = $this->Party->findById($pid);
-    if ($_SESSION['User']['id'] != $party['Party']['owner'])
-      die();
-
-    if (!empty($this->data) && $_SESSION['User']['id'] == $party['Party']['owner']) {
-      if ($this->data['Party']['confcancel'] == 1) {
-        $guests = $this->Party->getGuests($pid);
-        $guest_count = count($guests);
-
-        foreach($guests as $guest) {
-          $message = array('from'     => APP_NAME.' <'.APP_EMAIL.'>',
-                           'envelope' => APP_EMAIL,
-                           'to'       => $guest['users']['email'],
-                           'reply'    => $_SESSION['User']['email'],
-                           'subject'  => 'Party Cancellation Notice',
-                           'link'     => APP_BASE.'/parties/view/'.$pid,
-                           'type'     => 'cancel');
-
-          $this->Mail->mail($message);
-          $this->Mail->send();
-        }
-
-        $this->Party->query("DELETE FROM guests WHERE pid = $pid LIMIT $guest_count");
-        $this->Party->query("UPDATE parties SET canceled = '1', invitecode = '0' WHERE parties.id = $pid LIMIT 1");
-
-        $this->redirect('/parties/view/'.$pid);
-      }
-    }
-  }
-  
-  function uncancel($pid) {
-    if (!is_numeric($pid) || !isset($_SESSION['User']['id']))
-      $this->redirect('/');
-
-    $party = $this->Party->findById($pid);
-    if ($_SESSION['User']['id'] != $party['Party']['owner'])
-      die();
-
-    $key = $this->Hash->keygen(10);
-    $this->Party->query("UPDATE parties SET canceled = '0', invitecode = '$key' WHERE parties.id = $pid LIMIT 1");
-    $this->redirect('/parties/view/'.$pid);
-  }
-
-  function js($type = null, $data = null) {
-    $this->layout = 'ajax';
-
-    if ($type == 'html') {
-      header('Content-type: text/plain');
-      $party = $this->Party->findById($data);
-      $this->set('party', $party);
-    }
-
-    else {
-      header('Content-type: text/javascript');
-      $parties = $this->Party->findAll();
-      $this->set('parties', $parties);
-    }
-  }
-}
-?>

mozilla/webtools/partytool/controllers/users_controller.php

@@ -1,437 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-uses('sanitize');
-class UsersController extends AppController {
-  var $name = 'Users';
-  var $uses = array('User', 'Party');
-  var $helpers = array('Html', 'Form');
-  var $components = array('Security', 'Hash', 'Mail');
-
-  function index() {
-    if (!isset($_SESSION['User'])) {
-      $this->redirect('/users/login');
-    }
-
-    $this->pageTitle = 'My Profile';
-    
-    $user = $this->Session->read('User');
-    $this->set('parties', $this->User->memberOf($user['id']));
-    $this->set('hparties', $this->User->hostOf($user['id']));
-    $this->set('iparties', $this->User->invitedTo($user['id']));
-  }
-
-  function register() {
-    $this->pageTitle = 'Register';
-    $this->set('map', 'mapInit()');
-
-    if(empty($this->data)) {
-      $this->set('utz', '0');
-      $this->render();
-    }
-
-    else {
-      if ($this->User->findByEmail($this->data['User']['email']))
-        $this->User->invalidate('email');
-
-      if ($this->data['User']['email'] !== $this->data['User']['confemail'])
-        $this->User->invalidate('confemail');
-
-      if (!preg_match("/^(http|https)\:\/\//i", $this->data['User']['website']) &&
-        !empty($this->data['User']['website']))
-        $this->User->invalidate('website');
-
-      if ($this->data['User']['password'] !== $this->data['User']['confpass'])
-        $this->User->invalidate('confpass');
-      
-      if (empty($this->data['User']['password']) || empty($this->data['User']['confpass']))
-        $this->User->invalidate('password');
-
-      // Repopulate the timezone with right value in case there's a validation error
-      $this->set('utz', $this->data['User']['tz']);
-
-      if ($this->User->validates($this->data)) {
-        $clean = new Sanitize();
-        // Generate and set the password, salt and activation key
-        $pass = $this->Hash->password($this->data['User']['password'],
-                                      $this->data['User']['email']);
-        $this->data['User']['active'] = $this->Hash->keygen(10);
-        $this->data['User']['password'] = $pass['pass'];
-        $this->data['User']['salt'] = $pass['salt'];
-
-        // Save a few fields from the wrath of cleanArray()
-        $temp = array('lat'   => $this->data['User']['lat'],
-                      'long'  => $this->data['User']['long'],
-                      'tz'    => $this->data['User']['tz'],
-                      'email' => $this->data['User']['email']);
-        // Scrub 'a dub
-        $clean->cleanArray($this->data);
-        $this->data['User']['email'] = $temp['email'];
-        $this->data['User']['long']  = floatval($temp['long']);
-        $this->data['User']['lat']   = floatval($temp['lat']);
-        $this->data['User']['tz']    = intval($temp['tz']);
-        $this->data['User']['role']  = 0;
-
-        if($this->User->save($this->data)) {
-          $message = array('from' => APP_NAME.' <'.APP_EMAIL.'>',
-                           'envelope' => APP_EMAIL,
-                           'to'   => $this->data['User']['email'],
-                           'subject' => 'Your '.APP_NAME.' Registration',
-                           'link' => APP_BASE.'/users/activate/'.$this->data['User']['active'],
-                           'type' => 'act');
-          $this->Mail->mail($message);
-          $this->Mail->send();
-
-          if (isset($_SESSION['invite']))
-            $this->Party->addGuest($this->User->getLastInsertId(), $_SESSION['invite']);
-
-          $this->Session->setFlash('Thank you for registering! To login, you\'ll
-                                   need to activate your account. Please check
-                                   your email for your activation link.', 'infoFlash');
-          $this->redirect('/users/login');
-        }
-        
-        else {
-          $this->data['User']['password'] = null;
-          $this->data['User']['confpass'] = null;
-          $this->render();
-        }
-      }
-
-      else {
-        $this->data['User']['password'] = null;
-        $this->data['User']['confpass'] = null;
-        $this->Session->setFlash('There was an error in your submission. Please
-                                  correct the errors shown below and try again.',
-                                 'errorFlash');
-        $this->render();
-      }
-    }
-  }
-
-  function edit() {
-    if (!isset($_SESSION['User'])) {
-      $this->redirect('/users/login');
-    }
-    $this->set('error', false);
-    $this->pageTitle = 'Edit My Account';
-    if (empty($this->data)) {
-      $this->User->id = $_SESSION['User']['id'];
-      $this->data = $this->User->read();
-      $this->data['User']['password'] = "";
-      $this->set('utz', $this->data['User']['tz']);
-
-      $this->data['User']['name'] = preg_replace("/&#(\d{2,5});/e", 
-                                                 '$this->Unicode->unicode2utf(${1})',
-                                                 html_entity_decode($this->data['User']['name']));
-      $this->data['User']['website'] = preg_replace("/&#(\d{2,5});/e", 
-                                                    '$this->Unicode->unicode2utf(${1})',
-                                                    html_entity_decode($this->data['User']['website']));
-      $this->data['User']['location'] = preg_replace("/&#(\d{2,5});/e", 
-                                                     '$this->Unicode->unicode2utf(${1})',
-                                                     html_entity_decode($this->data['User']['location']));
-
-      if (GMAP_API_KEY != null) {
-          if ($this->data['User']['lat'])
-            $this->set('map', 'mapInit('.$this->data['User']['lat'].','.$this->data['User']['long'].','.$this->data['User']['zoom'].')');
-          else
-            $this->set('map', 'mapInit()');
-        }
-    }
-
-    else {
-      $user = $this->User->findById($_SESSION['User']['id']);
-      $this->User->id = $user['User']['id'];
-      $this->set('utz', $user['User']['tz']);
-
-      $clean = new Sanitize();
-      $temp = array('password' => $this->data['User']['password'],
-                    'confpassword' => $this->data['User']['confpassword'],
-                    'lat' => $clean->sql($this->data['User']['lat']),
-                    'long' => $clean->sql($this->data['User']['long']),
-                    'tz' => $clean->sql($this->data['User']['tz']));
-      //Nuke everything else
-      $clean->cleanArray($this->data);
-
-      $this->data['User']['email'] = $user['User']['email'];
-      $this->data['User']['password'] = $temp['password'];
-      $this->data['User']['confpassword'] = $temp['confpassword'];
-      $this->data['User']['lat'] = floatval($temp['lat']);
-      $this->data['User']['long'] = floatval($temp['long']);
-      $this->data['User']['tz'] = intval($temp['tz']);
-      $this->data['User']['role'] = $user['User']['role'];
-
-      if (!preg_match("/^(http|https)\:\/\//i", $this->data['User']['website']) &&
-        !empty($this->data['User']['website']))
-        $this->User->invalidate('website');
-
-      if ($this->data['User']['password'] === $this->data['User']['confpassword'] &&
-        !empty($this->data['User']['password'])) {
-        $pass = $this->Hash->password($this->data['User']['password'], $user['User']['email']);
-        $this->data['User']['password'] = $pass['pass'];
-        $this->data['User']['salt'] = $pass['salt'];
-      }
-      
-      else if (empty($this->data['User']['password']) && empty($this->data['User']['confpassword'])) {
-        $this->data['User']['password'] = $user['User']['password'];
-        $this->data['User']['salt'] = $user['User']['salt'];
-      }
-      
-      else {
-        $this->set('error', true);
-        $this->User->invalidate('password');
-        $this->User->invalidate('confpassword');
-      }
-
-      if ($this->User->validates($this->data)) {
-        if ($this->User->save($this->data)) {
-          $sess = $this->User->findById($user['User']['id']);
-          $this->redirect('/users/');
-        }
-      }
-      
-      else {
-        $this->validateErrors($this->User);
-        $this->data['User']['password'] = null;
-        $this->data['User']['confpassword'] = null;
-        $this->render();
-      }
-    }
-  }
-
-  function login() {
-    if ($this->Session->Check('User'))
-      $this->redirect('/users');
-
-    $this->pageTitle = 'Login';
-    if (!empty($this->data)) {
-      if (empty($this->data['User']['email']) || empty($this->data['User']['password']))
-        $this->render();
-
-      $user = $this->User->findByEmail($this->data['User']['email']);
-      $pass = sha1($this->data['User']['password'].$user['User']['salt']);
-
-      if ($user['User']['password'] == $pass) {
-        if ($user['User']['active'] != 1) {
-          $this->Session->setFlash('Your account hasn\'t been activated yet. Please
-                                  check your email (including junk/spam folders)
-                                  for your activation link, or click <a href="'
-                                  .APP_BASE.'/users/recover/activate">here</a> to
-                                  resend your activation details.', 'infoFlash');
-          $this->render();
-        }
-        
-        else {
-          if (isset($_SESSION['invite']))
-            $this->Party->addGuest($user['User']['id'], $_SESSION['invite']);
-
-          $this->Session->write('User', $user['User']);
-          $this->redirect('/users/');
-        }
-      }
-
-      else {
-        $this->Session->setFlash('The email address and password you supplied do
-                                 not match. Please try again.', 'errorFlash');
-      }
-    }
-  }
-
-  function view($id = null) {
-    if (!is_numeric($id))
-      $this->redirect('/');
-
-    else {
-      $user = $this->User->findById($id);
-      $this->pageTitle = $user['User']['name'];
-      $this->set('user', $user);
-      if (GMAP_API_KEY != null && !empty($user['User']['lat']))
-        $this->set('map', 'mapInit('.$user['User']['lat'].','.$user['User']['long'].','.$user['User']['zoom'].',\'stationary\');');
-
-      $this->Party->unbindModel(array('hasMany' => array('Comment')));
-      $this->set('hparties', $this->User->hostOf($id));
-      $att = $this->User->query('SELECT parties.id, parties.name
-                                 FROM parties 
-                                 LEFT JOIN guests
-                                  ON parties.id = guests.pid 
-                                 WHERE guests.uid = '.$id);
-      $this->set('parties', $att);
-    }
-  }
-
-  function logout() {
-    $this->Session->destroy();
-    $this->Session->delete('User');
-    $this->redirect('/');
-  }
-
-   function recover($aType = null, $aCode = null, $aId = null) {
-    switch ($aType) {
-      case "password":
-        $this->pageTitle = "Password Recovery";
-        $this->set('atitle', 'Password Recovery');
-        $this->set('hideInput', false);
-        $this->set('url', 'password');
-
-        if (!empty($this->data)) {
-          $user = $this->User->findByEmail($this->data['User']['email']);
-
-          if (!isset($user['User']['email'])) {
-            $this->Session->setFlash('Could not find a user with that email address. Please check it and try again.', 'errorFlash');
-            $this->render();
-          }
-          else {
-            $code = md5($user['User']['salt'].$user['User']['email'].$user['User']['password']);
-            $message = array('from'   => APP_NAME.' <'.APP_EMAIL.'>',
-                           'envelope' => APP_EMAIL,
-                           'to'       => $user['User']['email'],
-                           'subject'  => APP_NAME.' Password Request',
-                           'link'     => APP_BASE.'/users/recover/password/'.$code.'/'.$user['User']['id'],
-                           'type'     => 'prec');
-
-            $this->Mail->mail($message);
-            $this->Mail->send();
-            $this->Session->setFlash('An email has been sent to '.$user['User']['email'].' with reset instructions.', 'errorFlash');
-            $this->redirect('users/login');
-          }
-        }
-
-        if ($aCode !== null && $aId !== null) {
-          $this->set('hideInput', true);
-          $this->set('reset', false);
-          $user = $this->User->findById($aId);
-
-          if (!$user) {
-            $this->Session->setFlash('Invalid request. Please check the URL and try again.', 'errorFlash');
-            $this->render();
-          }
-
-          if ($aCode == md5($user['User']['salt'].$user['User']['email'].$user['User']['password'])) {
-            $this->set('reset', true);
-            $this->set('code', $aCode."/".$aId);
-            $this->render();
-          }
-
-          else {
-            $this->Session->setFlash('Invalid request. Please check the URL and try again.', 'errorFlash');
-            $this->render();
-          }
-        }
-        break;
-      case "activate":
-        $this->pageTitle = 'Resend Activation Code';
-        $this->set('atitle', 'Resend Activation Code');
-        $this->set('hideInput', false);
-        $this->set('url', 'activate');
-
-        if (!empty($this->data)) {
-          $user = $this->User->findByEmail($this->data['User']['email']);
-          
-          if (!$user) {
-            $this->Session->setFlash('Could not find a user with that email address. Please check it and try again.', 'errorFlash');
-            $this->render();
-          }
-
-          if ($user['User']['active'] == 1)
-            $this->redirect('/users/login');
-
-          else {
-            $message = array('from'     => APP_NAME.' <'.APP_EMAIL.'>',
-                             'envelope' => APP_EMAIL,
-                             'to'       => $this->data['User']['email'],
-                             'subject'  => 'Your '.APP_NAME.' Registration',
-                             'link'     => APP_BASE.'/users/activate/'.$user['User']['active'],
-                             'type'     => 'act');
-            $this->Mail->mail($message);
-            $this->Mail->send();
-            $this->Session->setFlash('Your activation code has been resent.', 'infoFlash');
-            $this->redirect('users/login');
-          }
-        }
-        break;
-      case "reset":
-        if ($aCode !== null && $aId !== null) {
-          if (!empty($this->data)) {
-            $user = $this->User->findById($aId);
-            if (!$user) {
-              $this->Session->setFlash('Invalid request. Please check the URL and try again.', 'errorFlash');
-              $this->render();
-            }
-
-            if ($aCode == md5($user['User']['salt'].$user['User']['email'].$user['User']['password'])) {
-              $string = $user['User']['email'] . uniqid(rand(), true) . $this->data['User']['password'];
-              $this->data['User']['salt'] = substr(md5($string), 0, 9);
-              $this->data['User']['password'] = sha1($this->data['User']['password'] . $this->data['User']['salt']);
-              $this->data['User']['id'] = $aId;
-              if ($this->User->save($this->data)) {
-                $this->Session->setFlash('Your password has been reset.', 'infoFlash');
-                $this->redirect('/users/login');
-              }
-            }
-          }
-        }
-        break;
-      default:
-        $this->redirect('/');
-        break;
-    }
-  }
-
-  function activate($aKey = null) {
-    if ($aKey == null)
-      $this->redirect('/');
-
-    else {
-      $user = $this->User->findByActive($aKey);
-      if (empty($user['User']['id'])) {
-        $this->Session->setFlash('Your account could not be activated. Please make
-          sure the URL entered is correct and try again.', 'errorFlash');
-        $this->redirect('/users/login');
-      }
-
-      else {
-        $this->data = $user;
-        $this->data['User']['active'] = 1;
-
-        if ($this->User->save($this->data)) {
-          $this->Session->setFlash('Your account was successfully activated.', 'infoFlash');
-          $this->redirect('/users/login');
-        }
-      }
-    }
-  }
-}
-?>

mozilla/webtools/partytool/index.php

@@ -1,26 +0,0 @@
-<?php
-/* SVN FILE: $Id: index.php,v 1.3 2006-10-08 03:39:21 reed%reedloden.com Exp $ */
-/**
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c)	2006, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package			cake
- * @subpackage		cake.app
- * @since			CakePHP v 0.10.0.1076
- * @version			$Revision: 1.3 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2006-10-08 03:39:21 $
- * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
-?>

mozilla/webtools/partytool/models/admin.php

@@ -1,41 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class Admin extends AppModel {
-  var $name = 'Admin';
-  var $useTable = "parties";
-}
-?>

mozilla/webtools/partytool/models/comment.php

@@ -1,61 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class Comment extends AppModel {
-  var $name = 'Comment';
-
-  var $validate = array(
-    'text' => "/^\S/"
-  );
-
-  function canComment($pid, $uid) {
-    $status = $this->query('SELECT owner, guestcomments FROM parties WHERE id = '.$pid);
-    $guest = null;
-    if ($status[0]['parties']['owner'] != $uid)
-      $guest = $this->query('SELECT uid FROM guests WHERE pid = '.$pid.' AND uid = '.$uid);
-
-    if ($status[0]['parties']['guestcomments'] == 1) {
-      if (!empty($guest[0]['guests']['uid']) || $uid == $status[0]['parties']['owner'])
-        return true;
-      else
-        return false;
-    }
-
-    else
-      return true;
-  }
-}
-?>

mozilla/webtools/partytool/models/guest.php

@@ -1,40 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class Guest extends AppModel {
-  var $name = 'Guest';
-}
-?>

mozilla/webtools/partytool/models/page.php

@@ -1,46 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class Page extends AppModel {
-  var $name = 'Page';
-  var $useTable = 'parties';
-
-  function getUsers() {
-    $rv = $this->query("SELECT COUNT(*) FROM users");
-    return $rv[0][0]["COUNT(*)"];
-  }
-}
-?>

mozilla/webtools/partytool/models/party.php

@@ -1,110 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class Party extends AppModel {
-  var $name = 'Party';
-  var $validate = array(
-    'name' => "/^\S/",
-    'einvite' => VALID_EMAIL,
-    'duration' => VALID_NUMBER
-  );
-
-  function getComments($pid) {
-    $rv = $this->query("SELECT users.id AS uid, users.name,
-                          comments.id AS cid, comments.time, comments.text
-                        FROM users, parties, comments
-                        WHERE comments.assoc = ".$pid."
-                          AND users.id = comments.owner
-                          AND parties.id = ".$pid."
-                        ORDER BY cid ASC");
-    return $rv;
-  }
-
-  function getHost($uid) {
-    $rv = $this->query("SELECT name FROM users WHERE id = ".$uid);
-    return @$rv[0]['users']['name'];
-  }
-
-  function isGuest($pid, $uid) {
-    $rv = $this->query('SELECT id FROM guests WHERE uid = '.$uid.' AND pid = '.$pid);
-    if (!empty($rv[0]['guests']['id']))
-      return true;
-    else
-      return false;
-  }
-
-  function getGuests($pid) {
-    $rv = $this->query("SELECT users.id, users.name, users.email, guests.invited
-                        FROM users
-                        LEFT JOIN guests 
-                          ON users.id = guests.uid
-                        WHERE guests.pid = ".$pid);
-    return $rv;
-  }
-
-  function rsvp($pid, $uid) {
-    $party = $this->findById($pid);
-    if (!empty($party['Party']['id']) && !$this->isGuest($pid, $uid)) {
-      $this->query("INSERT INTO guests (id, pid, uid, invited)
-                        VALUES (NULL, ".$party['Party']['id'].", ".$uid.", 0)"); 
-    }
-  }
-
-  function unrsvp($pid, $uid) {
-    $party = $this->findById($pid);
-    if (!empty($party['Party']['id']) && $this->isGuest($pid, $uid)) {
-      $this->query('DELETE FROM guests WHERE uid = '.$uid.' AND pid = '.$pid);
-    }
-  }
-
-  function addGuest($uid, $icode) {
-    $party = $this->findByInvitecode($icode);
-    if (!empty($party['Party']['id'])) {
-      $check = $this->query('SELECT uid FROM guests WHERE uid = '.$uid.' 
-                              AND pid = '.$party['Party']['id']);
-      if (empty($check[0]['guests']['uid']) && $uid != $party['Party']['owner']) {
-        $this->query("INSERT INTO guests (id, pid, uid, invited)
-                        VALUES (NULL, ".$party['Party']['id'].", ".$uid.", 1)");
-      }
-    }
-  }
-  
-  function findByInvitecode($icode) {
-    $rv = $this->query('SELECT * FROM parties AS Party WHERE invitecode = "'.$icode.'" LIMIT 1');
-    return @$rv[0];
-  }
-}
-?>

mozilla/webtools/partytool/models/user.php

@@ -1,59 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class User extends AppModel {
-  var $name = 'User';
-  var $validate = array(
-    'email' => VALID_EMAIL,
-    'name'  => "/^\S/"
-  );
-
-  function memberOf($uid) {
-    $rv = $this->query('SELECT parties.id, parties.name FROM guests, parties WHERE guests.uid = '.$uid.' AND parties.id = guests.pid');
-    return $rv;
-  }
-
-  function hostOf($uid) {
-    $rv = $this->query('SELECT id, name FROM parties WHERE owner = '.$uid);
-    return $rv;
-  }
-
-  function invitedTo($uid) {
-    $rv = $this->query('SELECT parties.id, parties.name FROM guests, parties WHERE guests.uid = '.$uid.' AND parties.id = guests.pid AND guests.invited = 1');
-    return $rv;
-  }
-}
-?>

mozilla/webtools/partytool/vendors/webServices.php

@@ -1,199 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Party Tool
- *
- * The Initial Developer of the Original Code is
- * Ryan Flint <rflint@dslr.net>
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-class webServices {
-  
-  var $userid;
-  var $host;
-  var $randomize;
-
-  function webServices($data) {
-    switch ($data['type']) {
-      case "flickr":
-        $this->host = "api.flickr.com";
-
-        if (array_key_exists('userid', $data))
-          $this->userid = $data['userid'];
-
-        if (array_key_exists('randomize', $data))
-          $this->randomize = $data['randomize'];
-
-        if (array_key_exists('username', $data)) {
-          $head  = "GET /services/rest/?method=flickr.people.findByUsername&api_key=".FLICKR_API_KEY."&username=".$data['username']." HTTP/1.1\r\n";
-          $head .= "Host: ".$this->host."\r\n";
-          $head .= "Connection: Close\r\n\r\n";
-
-          if ($results = $this->fetchResults($head)) {
-            preg_match('/nsid=\"(.*)\"/', $results, $matches);
-            if ($matches[1]) {
-              $this->userid = $matches[1];
-            }
-            else
-              return 0;
-          }
-        }
-        break;
-
-      case "gsuggest":
-        $this->host = "api.google.com";
-        break;
-
-      case "geocode":
-        $this->host = "maps.google.com";
-        break;
-    }
-  }
-
-  function getFlickrId() {
-    return $this->userid;
-  }
-
-  function fetchPhotos($tags, $num_results, $single_user) {
-    $params = array('api_key'  => FLICKR_API_KEY,
-                    'method'   => 'flickr.photos.search',
-                    'format'   => 'php_serial',
-                    'tags'     => $tags,
-                    'per_page' => $num_results);
-
-    if ($single_user)
-      $params['user_id'] = $this->userid;
-
-    $encoded_params = array();
-    foreach ($params as $k => $v)
-      $encoded_params[] = urlencode($k).'='.urlencode($v);
-
-    $head  = 'GET /services/rest/?'.implode('&', $encoded_params)." HTTP/1.1 \r\n";
-    $head .= 'Host: '.$this->host."\r\n";
-    $head .= "Connection: Close\r\n\r\n";
-
-    if ($results = $this->fetchResults($head)) {
-      $resp = split("\r\n\r\n", $results);
-      $data = unserialize($resp[1]);
-
-      if ($data['stat'] == 'ok') {
-        $arr = array();
-        for ($i = 0; $i < count($data['photos']['photo']); $i++) {
-          $p = $data['photos']['photo'][$i];
-          $arr[$i] = array('id'     => $p['id'],
-                           'owner'  => $p['owner'],
-                           'secret' => $p['secret'],
-                           'server' => $p['server'],
-                           'farm'   => $p['farm'],
-                           'title'  => $p['title']);
-        }
-
-        if ($this->randomize) {
-          // Randomize the results
-          shuffle($arr);
-        }
-
-        return $arr;
-      }
-
-      else
-        return 0;
-    }
-    
-    else
-      return 0;
-  }
-
-  function GSuggest($phrase) {
-    $soapy = '<?xml version=\'1.0\' encoding=\'UTF-8\'?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-                   xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance"
-                   xmlns:xsd="http://www.w3.org/1999/XMLSchema">
-  <SOAP-ENV:Body>
-    <doSpellingSuggestion xmlns="urn:GoogleSearch">
-      <key xsi:type="xsd:string">'.GSEARCH_API_KEY.'</key>
-      <phrase xsi:type="xsd:string">'.$phrase.'</phrase>
-    </doSpellingSuggestion>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>';
-
-    $head  = "POST /search/beta2 HTTP/1.1\r\n";
-    $head .= "Host: api.google.com\r\n";
-    $head .= "MessageType: CALL\r\n";
-    $head .= "Content-type: text/xml\r\n";
-    $head .= "Content-length: ".strlen($soapy)."\r\n";
-    $head .= "Connection: Close\r\n\r\n";
-    $head .= $soapy;
-
-    if ($results = $this->fetchResults($head)) {
-      if (preg_match('/return xsi:type="xsd:string">(.*)</', $results, $matches))
-        return $matches[1];
-      else
-        return 0;
-    }
-    return 0;
-  }
-
-  function geocode($query) {
-    $head = "GET /maps/geo?q=".urlencode($query)."&output=xml&key=".GMAP_API_KEY." HTTP/1.1\r\n";
-    $head .= "Host: maps.google.com\r\n";
-    $head .= "Connection: Close\r\n\r\n";
-
-    if ($results = $this->fetchResults($head)) {
-      if (stristr($results, '<code>200</code>')) {
-        preg_match('/coordinates>(.*)</', $results, $matches);
-        $ll = explode(',', $matches[1]);          
-        $rv = array('lat' => $ll[1], 'lng' => $ll[0]);
-        return $rv;
-      }
-    }
-    return 0;
-  }
-
-  function fetchResults($headers) {
-    $fs = fsockopen($this->host, 80, $errno, $errstr, 30);
-    if (!$fs)
-      return 0;
-
-    else {
-      fwrite($fs, $headers);
-      stream_set_timeout($fs, 2);
-
-      $buffer = null;
-      while (!feof($fs))
-        $buffer .= fgets($fs, 128);  
-
-      fclose($fs);
-
-      return $buffer;
-    }
-  }
-}
-?>

mozilla/webtools/partytool/views/admin/comments.thtml

@@ -1,18 +0,0 @@
-<h1>Comments</h1>
-<p>Switch view to: <a href="<?php echo $html->url('/admin/'); ?>">Parties&raquo;</a> <a href="<?php echo $html->url('/admin/users'); ?>">Users&raquo;</a></p>
-<table>
-  <tr>
-    <td>ID</td>
-    <td>Text</td>
-    <td></td>
-    <td></td>
-  </tr>
-<?php foreach($comments as $comment): ?>
-  <tr>
-    <td><a href="<?php echo $html->url('/parties/view/'.$comment['Comment']['assoc'].'#c'.$comment['Comment']['id']); ?>"><?php echo $comment['Comment']['id']; ?></a></td>
-    <td><?php echo $comment['Comment']['text']; ?></td>
-    <td><a href="<?php echo $html->url('/admin/edit/comment/'.$comment['Comment']['id']); ?>">Edit</a></td>
-    <td><a href="<?php echo $html->url('/admin/delete/comment/'.$comment['Comment']['id']); ?>" onclick="return confirm('Delete comment <?php echo $comment['Comment']['id']; ?>?')">Delete</a></td>
-  </tr>
-<?php endforeach; ?>
-</table>

mozilla/webtools/partytool/views/admin/edit.thtml

@@ -1,128 +0,0 @@
-<?php if (isset($user)): ?>
-<h1><?php echo $user['User']['name'].' (<a href="'.$html->url('/users/view/'.$user['User']['id']).'">'.$user['User']['id']; ?></a>)</h1>
-<form class="fxform" action="<?php echo $html->url('/admin/edit/user/'.$user['User']['id']); ?>" method="post">
-  <div>
-    <label for="UserName" class="label-large">Name:</label>
-    <?php echo $html->input('User/name', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="UserRole" class="label-large">Admin privileges:</label>
-    <?php echo $html->checkbox('User/role'); ?>
-  </div>
-  <div>
-    <label for="UserEmail" class="label-large">Email address:</label>
-    <?php echo $html->input('User/email', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="UserWebsite" class="label-large">Website:</label>
-    <?php echo $html->input('User/website', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="UserActive" class="label-large">Activation code:</label>
-    <?php echo $html->input('User/active', array('size' => 40)); ?>
-  </div>
-  <div>
-     <label for="location" class="label-large">Location:</label>
-    <?php echo $html->input('User/location', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="UserShowemail" class="label-large">Show email:</label>
-    <?php echo $html->checkbox('User/showemail'); ?><br/>
-  </div>
-  <div>
-    <label for="UserShowloc" class="label-large">Show location:</label>
-    <?php echo $html->checkbox('User/showloc'); ?><br/>
-  </div>
-  <div>
-    <label for="UserShowmap" class="label-large">Show map:</label>
-    <?php echo $html->checkbox('User/showmap'); ?><br/>
-  </div>
-  <?php echo $html->hidden('User/id', array('value' => $user['User']['id'])).$html->submit('Submit'); ?>
-</form>
-
-<?php endif; if (isset($party)): ?>
-<h1><?php echo $party['Party']['name'].' (<a href="'.$html->url('/parties/view/'.$party['Party']['id']).'">'.$party['Party']['id']; ?></a>)</h1>
-<form class="fxform" action="<?php echo $html->url('/admin/edit/party/'.$party['Party']['id']); ?>" method="post">
-  <div>
-    <label for="PartyOwner" class="label-large">Party Owner:</label>
-    <?php echo $html->input('Party/owner', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyName" class="label-large">Party Name:</label>
-    <?php echo $html->input('Party/name', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyVname" class="label-large">Venue Name:</label>
-    <?php echo $html->input('Party/vname', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyWebsite" class="label-large">Web site:</label>
-    <?php echo $html->input('Party/website', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyAddress" class="label-large">Address:</label>
-    <?php echo $html->input('Party/address', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyDate" class="label-large">Date:</label>
-    <?php echo $html->input('Party/date', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyNotes" class="label-large">Additional Notes:</label>
-    <?php echo $html->textarea('Party/notes', array('rows' => 10, 'cols' => 50)); ?>
-  </div>
-  <div>
-    <label for="PartyConfirmed" class="label-large">Time:</label>
-    <?php echo $html->radio('Party/confirmed', array(0 => 'Tentative', 1 => 'Confirmed')); ?>
-  </div>
-  <div>
-    <label for="PartyDuration" class="label-large">Duration (in hours):</label>
-    <?php echo $html->input('Party/duration', array('size' => 5)); ?>
-  </div>
-  <div>
-    <label for="PartyCanceled" class="label-large">Canceled:</label>
-    <?php echo $html->checkbox('Party/canceled'); ?>
-  </div>
-  <div>
-    <label for="PartyUseflickr" class="label-large">Use Flickr:</label>
-    <?php echo $html->checkbox('Party/useflickr'); ?>
-  </div>
-  <div>
-    <label for="PartyFlickrperms" class="label-large">Show:</label>
-    <?php echo $html->radio('Party/flickrperms', array(0 => 'Only my photos', 1 => 'Anyone\'s photos')); ?>
-  </div>
-  <div>
-    <label for="PartyFlickrusr" class="label-large">Flickr username:</label>
-    <?php echo $html->input('Party/flickrusr', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyFlickrusr" class="label-large">Flickr id:</label>
-    <?php echo $html->input('Party/flickrid', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyInviteonly" class="label-large">Invite only:</label>
-    <?php echo $html->checkbox('Party/inviteonly'); ?>
-  </div>
-  <div>
-    <label for="PartyGuestcomments" class="label-large">Limit comments to party guests only:</label>
-    <?php echo $html->checkbox('Party/guestcomments'); ?>
-  </div>
-  <br/>
-  <?php echo $html->hidden('Party/id', array('value' => $party['Party']['id'])).$html->submit('Submit'); ?>
-</form>
-
-<?php endif; if(isset($comment)): ?>
-<h1>Comment <?php echo '<a href="'.$html->url('/parties/view/'.$comment['Comment']['assoc'].'#c'.$comment['Comment']['id']).'">#'.$comment['Comment']['id']; ?></a> by <?php echo '<a href="'.$html->url('/users/view/'.$comment['Comment']['owner']).'">'.$owner; ?></a></h1>
-<form class="fxform" action="<?php echo $html->url('/admin/edit/comment/'.$comment['Comment']['id']); ?>" method="post">
-  <div>
-    <label for="CommentAssoc" class="label-large">Party:</label>
-    <?php echo $html->input('Comment/assoc', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="CommentText" class="label-large">Text:</label>
-    <?php echo $html->textarea('Comment/text', array('rows' => 10, 'cols' => 50)); ?>
-  </div>
-  <?php echo $html->hidden('Comment/id', array('value' => $comment['Comment']['id'])).$html->submit('Submit'); ?>
-</form>
-
-<?php endif; ?>

mozilla/webtools/partytool/views/admin/index.thtml

@@ -1,18 +0,0 @@
-<h1>Parties</h1>
-<p>Switch view to: <a href="<?php echo $html->url('/admin/users'); ?>">Users&raquo;</a> <a href="<?php echo $html->url('/admin/comments'); ?>">Comments&raquo;</a></p>
-<table>
-  <tr>
-    <td>ID</td>
-    <td>Name</td>
-    <td></td>
-    <td></td>
-  </tr>
-<?php foreach($parties as $party): ?>
-  <tr>
-    <td><a href="<?php echo $html->url('/parties/view/'.$party['Party']['id']); ?>"><?php echo $party['Party']['id']; ?></a></td>
-    <td><?php echo $party['Party']['name']; ?></td>
-    <td><a href="<?php echo $html->url('/admin/edit/party/'.$party['Party']['id']); ?>">Edit</a></td>
-    <td><a href="<?php echo $html->url('/admin/delete/party/'.$party['Party']['id']); ?>" onclick="return confirm('Delete party <?php echo $party['Party']['id']; ?>?')">Delete</a></td>
-  </tr>
-<?php endforeach; ?>
-</table>

mozilla/webtools/partytool/views/admin/users.thtml

@@ -1,18 +0,0 @@
-<h1>Users</h1>
-<p>Switch view to: <a href="<?php echo $html->url('/admin/'); ?>">Parties&raquo;</a> <a href="<?php echo $html->url('/admin/comments'); ?>">Comments&raquo;</a></p>
-<table>
-  <tr>
-    <td>ID</td>
-    <td>Name</td>
-    <td></td>
-    <td></td>
-  </tr>
-<?php foreach($users as $user): ?>
-  <tr>
-    <td><a href="<?php echo $html->url('/users/view/'.$user['User']['id']); ?>"><?php echo $user['User']['id']; ?></a></td>
-    <td><?php echo $user['User']['name']; ?></td>
-    <td><a href="<?php echo $html->url('/admin/edit/user/'.$user['User']['id']); ?>">Edit</a></td>
-    <td><a href="<?php echo $html->url('/admin/delete/user/'.$user['User']['id']); ?>" onclick="return confirm('Delete user <?php echo $user['User']['id']; ?>?')">Delete</a></td>
-  </tr>
-<?php endforeach; ?>
-</table>

mozilla/webtools/partytool/views/elements/user_options.thtml

@@ -1,7 +0,0 @@
-<?php if(!isset($_SESSION['User'])): ?>
-<strong>Welcome, Guest!</strong>
-<a href="<?php echo $html->url('/users/login'); ?>">Login</a> | <a href="<?php echo $html->url('/users/register'); ?>">Register</a>
-<?php else: ?>
-<strong>Welcome, <?php echo $_SESSION['User']['name']; ?>!</strong>
-<a href="<?php echo $html->url('/users'); ?>">My Account</a> | <a href="<?php echo $html->url('/users/logout'); ?>">Logout</a>
-<?php endif; ?>

mozilla/webtools/partytool/views/feeds/comments.thtml

@@ -1,16 +0,0 @@
-<?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; ?>
-<rss version="0.91">
-  <channel>
-    <pubDate><?php echo date('r'); ?></pubDate>
-    <description><?php echo APP_NAME." - Latest Comments"; ?></description>
-    <link><?php echo APP_BASE.$html->url('/parties/view/'.$pid); ?></link>
-    <title><?php echo APP_NAME." - Latest Comments"; ?></title>
-    <?php foreach($comments as $comment): ?>
-    <item>
-      <title><![CDATA[<?php echo substr($comment['comments']['text'], 0, 25).'...'; ?>]]></title>
-      <description><?php echo $comment['comments']['text'] ?></description>
-      <link><?php echo APP_BASE.$html->url('/parties/view/'.$comment['comments']['assoc'].'#c'.$comment['comments']['id']); ?></link>
-    </item>
-    <?php endforeach; ?>
-   </channel>
-</rss>

mozilla/webtools/partytool/views/feeds/ical.thtml

@@ -1,22 +0,0 @@
-BEGIN:VCALENDAR
-X-WR-CALNAME:<?php echo APP_NAME."\n"; ?>
-X-WR-CALDESC:Upcoming Parties
-PRODID:-//MozillaPartyTool//calendar//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-<?php foreach($events as $event):
-  if ($event['Feeds']['canceled']) continue; ?>
-BEGIN:VEVENT
-UID:<?php echo APP_BASE.$html->url('/parties/view/'.$event['Feeds']['id'])."\n"; ?>
-DTSTAMP:<?php echo gmdate('Ymd\This\Z', $event['Feeds']['date'])."\n"; ?>
-LOCATION:<?php echo $event['Feeds']['lat'].'\, '.$event['Feeds']['long'].'('.$event['Feeds']['address'].")\n"; ?>
-SUMMARY:<?php echo $event['Feeds']['name']."\n"; ?>
-DTSTART:<?php echo gmdate('Ymd\This', $event['Feeds']['date'])."\n"; ?>
-DURATION:PT<?php echo $event['Feeds']['duration']; ?>H
-URL:<?php echo APP_BASE.$html->url('/parties/view/'.$event['Feeds']['id'])."\n"; ?>
-STATUS:<?php echo (($event['Feeds']['confirmed'] == 1) ? "CONFIRMED" : "TENTATIVE")."\n"; ?>
-DESCRIPTION: <?php echo $event['Feeds']['name'].'\n '.$event['Feeds']['address'].'\n '.date('h:ia', $event['Feeds']['date']).'\n '.$event['Feeds']['notes'].'\n'."\n"; ?>
-END:VEVENT
-<?php endforeach; ?>
-END:VCALENDAR

mozilla/webtools/partytool/views/feeds/index.thtml

@@ -1,14 +0,0 @@
-<?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; ?>
-<rss version="0.91">
-  <channel>
-    <pubDate><?php echo date('r'); ?></pubDate>
-    <description><?php echo APP_NAME." - Party Count"; ?></description>
-    <link><?php echo APP_BASE.$html->url('/'); ?></link>
-    <title><?php echo APP_NAME." - Party Count"; ?></title>
-    <item>
-      <title><?php echo $count; ?></title>
-      <description>Total Parties</description>
-      <link><?php echo APP_BASE.$html->url('/parties/view/all/'); ?></link>
-    </item>
-   </channel>
-</rss>

mozilla/webtools/partytool/views/feeds/latest.thtml

@@ -1,17 +0,0 @@
-<?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; ?>
-<rss version="0.91">
-  <channel>
-    <pubDate><?php echo date('r'); ?></pubDate>
-    <description><?php echo APP_NAME." - Latest Parties"; ?></description>
-    <link><?php echo APP_BASE.$html->url('/'); ?></link>
-    <title><?php echo APP_NAME." - Latest Parties"; ?></title>
-    <?php foreach($latest as $party): 
-    if ($party['Feeds']['canceled']) continue; ?> 
-    <item>
-      <title><?php echo $party['Feeds']['name'] ?></title>
-      <description><?php echo $party['Feeds']['vname'] ?></description>
-      <link><?php echo APP_BASE.$html->url('/parties/view/'.$party['Feeds']['id']); ?></link>
-    </item>
-    <?php endforeach; ?>
-   </channel>
-</rss>

mozilla/webtools/partytool/views/feeds/photos.thtml

@@ -1,23 +0,0 @@
-<?php echo '<?xml version="1.0" encoding="utf-8"?>'."\n"; ?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title><?php echo $party['Feeds']['name']; ?></title>
-  <id>tag:<?php echo APP_BASE; ?>,2006:/parties/view/<?php echo $party['Feeds']['id']; ?></id>
-  <subtitle><?php echo APP_NAME; ?> Photostream</subtitle>
-  <updated><?php echo date('Y-m-d\TH:i:s\Z'); ?></updated>
-  <generator uri="http://www.screwedbydesign.com/software/partytool">Mozilla Party Tool</generator>
-  
-  <?php foreach ($flickr as $pic): ?>
-  <entry>
-    <title><?php echo $pic['title']; ?></title>
-    <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/<?php echo $pic['owner']."/".$pic['id']."/"; ?>"/>
-    <id>tag:flickr.com,2005:/photo/<?php echo $pic['id']; ?></id>
-    <published><?php echo date('Y-m-d\TH:i:s\Z'); ?></published>
-    <updated><?php echo date('Y-m-d\TH:i:s\Z'); ?></updated>
-    <content type="html">&lt;a href="http://www.flickr.com/photos/<?php echo $pic['owner']."/".$pic['id']."/" ?>"&gt; &lt;img src="http://static.flickr.com/<?php echo $pic['server']."/".$pic['id']."_".$pic['secret']."_m.jpg" ?>" title="<?php echo $pic['title']; ?>"/&gt;&lt;/a&gt;</content>
-    <author>
-      <name><?php echo $pic['owner']; ?></name>
-      <uri>http://www.flickr.com/people/<?php echo $pic['owner']; ?>/</uri>
-    </author>
-  </entry>
-  <?php endforeach; ?>
-</feed>

mozilla/webtools/partytool/views/feeds/topguests.thtml

@@ -1,16 +0,0 @@
-<?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; ?>
-<rss version="0.91">
-  <channel>
-    <pubDate><?php echo date('r'); ?></pubDate>
-    <description><?php echo APP_NAME." - Top Guests"; ?></description>
-    <link><?php echo APP_BASE.$html->url('/parties/view/all'); ?></link>
-    <title><?php echo APP_NAME." - Top Guests"; ?></title>
-    <?php foreach($items as $item):?>
-    <item>
-      <title><?php echo $item['parties']['name'].' ('.$item[0]['count'].')'; ?></title>
-      <description><?php echo $item['parties']['name'].' - '.$item[0]['count'].' guest'.(($item[0]['count'] != 1) ? 's' : ''); ?></description>
-      <link><?php echo APP_BASE.$html->url('/parties/view/'.$item['guests']['id']); ?></link>
-    </item>
-    <?php endforeach; ?>
-   </channel>
-</rss>

mozilla/webtools/partytool/views/feeds/upcoming.thtml

@@ -1,17 +0,0 @@
-<?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; ?>
-<rss version="0.91">
-  <channel>
-    <pubDate><?php echo date('r'); ?></pubDate>
-    <description><?php echo APP_NAME." - Upcoming Parties"; ?></description>
-    <link><?php echo APP_BASE.$html->url('/'); ?></link>
-    <title><?php echo APP_NAME." - Upcoming Parties"; ?></title>
-    <?php foreach($latest as $party): 
-      if ($party['Feeds']['canceled']) continue; ?> 
-    <item>
-      <title><![CDATA[<?php echo $party['Feeds']['name'] ?>]]></title>
-      <description><?php echo date('Y-m-d H:i', $party['Feeds']['date']); ?></description>
-      <link><?php echo APP_BASE.$html->url('/parties/view/'.$party['Feeds']['id']); ?></link>
-    </item>
-    <?php endforeach; ?>
-   </channel>
-</rss>

mozilla/webtools/partytool/views/feeds/users.thtml

@@ -1,14 +0,0 @@
-<?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; ?>
-<rss version="0.91">
-  <channel>
-    <pubDate><?php echo date('r'); ?></pubDate>
-    <description><?php echo APP_NAME." - Total Users"; ?></description>
-    <link><?php echo APP_BASE.$html->url('/'); ?></link>
-    <title><?php echo APP_NAME." - Total Users"; ?></title>
-    <item>
-      <title><?php echo $count; ?></title>
-      <description>Total Users</description>
-      <link><?php echo APP_BASE.$html->url('/'); ?></link>
-    </item>
-   </channel>
-</rss>

mozilla/webtools/partytool/views/layouts/default.thtml

@@ -1,40 +0,0 @@
-<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title><?php echo APP_NAME." - ".$title_for_layout?></title>
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo $html->url('/favicon.ico'); ?>"/>
-    <link rel="stylesheet" type="text/css" href="<?php echo $html->url('/css/main.css'); ?>"/>
-    <link rel="alternate" type="application/rss+xml" href="<?php echo $html->url('/feeds/latest'); ?>"/>
-  </head>
-  <body<?php echo (isset($map)) ? ' onload="'.$map.'" onunload="GUnload()"' : '';?>>
-    <div id="container">
-      <p class="skipLink"><a href="#content" accesskey="2">Skip to main content</a></p>
-      <div id="mozilla-com"><a href="http://www.mozilla.com/">Visit Mozilla.com</a></div>
-      <div id="header">
-        <div id="key-title">
-          <h1><a href="<?php echo $html->url('/'); ?>" title="Return to home page" accesskey="1"><img src="<?php echo $html->url('/img/firefox-title.png'); ?>" width="276" height="54" alt="Firefox Party"/></a></h1>
-          <div id="user"><?php echo $this->renderElement('user_options'); ?></div>
-        </div>
-        <div id="key-menu">
-          <ul id="menu-firefox">
-            <li<?php echo (@$current == 'home') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/'); ?>">Home</a></li>
-            <li<?php echo (@$current == 'map') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/'); ?>">View Map</a></li>
-            <li<?php echo (@$current == 'parties') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/view/all/'); ?>">View Parties</a></li>
-            <li<?php echo (@$current == 'create') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/add/'); ?>">Create Party</a></li>
-          </ul>
-        </div>
-      </div>
-      <div id="content">
-        <?php $this->controller->Session->flash(); ?>
-
-        <?php echo $content_for_layout; ?>
-      </div>
-      <div id="footer">
-        Copyright &copy; <?php echo date('Y'); ?> Mozilla<br/>
-        <a href="<?php echo $html->url('/privacy-policy'); ?>">Privacy Policy</a>
-      </div>
-    </div>
-  </body>
-</html>

mozilla/webtools/partytool/views/layouts/errorFlash.thtml

@@ -1 +0,0 @@
-<div id='flash' class='error'><?php echo $content_for_layout ?></div>

mozilla/webtools/partytool/views/layouts/infoFlash.thtml

@@ -1 +0,0 @@
-<div id='flash' class='info'><?php echo $content_for_layout ?></div>

mozilla/webtools/partytool/views/pages/display.thtml

@@ -1,30 +0,0 @@
-<?php
-  $difference = $time - time();
-  $days_left = floor($difference/60/60/24);
-?>
-    <div id="f-left">
-      <?php echo $front_text; 
-      if (@$_SESSION['User']['role'] == 1): ?>
-      <a href="<?php echo $html->url('/pages/edit'); ?>">Edit</a>
-      <?php endif; ?>
-    </div>
-    <div id="f-right">
-      <div class="cbox">
-        <span class="ctxt"><?php echo $pcount."</span><br/>".(($pcount == 1) ? ' Party' : ' Parties'); ?>
-        <div class="ifeed">
-          <a style="padding-right: 2px;" title="Party Calendar" href="<?php echo $html->url('/feeds/ical'); ?>"><img src="<?php echo $html->url('/img/ical.png'); ?>" alt="iCAL"/></a><a title="Party Count Feed" href="<?php echo $html->url('/feeds/'); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a>
-        </div>
-      </div>
-      <div class="cbox">
-        <span class="ctxt"><?php echo $ucount."</span><br/>".(($ucount == 1) ? ' Partygoer' : ' Partygoers'); ?>
-        <div class="cfeed">
-          <a title="User Count Feed" href="<?php echo $html->url('/feeds/users/'); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a>
-        </div>
-      </div>
-      <?php if ($days_left > 0): ?>
-      <div class="cbox">
-        <span class="ctxt"><?php echo $days_left."</span><br/>".(($days_left == 1) ? ' Day' : ' Days'); ?> until we party!
-      </div>
-      <?php endif; ?>
-    </div>
-    <div style="clear: both"></div>

mozilla/webtools/partytool/views/pages/edit.thtml

@@ -1,6 +0,0 @@
-<form action="<?php echo $html->url('/pages/edit'); ?>" method="post">
-<h1>Front Page Text</h1>
-<?php echo $html->textarea('Pages/text', array('rows' => 35, 'cols' => 80)); ?>
-<h1>Countdown Timer</h1>
-<?php echo $html->dateTimeOptionTag('Pages/date', 'YMD', 24, $selected).'<br/><br/>'.$html->submit('Submit'); ?>
-</form>

mozilla/webtools/partytool/views/pages/privacy.thtml

@@ -1,42 +0,0 @@
-<h2>Mozilla Privacy Policy</h2>
-
-<h3>Website Visitors</h3>
-
-<p>Except as described below, the Mozilla Foundation and the Mozilla Corporation (collectively "Mozilla") do not collect or require visitors to its Web sites to furnish personally-identifying information such as names, email addresses and phone numbers.  Like most Web site operators, Mozilla does collect non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, language preference, referring site, and date and time of each visitor request.  Mozilla also collects potentially personally-identifying information like Internet Protocol (IP) addresses, which are non-personally-identifying in and of themselves but could be used in conjunction with other information to personally identify users.</p>
-
-<p>Mozilla's purpose in collecting this information is to better understand how Mozilla's visitors use its Web sites.  To that end, Mozilla may share potentially personally-identifying information with its employees, contractors and affiliated organizations.  Mozilla may also release non-personally-identifying information about visitors, e.g. by publishing a report on Web site usage trends.  Otherwise, Mozilla will not publicly release potentially personally-identifying information except under the same circumstances as Mozilla releases personally-identifying information.  Those circumstances are explained in detail below.</p>
-
-<h3>Community Members</h3>
-
-<p>Certain members of the Mozilla community (contributors, customers, etc.) choose to interact with Mozilla in ways that require Mozilla and others to know more about them.  The amount and type of information that Mozilla gathers from those members depends on the nature of the interaction.  For example, members who wish to post content to certain portions of Mozilla's Web sites are asked to provide usernames that identify that content as having been posted by a particular member.  Developers, by comparison, are asked to provide contact information, up to and sometimes including telephone or fax numbers, so that they can be contacted as necessary.  Customers of the Mozilla store are asked to provide even more information, including billing and shipping addresses and credit card or similar information.  In each case, Mozilla collects personally-identifying information only insofar as is necessary to fulfill the purpose of the community member's interaction with Mozilla.</p>
-
-<p>Mozilla is an open organization that believes in sharing as much information as possible about its products, its operations and its associations.  Accordingly, community members should assume - as should most folks who interact with Mozilla - that any personally-identifying information provided to Mozilla will be made available to the public.  There are three broad exceptions to that rule:</p>
-
-<ol>
-
-<li>Mozilla does not publicly release information gathered in connection with commercial transactions (i.e., transactions involving money), including transactions conducted through the Mozilla Store.</li>
-<li>Mozilla does not make publicly available information that is used to authenticate users the publication of which would compromise the security of Mozilla's Web sites (e.g., passwords).</li>
-<li>Mozilla does not make publicly available information that it specifically promises at the time of collection to maintain in confidence.</li>
-</ol>
-
-<p>Outside those three contexts, users should assume that personally-identifying information provided through Mozilla's Web sites will be made available to the public.</p>
-
-<h3>Interactive Product Features</h3>
-
-<p>Certain Mozilla products contain features that report, or that permit users to report, the user's usage patterns and problems - whether caused by Mozilla's software, third party software, or third-party Web sites - to Mozilla.  The reports generated by these features typically include non-personally-identifying information such as the configuration of the user's computer and the code running at the time the problem occurred.  Some of these features give users the option of providing personally-identifying information, though none of these features require it.  Some Mozilla software features that do permit users to provide personally-identifying information advise in advance that such information will not be made publicly available.  Mozilla analyzes the information provided by these interactive product features to develop a better understanding of how its products are performing and being used.  It does not use the information to track the usage of its products by identifiable individuals.</p>
-
-<h3>Cookies</h3>
-
-<p>A cookie is a string of information that a Web site stores on a visitor's computer, and that the visitor's browser provides to the Web site each time the visitor returns.  Mozilla's Web sites use cookies to help Mozilla identify and track visitors, their usage of Mozilla Web sites, and their Web site access preferences across multiple requests and visits to Mozilla's Web sites.  It is possible to link cookies to personally-identifying information, thereby permitting Web site operators to track the online movements of particular individuals.  Mozilla, however, does not do so.  Instead, it uses the information provided by cookies to develop a better understanding of how Mozilla's visitors use, and to facilitate those visitors' interactions with, Mozilla's Web sites.  Mozilla visitors who do not wish to have cookies placed on their computers by Mozilla or its contractors should set their browsers to refuse cookies before linking to Mozilla's Web sites.  Certain features of Mozilla's Web sites may not function properly without the aid of cookies.</p>
-
-<h3>Protection of Certain Personally-Identifying Information</h3>
-
-<p>Where Mozilla has collected personally-identifying information subject to one of the three exceptions described in the Contributors and Customers section, above, it discloses that information only to those of its employees, contractors and affiliated organizations that need to know that information in order to process it on Mozilla's behalf and that have agreed not to disclose it to others.  Some of those employees, contractors and affiliated organizations may be located outside of your home country; by using Mozilla's Web sites, you consent to the transfer of your information to them.  Mozilla does not rent or sell such information to anyone.  Other than to its employees, contractors and affiliated organizations, as described above, Mozilla discloses such information only when required to do so by law, or when Mozilla believes in good faith that disclosure is reasonably necessary to protect the property or rights of Mozilla, members of the Mozilla community, or the public at large.  Mozilla takes all measures reasonably necessary to protect against the unauthorized access, use, alteration or destruction of such information</p>
-
-<h3>Updating of Personally-Identifying Information</h3>
-
-<p>Mozilla permits users to freely update and correct their personally-identifying information as maintained by Mozilla.  To do so, users need only look for the links and other tools available on Mozilla's Web sites or contact Mozilla by email.</p>
-
-<h3>Privacy Policy Changes</h3>
-
-<p>Although changes are likely to be minor, Mozilla may change its Privacy Policy from time to time.  Any and all changes will be reflected on this page.  Substantive changes will also be announced through the standard mechanisms through which Mozilla communicates with the Mozilla community, including Mozilla's "mozilla-announce" mailing lists.</p>

mozilla/webtools/partytool/views/parties/add.thtml

@@ -1,109 +0,0 @@
-<h1>Create a Party</h1>
-<form class="fxform" action="<?php echo $html->url('/parties/add'); ?>" method="post">
-  <div>
-    <label for="PartyName" class="label-large">Party Name<span class="required">*</span>:</label>
-    <?php echo $html->input('Party/name', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('Party/name', 'Please enter a party name.')?>
-  </div>
-  <div>
-	<label for="PartyVname" class="label-large">Venue Name:</label>
-	<?php echo $html->input('Party/vname', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyAddress" class="label-large">Address:</label>
-    <?php echo $html->input('Party/address', array('size' => 40, 'id' => 'location', 'onkeypress' => 'capture(event)', 'onblur' => 'update()')); ?>
-    <div id="locerr" class="info" style="display: none">Did you mean: <a id="locerrlink" onclick="geocode_suggest()" href="#"></a>?  <a href="#" onclick="shide()"><span style="font-size: x-small">(close)</span></a></div>
-  </div>
-  <p>Enter your party's time and date (in your local time) here. If you're not ready to commit to a specific time or date, select the 'Tentative'
-    radio button. Otherwise select 'Confirmed'.</p>
-  <div>
-    <label for="PartyYear" class="label-large">Date:</label>
-    <?php echo $html->yearOptionTag('Party/year', null, date('Y'), MAX_YEAR, date('Y'), null, null, false); ?>-<?php echo $html->hourOptionTag('Party/month', null, false, date('m')); ?>-<?php echo $html->dayOptionTag('Party/day', null, date('d'), null, false); ?>
-  </div>
-  <div>
-    <label for="PartyHour" class="label-large">Time:</label>
-    <?php echo $html->hourOptionTag('Party/hour', null, true);?>:<?php echo $html->minuteOptionTag('Party/minute');?>
-    <?php echo $html->radio('Party/confirmed', array(0 => 'Tentative', 1 => 'Confirmed')); ?><br/>
-  </div>
-  <p>The timezone is used to calculate the appropriate GMT time from the local time specified above. This is done to show
-    the party in the local time of the person viewing it.</p>
-  <div>
-    <label for="PartyTz" class="label-large">Timezone<span class="required">*</span>:</label>
-    <?php 
-      $tzs = array('-12' => 'GMT-12',
-                 '-11' => 'GMT-11',
-                 '-10' => 'GMT-10',
-                 '-9' => 'GMT-9',
-                 '-8' => 'GMT-8',
-                 '-7' => 'GMT-7',
-                 '-6' => 'GMT-6',
-                 '-5' => 'GMT-5',
-                 '-4' => 'GMT-4',
-                 '-3' => 'GMT-3',
-                 '-2' => 'GMT-2',
-                 '-1' => 'GMT-1',
-                 '0' => 'GMT+0',
-                 '1' => 'GMT+1',
-                 '2' => 'GMT+2',
-                 '3' => 'GMT+3',
-                 '4' => 'GMT+4',
-                 '5' => 'GMT+5',
-                 '6' => 'GMT+6',
-                 '7' => 'GMT+7',
-                 '8' => 'GMT+8',
-                 '9' => 'GMT+9',
-                 '10' => 'GMT+10',
-                 '11' => 'GMT+11',
-                 '12' => 'GMT+12',
-                 '13' => 'GMT+13');
-      echo $html->selectTag('Party/tz', $tzs, $utz, null, null, false); 
-    ?>
-    (this page was loaded at <?php echo gmdate("Y-m-d H:i:s"); ?> GMT)
-  </div>
-  <div>
-    <label for="PartyDuration" class="label-large">Duration (in hours):</label>
-    <?php echo $html->input('Party/duration', array('size' => 5)); ?>
-  </div>
-  <p>Enter a website (complete with http://) that guests can visit to learn more about your party. If you don't have one, simply leave it blank.</p>
-  <div>
-    <label for="PartyWebsite" class="label-large">Web site:</label>
-    <?php echo $html->input('Party/website', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('Party/website', 'Invalid URL.')?>
-  </div>
-  <p>If you choose to make your party invite only, you will have to send guests an invite containing a random invite code to allow them to join your party.</p>
-  <div>
-    <label for="PartyInviteonly" class="label-large">Invite only</label>
-    <?php echo $html->checkbox('Party/inviteonly'); ?>
-  </div>
-  <?php if(GMAP_API_KEY != null): ?>
-  <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>"
-      type="text/javascript"></script>
-  <script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
-  <script type="text/javascript">
-    //<![CDATA[
-      function update() {
-        var loc = document.getElementById("location").value;
-        geocode(loc);
-      }
-      
-      function capture(event) {
-        if (event.keyCode == 13) {
-          event.preventDefault();
-          update();
-        }  
-      }
-    //]]>
-    </script>
-    <p>Drag the map or the marker to specify a location. Set the zoom by using the '+' or '-' buttons on the left.</p>
-    <p id="map" class="med-map-r"></p>
-  <?php echo $html->hidden('Party/lat', array('id' => 'lat')); 
-        echo $html->hidden('Party/long', array('id' => 'long'));
-        echo $html->hidden('Party/zoom', array('id' => 'zoom'));
-        echo $html->hidden('Party/geocoded', array('id' => 'geocoded', 'value' => 0)); ?>
-  <?php endif; ?>
-  <div>
-    <label for="PartyNotes" class="label-large">Additional Notes</label>
-    <?php echo $html->textarea('Party/notes', array('rows' => 10, 'cols' => 50)); ?>
-  </div>
-  <?php echo $html->submit('Create Party'); ?>
-</form>

mozilla/webtools/partytool/views/parties/cancel.thtml

@@ -1,7 +0,0 @@
-<h1>Cancel Party</h1>
-<div class="error">Warning! Canceling your party will remove all guests and send them a cancellation notice.</div>
-<p>If you're sure you want to cancel your party simply hit the button below. Otherwise,
-  <a href="<?php echo $html->url('/parties/view/'.$pid); ?>">click here</a> to return to your party.</p>
-<form action="<?php echo $html->url('/parties/cancel/'.$pid); ?>" method="post">
-<?php echo $html->hidden('Party/confcancel', array('value' => 1)).$html->submit('Cancel Party'); ?>
-</form>

mozilla/webtools/partytool/views/parties/edit.thtml

@@ -1,131 +0,0 @@
-<form class="fxform" action="<?php echo $html->url('/parties/edit/'.$party['Party']['id']); ?>" method="post">
-  <?php echo $html->hidden('Party/id'); ?>
-  <h1>Details</h1>
-  <div>
-    <label for="PartyName" class="label-large">Party Name:</label>
-    <?php echo $html->input('Party/name', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyVname" class="label-large">Venue Name:</label>
-    <?php echo $html->input('Party/vname', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label for="PartyWebsite" class="label-large">Web site:</label>
-    <?php echo $html->input('Party/website', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('Party/website', 'Invalid URL.')?>
-  </div>
-  <div>
-    <label for="PartyAddress" class="label-large">Address:</label>
-    <?php echo $html->input('Party/address', array('size' => 40, 'id' => 'location', 'onkeypress' => 'capture(event)', 'onblur' => 'update()')); ?>
-    <div id="suggest" style="display: none">Did you mean <span style="font-style: italic"><a id="suggest2" href="#" onclick=""></a></span>?</div>
-  </div>
-  <?php if(GMAP_API_KEY != null): ?>
-  <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>"
-      type="text/javascript"></script>
-  <script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
-    <script type="text/javascript">
-
-    //<![CDATA[
-      function update(aSuggest) {
-        var loc;
-        if (!aSuggest)
-          loc = document.getElementById("location").value;
-        else
-          loc = aSuggest;
-        
-        if (loc != "")
-          geocode(loc);
-      }
-      
-      function capture(event) {
-        if (event.keyCode == 13) {
-          event.preventDefault();
-          update();
-        }  
-      }
-    //]]>
-    </script>
-    <p id="map" class="med-map-r"></p>
-  <div>
-    <label for="PartyNotes" class="label-large">Additional Notes:</label>
-    <?php echo $html->textarea('Party/notes', array('rows' => 10, 'cols' => 50)); ?>
-  </div>
-  <h1>Date</h1>
-  <div>
-    <label for="PartyYear" class="label-large">Date:</label>
-    <?php echo $html->yearOptionTag('Party/year', null, date('Y'), MAX_YEAR, $date['year'], null, null, false); ?>-<?php echo $html->hourOptionTag('Party/month', null, false, $date['mon']); ?>-<?php echo $html->dayOptionTag('Party/day', null, $date['day'], null, false); ?>
-  </div>
-  <div>
-    <label for="PartyHour" class="label-large">Time:</label>
-    <?php echo $html->hourOptionTag('Party/hour', null, true, $date['hour']);?>:<?php echo $html->minuteOptionTag('Party/minute', null, $date['min']);?>
-    <?php echo $html->radio('Party/confirmed', array(0 => 'Tentative', 1 => 'Confirmed')); ?>
-  </div>
-  <div>
-   <label for="PartyTz" class="label-large">Timezone:</label>
-   <?php 
-    $tzs = array('-12' => 'GMT-12',
-                 '-11' => 'GMT-11',
-                 '-10' => 'GMT-10',
-                 '-9' => 'GMT-9',
-                 '-8' => 'GMT-8',
-                 '-7' => 'GMT-7',
-                 '-6' => 'GMT-6',
-                 '-5' => 'GMT-5',
-                 '-4' => 'GMT-4',
-                 '-3' => 'GMT-3',
-                 '-2' => 'GMT-2',
-                 '-1' => 'GMT-1',
-                 '0' => 'GMT+0',
-                 '1' => 'GMT+1',
-                 '2' => 'GMT+2',
-                 '3' => 'GMT+3',
-                 '4' => 'GMT+4',
-                 '5' => 'GMT+5',
-                 '6' => 'GMT+6',
-                 '7' => 'GMT+7',
-                 '8' => 'GMT+8',
-                 '9' => 'GMT+9',
-                 '10' => 'GMT+10',
-                 '11' => 'GMT+11',
-                 '12' => 'GMT+12',
-                 '13' => 'GMT+13');
-   
-    echo $html->selectTag('Party/tz', $tzs, $date['tz'], null, null, false);?>
-    (current time is <?php echo gmdate("Y-m-d H:i:s"); ?>GMT)
-  </div>
-  <div>
-    <label for="PartyDuration" class="label-large">Duration (in hours):</label>
-    <?php echo $html->input('Party/duration', array('size' => 5)); ?>
-  </div>
-  <h1><span style="color: #0063dc">flick</span><span style="color: #ff0084">r<sup style="font-size: 8px">TM</sup></span> Options</h1>
-  <p>To show photos of your party, simply tag them with <strong><?php echo FLICKR_TAG_PREFIX.$party['Party']['id'] ?></strong> and fill out the information below.</p>
-  <div>
-    <label for="PartyUseflickr" class="label-large">Show photostream:</label>
-    <?php echo $html->checkbox('Party/useflickr'); ?>
-  </div>
-  <p>If you choose to show photos from anyone using your party's tag please note that no photos will show until two or more people are using the tag.</p>
-  <div>
-    <label for="PartyFlickrperms" class="label-large">Show:</label>
-    <?php echo $html->radio('Party/flickrperms', array(0 => 'Only my photos', 1 => 'Anyone\'s photos')); ?>
-  </div>
-  <div>
-    <label for="PartyFlickrusr" class="label-large">Flickr username:</label>
-    <?php echo $html->input('Party/flickrusr', array('size' => 40)); ?>
-  </div>
-  <h1>Privacy</h1>
-  <div>
-    <label for="PartyInviteonly" class="label-large">Invite only:</label>
-    <?php echo $html->checkbox('Party/inviteonly'); ?>
-  </div>
-  <div>
-    <label for="PartyGuestcomments" class="label-large">Limit comments to party guests only:</label>
-    <?php echo $html->checkbox('Party/guestcomments'); ?>
-  </div>
-  <br/>
-  <?php echo $html->hidden('Party/lat', array('id' => 'lat')); 
-        echo $html->hidden('Party/long', array('id' => 'long'));
-        echo $html->hidden('Party/zoom', array('id' => 'zoom'));
-        echo $html->hidden('Party/geocoded', array('id' => 'geocoded', 'value' => 0)); ?>
-  <?php endif; ?>
-  <?php echo $html->submit('Update'); ?>
-</form>

mozilla/webtools/partytool/views/parties/index.thtml

@@ -1,19 +0,0 @@
-<?php if(GMAP_API_KEY != null): ?>
-<div style="text-align: center">
-  <form action="<?php echo $html->url('/parties/'); ?>" class="fxform" onsubmit="search(event)" method="post">
-    <label for="PartyMloc"><strong>Find a party:</strong></label>
-    <?php echo $html->input('Party/mloc', array('size' => 60, 'id' => 'location')).' '.$html->submit('Search'); ?>
-    <div id="locerr" class="info" style="display: none">Did you mean: <a id="locerrlink" onclick="geocode_suggest()" href="#"></a>?  <a href="#" onclick="shide()"><span style="font-size: x-small">(close)</span></a></div>
-  </form>
-</div>
-<br/>
-<script src="http://maps.google.com/maps?file=api&amp;v=2.67&amp;key=<?php echo GMAP_API_KEY; ?>"
-        type="text/javascript"></script>
-<script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
-<script src="<?php echo $html->url('/parties/js'); ?>" type="text/javascript"></script>
-<div id="map" class="large-map"></div>
-<div id="map-load" style="visibility: hidden" class="load">
-  <img src="<?php echo $html->url('/img/throbber.gif'); ?>"/>
-  Loading...
-</div>
-<?php endif; ?>

mozilla/webtools/partytool/views/parties/invite.thtml

@@ -1,9 +0,0 @@
-<h1>Invite a guest</h1>
-<p>To invite a guest, simply enter their email address into the field below,
-  or hand them a link to
-  <strong><?php echo $inviteurl; ?></strong></p>
-<form action="<?php echo $html->url('/parties/invite/'.$partyid) ?>" method="post">
-<label for="PartyEinvite">Guest's email address:</label>
-<?php echo $html->input('Party/einvite')."\n".$html->submit('Submit')."\n"; ?>
-<?php echo $html->tagErrorMsg('Party/einvite', 'Invalid email address')?>
-</form>

mozilla/webtools/partytool/views/parties/invited.thtml

@@ -1,36 +0,0 @@
-<h1>Confirm Invite</h1>
-<?php if (isset($party) && !isset($confirm_only)): ?>
-<p>You've been invited to attend <a href="<?php echo $html->url('/parties/view/'.$party['Party']['id']); ?>"><?php echo $party['Party']['name']; ?></a>.
-  To join this party please select one of the options below, or <a href="<?php echo $html->url('/parties/invited/cancel/');?>">click here</a> to cancel this invitation.</p>
-<div style="text-align: center">
-  <div style="width: 50%; float: left;">
-    <h2>New User</h2>
-    <p>Simply register for an account, and you'll be added as a guest as soon as you finish.
-      <a href="<?php echo $html->url('/users/register'); ?>">Create account &raquo;</a></p>
-  </div>
-  <div style="width: 50%; float: right">
-    <h2>Existing User</h2>
-    <p>Login to add yourself to the guest list.</p>
-    <form class="fxform" action="<?php echo $html->url('/users/login'); ?>" method="post">
-      <div>
-        <label class="label-large" for="UserEmail">Email Address:</label>
-        <?php echo $html->input('User/email', array('size' => 20)); ?>
-      </div>
-      <div>
-        <label class="label-large" for="UserPassword">Password:</label>
-        <?php echo $html->password('User/password', array('size' => 20)).
-        $html->hidden('User/icode', array('value' => $icode));?>
-        
-      </div>
-      <div>
-        <?php echo $html->submit('Login'); ?>
-      </div>
-    </form>
-  </div>
-  <div style="clear: both;"></div>
-</div>
-<?php endif; 
-if (isset($party) && isset($confirm_only)): ?>
-<p>You've been invited to attend <a href="<?php echo $html->url('/parties/view/'.$party['Party']['id']); ?>"><?php echo $party['Party']['name']; ?></a>.
-  To join this party, <a href="<?php echo $html->url('/parties/invited/'.$icode.'/confirm');?>">click here</a>, or cancel this invitation by <a href="<?php echo $html->url('/parties/invited/cancel/');?>">clicking here</a>.</p>
-<?php endif; ?>

mozilla/webtools/partytool/views/parties/js.thtml

@@ -1,11 +0,0 @@
-<?php if (isset($party)): ?>
-<strong><?php echo $party['Party']['name']?></strong><br/><?php echo $party['Party']['vname']; ?><br/><a href="<?php echo $html->url('/parties/view/'.$party['Party']['id'])?>">View Party</a>
-<?php else: ?>
-function addParties() {
-<?php foreach ($parties as $party):
-  if (!empty($party['Party']['lat']) && !empty($party['Party']['long']) && !$party['Party']['canceled']): ?>
-addParty(<?php echo $party['Party']['lat'];?>, <?php echo $party['Party']['long']?>, <?php echo $party['Party']['id']; ?>);
-<?php endif; endforeach;?>
-}
-//
-<?php endif; ?>

mozilla/webtools/partytool/views/parties/view.thtml

@@ -1,140 +0,0 @@
-  <?php
-    if (isset($party)): ?>
-    <h1><?php echo $party['Party']['name']; ?></h1>
-    <br/>
-    <?php if ($party['Party']['canceled']): ?>
-    <div class="error">This party has been canceled</div>
-    <?php endif; ?>
-    Host: <a href="<?php echo $html->url('/users/view/'.$party['Party']['owner']).'">'.$host; ?></a><br/>
-    <?php
-      if (!empty($party['Party']['address']))
-        echo 'Location: '.$party['Party']['address']."<br/>\n";
-
-      if (!empty($party['Party']['vname']))
-        echo 'Venue: '.$party['Party']['vname']."<br/>\n";
-
-      echo 'Date: '.(($party['Party']['confirmed'] == 1) ? gmdate('Y-m-d h:ia', $party['Party']['date'] + (@$_SESSION['User']['tz'] * 60 * 60))." GMT".@$_SESSION['User']['tz'] : "TBA")."<br/>\n";
-      echo 'Duration: '.$party['Party']['duration'].' hour'.(($party['Party']['duration'] == 1) ? '' : 's')."\n<br/>";
-
-      if (!empty($party['Party']['website']) && preg_match("/^(http|https)\:\/\//i", $party['Party']['website']))
-        echo 'Website: <a href="'.$party['Party']['website'].'" rel="nofollow">'.$party['Party']['website']."</a><br/>\n";
-
-      if (!empty($party['Party']['notes']))
-        echo 'Notes: '.$party['Party']['notes']."<br/>\n";
-    ?>
-    <br/>
-    <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>"
-      type="text/javascript"></script>
-  <script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
-    <div id="map" class="small-map"></div>
-    <h1>Who's coming</h1>
-    <div>
-    <?php if (!empty($guests)):
-      $i = 0;
-      $c = count($guests) - 1;
-      foreach ($guests as $guest): ?>
-      <a href="<?php echo $html->url('/users/view/'.$guest['users']['id']); ?>"><?php echo $guest['users']['name']; ?></a><?php echo ($i < $c) ? ", " : ""; ?>
-    <?php $i++;   
-      endforeach; 
-      else:
-        echo "No guests yet, be the first!";
-    endif;
-
-    if (isset($_SESSION['User']['id']) && @$_SESSION['User']['id'] != $party['Party']['owner'] && ($party['Party']['inviteonly'] != 1 || $isguest && !$party['Party']['canceled'])):?>
-    <br/><br/>
-    <form action="<?php 
-      echo $html->url('/parties/'.((!$isguest) ? 'rsvp/' : 'unrsvp/').$party['Party']['id']); ?>" method="post">
-      <?php if(!$isguest): ?>
-      <button>Count me in!</button>
-      <?php else: ?>
-      <button>Remove me</button>
-      <?php endif; ?>
-    </form>
-    <?php endif; ?>
-    <? if ($party['Party']['inviteonly'] == 1 && (!$isguest && @$_SESSION['User']['id'] != $party['Party']['owner'] && !$party['Party']['canceled'])):?>
-    <p>This party is invite only. You'll need an invite code from the host to join in.</p>
-    <?php endif; ?>
-    </div>
-    <?php if (@$_SESSION['User']['id'] == $party['Party']['owner']):?>
-    <h1>Party options</h1>
-    <a href="<?php echo $html->url('/parties/edit/'.$party['Party']['id']);?>">Edit party</a>
-    <?php if (!$party['Party']['canceled']): ?>| <a href="<?php echo $html->url('/parties/invite/'.$party['Party']['id']);?>">Invite a guest</a>
-    <?php endif; echo (($party['Party']['canceled'] == 1) ? ' | <a href="'.$html->url('/parties/uncancel/'.$party['Party']['id']).'">
-    Reactivate this party</a>' : '| <a href="'.$html->url('/parties/cancel/'.$party['Party']['id']).'" onclick="return confirm(\'Are you sure you want to cancel your party?\')"><span style="color: #bc1313">Cancel this party</span></a>'); ?>
-    <?php endif; ?>
-    <?php if (isset($flickr)): ?>
-    <h1 id="photos">Photos <a title="Photo Feed" href="<?php echo $html->url('/feeds/photos/'.$party['Party']['id']); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="Atom"/></a></h1>
-    <div style="text-align: center">
-      <?php if (empty($flickr)): ?>
-      <p>No photos yet. Tag your flickr pictures with <?php echo FLICKR_TAG_PREFIX.$party['Party']['id']; ?> to display them here.</p>
-      <?php else: 
-        foreach ($flickr as $pic): ?>
-        <a href="http://www.flickr.com/photos/<?php echo $pic['owner']."/".$pic['id']."/" ?>"><img src="http://static.flickr.com/<?php echo $pic['server']."/".$pic['id']."_".$pic['secret']."_s.jpg" ?>" title="<?php echo $pic['title']; ?>"/></a>
-      <?php endforeach; 
-      endif; ?>
-      <br/>
-    </div>
-    <?php endif; 
-      if (!empty($comments)): ?>
-    <h1 id="comments">Comments <a title="Comment Feed" href="<?php echo $html->url('/feeds/comments/'.$party['Party']['id']); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a></h1>
-    <?php $i = 0;
-    foreach ($comments as $comment): 
-      if ($i % 2 == 0) 
-        $class = "";
-      else
-        $class = "comment-mod";
-        $i++;?>
-      <div id="c<?php echo $comment['comments']['cid'];?>" class="comment <?php echo $class;?>">
-        <span class="comment-content"><?php echo $comment['comments']['text']; ?></span>
-        <span class="comment-tag"><br/><br/>Posted by <a href="<?php echo $html->url('/users/view/'.$comment['users']['uid']); ?>">
-        <?php echo $comment['users']['name']; ?></a> on <?php echo gmdate('Y-m-d h:ia', $comment['comments']['time'] + (@$_SESSION['User']['tz'] * 60 * 60)); ?></span>
-        </span>
-      </div>
-    <?php endforeach; 
-          endif;
-      if (isset($_SESSION['User'])):
-        if (($party['Party']['guestcomments'] && $isguest) || !$party['Party']['guestcomments'] || @$_SESSION['User']['id'] == $party['Party']['owner']): ?>
-    <h1>Add a comment</h1>
-    <form action="<?php echo $html->url('/comments/add/'.$party['Party']['id'].'/'.$_SESSION['User']['id']); ?>" method="post">
-      <div>
-        <?php echo $html->textarea('Comment/text', array('rows' => 10, 'cols' => 50))."<br/>".$html->submit('Submit'); ?>
-      </div>
-    </form>
-    <?php endif; 
-        endif;
-      endif; ?> 
-  
-  <?php if (isset($parties)):
-    if (isset($prev))
-      echo '<a href="'.$html->url('/parties/view/all/'.$prev).'">&laquo; Previous Page</a> ';
-    if (isset($prev) && isset($next))
-      echo ' | ';
-    if (isset($next))
-      echo '<a href="'.$html->url('/parties/view/all/'.$next).'">Next Page &raquo;</a>';
-    $i = 0;
-    foreach ($parties as $party): 
-      if ($party['Party']['canceled'] != 1): ?>
-    <div>
-      <h1><?php echo $party['Party']['name']; ?></h1>
-      <p>
-      <?php
-        if (!empty($party['Party']['address']))
-          echo 'Location: '.$party['Party']['address']."<br/>\n";
-
-        if (!empty($party['Party']['vname']))
-          echo 'Venue: '.$party['Party']['vname']."<br/>\n";
-
-        echo 'Date: '.(($party['Party']['confirmed'] == 1) ? gmdate('Y-m-d h:ia', $party['Party']['date'] + (@$_SESSION['User']['tz'] * 60 * 60))." GMT".@$_SESSION['User']['tz'] : "TBA")."<br/>\n";
-
-        echo '<a href="'.$html->url('/parties/view/'.$party['Party']['id']).'">View Party</a>';
-      ?>
-      </p>
-    </div>
-  <?php endif; endforeach;
-    if (isset($prev))
-      echo '<a href="'.$html->url('/parties/view/all/'.$prev).'">&laquo; Previous Page</a> ';
-    if (isset($prev) && isset($next))
-      echo ' | ';
-    if (isset($next))
-      echo '<a href="'.$html->url('/parties/view/all/'.$next).'">Next Page &raquo;</a>';
-  endif;?>

mozilla/webtools/partytool/views/users/edit.thtml

@@ -1,105 +0,0 @@
-<?php if ($error): ?>
-<div class="error">
-  There was an error in your submission, please try again.
-</div>
-<?php endif; ?>
-<form class="fxform" action="<?php echo $html->url('/users/edit'); ?>" method="post">
-   <?php echo $html->hidden('User/id'); ?>
-  <h1>Profile</h1>
-  <div>
-    <label for="UserName" class="label-large">Name:</label>
-    <?php echo $html->input('User/name', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/name', 'You must enter a name.')?>
-  </div>
-  <div>
-    <label for="UserWebsite" class="label-large">Website:</label>
-    <?php echo $html->input('User/website', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/website', 'Invalid URL.')?>
-  </div>
-  <div>
-     <label for="location" class="label-large">Location:</label>
-    <?php echo $html->input('User/location', array('id' => 'location', 'size' => 40, 'onkeypress' => 'capture(event)')); ?>
-  </div>
-  <div>
-    <label for="UserTz" class="label-large">Timezone:</label>
-    <?php 
-      $tzs = array('-12' => 'GMT-12',
-                 '-11' => 'GMT-11',
-                 '-10' => 'GMT-10',
-                 '-9' => 'GMT-9',
-                 '-8' => 'GMT-8',
-                 '-7' => 'GMT-7',
-                 '-6' => 'GMT-6',
-                 '-5' => 'GMT-5',
-                 '-4' => 'GMT-4',
-                 '-3' => 'GMT-3',
-                 '-2' => 'GMT-2',
-                 '-1' => 'GMT-1',
-                 '0' => 'GMT+0',
-                 '1' => 'GMT+1',
-                 '2' => 'GMT+2',
-                 '3' => 'GMT+3',
-                 '4' => 'GMT+4',
-                 '5' => 'GMT+5',
-                 '6' => 'GMT+6',
-                 '7' => 'GMT+7',
-                 '8' => 'GMT+8',
-                 '9' => 'GMT+9',
-                 '10' => 'GMT+10',
-                 '11' => 'GMT+11',
-                 '12' => 'GMT+12',
-                 '13' => 'GMT+13');
-      echo $html->selectTag('User/tz', $tzs, $utz, null, null, false); 
-    ?>
-    (current time is <?php echo gmdate("Y-m-d H:i:s"); ?> GMT)
-  </div>
-  <?php if(GMAP_API_KEY != null): ?>
-  <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>"
-      type="text/javascript"></script>
-  <script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
-    <script type="text/javascript">
-
-    //<![CDATA[
-      function update() {
-        var loc = document.getElementById("location").value;
-        geocode(loc);
-      }
-      
-      function capture(event) {
-        if (event.keyCode == 13) {
-          event.preventDefault();
-          update();
-        }  
-      }
-    //]]>
-    </script>
-    <p id="map" class="small-map"></p>
-  <?php echo $html->hidden('User/lat', array('id' => 'lat')); 
-        echo $html->hidden('User/long', array('id' => 'long'));
-        echo $html->hidden('User/zoom', array('id' => 'zoom')); ?>
-  <?php endif; ?>
-  <h1>Privacy</h1>
-  <div>
-    <label for="UserShowemail" class="label-large">Show email:</label>
-    <?php echo $html->checkbox('User/showemail'); ?><br/>
-  </div>
-  <div>
-    <label for="UserShowloc" class="label-large">Show location:</label>
-    <?php echo $html->checkbox('User/showloc'); ?><br/>
-  </div>
-  <div>
-    <label for="UserShowmap" class="label-large">Show map:</label>
-    <?php echo $html->checkbox('User/showmap'); ?><br/>
-  </div>
-  <h1>Password</h1>
-  <div>
-    <label for="UserPassword" class="label-large">New password:</label>
-    <?php echo $html->password('User/password', array('size' => 20, 'autocomplete' => 'off')); ?>
-  </div>
-  <div>
-    <label for="UserConfpassword" class="label-large">Confirm new password:</label>
-    <?php echo $html->password('User/confpassword', array('size' => 20, 'autocomplete' => 'off')); ?>
-    <?php echo $html->tagErrorMsg('User/confpassword', 'The supplied passwords do not match!')?>
-  </div>
-  <?php echo $html->submit('Update'); ?>
-</form>

mozilla/webtools/partytool/views/users/index.thtml

@@ -1,61 +0,0 @@
-<h1>My Profile</h1>
-<br/>
-<h2>Parties I'm attending</h2>
-<p>
-<?php
-  $num_parties = count($parties);
-  if ($num_parties == 0)
-    echo 'None yet. <a href="'.$html->url('/parties/view/all').'">Find one!</a>';
-  
-  else {
-    $c = $num_parties - 1;
-    $i = 0;
-    foreach ($parties as $party) {
-      echo '<a href="'.$html->url('/parties/view/'.$party['parties']['id']).'">'.$party['parties']['name'].'</a>';
-      echo ($i < $c) ? ', ' : '';
-      $i++;
-    }
-  }
-?>
-</p>
-<h2>Parties I'm hosting</h2>
-<p>
-<?php
-  $num_parties = count($hparties);
-  if (empty($hparties))
-    echo 'None yet. <a href="'.$html->url('/parties/add').'">Create one!</a>';
-  
-  else {
-    $c = $num_parties - 1;
-    $i = 0;
-    foreach ($hparties as $party) {
-      echo '<a href="'.$html->url('/parties/view/'.$party['parties']['id']).'">'.$party['parties']['name'].'</a>';
-      echo ($i < $c) ? ', ' : '';
-      $i++;
-    }
-  }
-?>
-<h2>Parties I've been invited to</h2>
-<p>
-<?php
-  $num_parties = count($iparties);
-  if (empty($iparties))
-    echo 'None yet.';
-  
-  else {
-    $c = $num_parties - 1;
-    $i = 0;
-    foreach ($iparties as $party) {
-      echo '<a href="'.$html->url('/parties/view/'.$party['parties']['id']).'">'.$party['parties']['name'].'</a>';
-      echo ($i < $c) ? ', ' : '';
-      $i++;
-    }
-  }
-?>
-</p>
-<h2>Account Options</h2>
-<p>
-  <a href="<?php echo $html->url('/users/edit'); ?>">Edit my account</a>
-  <br/>
-  <a href="<?php echo $html->url('/users/logout'); ?>">Logout</a>
-</p>

mozilla/webtools/partytool/views/users/login.thtml

@@ -1,17 +0,0 @@
-<h1>Login</h1>
-<form class="fxform" action="<?php echo $html->url('/users/login'); ?>" method="post">
-  <div>
-    <label class="label-large" for="UserEmail">Email Address:</label>
-    <?php echo $html->input('User/email', array('size' => 40)); ?>
-  </div>
-  <div>
-    <label class="label-large" for="UserPassword">Password:</label>
-    <?php echo $html->password('User/password', array('size' => 40)); ?>
-  </div>
-  <div>
-    <?php echo $html->submit('Login'); ?>
-  </div>
-  <p>
-    <a href="<?php echo $html->url('/users/register'); ?>">Create an account</a> | <a href="<?php echo $html->url('/users/recover/password'); ?>">Forgot your password?</a>
-  </p>
-</form>

mozilla/webtools/partytool/views/users/recover.thtml

@@ -1,26 +0,0 @@
-<h1><?php echo $atitle; ?></h1>
-<form class="fxform" action="<?php 
-  if (isset($reset))
-    echo $html->url('/users/recover/reset/'.$code);
-  else
-    echo $html->url('/users/recover/'.$url); ?>" method="post">
-  <?php if (isset($error)): ?>
-  <div class="error">
-    <?php echo $error; ?>
-  </div>
-  <?php endif; ?>
-  <div>
-  <?php if (!$hideInput): ?>
-    <label class="label-large" for="UserEmail">Email address:</label>
-    <?php echo $html->input('User/email'); ?>
-  <?php endif;
-    if (isset($reset)): ?>
-    <label class="label-large" for="UserPassword">New password:</label>
-    <?php echo $html->password('User/password'); ?>
-    <br/>
-    <label class="label-large" for="UserConfirm">Confirm password:</label>
-    <?php echo $html->password('User/confirm'); ?>
-  <?php endif; ?>
-  </div>
-  <?php echo $html->submit('Submit'); ?>
-</form>

mozilla/webtools/partytool/views/users/register.thtml

@@ -1,110 +0,0 @@
-<h1>Register</h1>
-<form class="fxform" action="<?php echo $html->url('/users/register'); ?>" method="post">
-  <p>Your e-mail address is used as your username to login. You'll also receive a confirmation e-mail to
-    this address. In order for your account to be activated successfully, you must specify a valid e-mail address.</p>
-  <div>
-    <label class="label-large" for="UserEmail">Email address<span class="required">*</span>:</label>
-    <?php echo $html->input('User/email', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/email', 'The email address you entered is invalid or has already been registered.')?>
-  </div>
-  <div>
-    <label class="label-large" for="UserConfemail">Confirm Email address<span class="required">*</span>:</label>
-    <?php echo $html->input('User/confemail', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/confemail', 'The email addresses you entered do not match.')?>
-  </div>
-  <p>How do you want to be known to visitors of <?php echo APP_NAME; ?>?</p>
-  <div>
-    <label class="label-large" for="UserName">Name<span class="required">*</span>:</label>
-    <?php echo $html->input('User/name', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/name', 'You must enter a name.')?>
-  </div>
-  <p>If you choose to enter it, your location will be shown on your profile. This
-    field is optional.
-  <div>
-    <label class="label-large" for="UserLocation">Location:</label>
-    <?php echo $html->input('User/location', array('id' => 'location', 'size' => 40, 'onkeypress' => 'capture(event)', 'onblur' => 'update()')); ?>
-    <div id="locerr" class="info" style="display: none">Did you mean: <a id="locerrlink" onclick="geocode_suggest()" href="#"></a>?  <a href="#" onclick="shide()"><span style="font-size: x-small">(close)</span></a></div>
-  </div>
-  <p>If you have a website, enter the URL here. (including the http:// ) Your website will be
-    shown to site visitors on your author profile page. This field is optional; if you don't
-    have a website or don't want it linked to from <?php echo APP_NAME; ?>, leave this box blank.</p>
-  <div>
-    <label class="label-large" for="UserWebsite">Website:</label>
-    <?php echo $html->input('User/website', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/website', 'Invalid URL.')?>
-  </div>
-  <div>
-    <label class="label-large" for="UserTz">Timezone<span class="required">*</span>:</label>
-    <?php 
-      $tzs = array('-12' => 'GMT-12',
-                 '-11' => 'GMT-11',
-                 '-10' => 'GMT-10',
-                 '-9' => 'GMT-9',
-                 '-8' => 'GMT-8',
-                 '-7' => 'GMT-7',
-                 '-6' => 'GMT-6',
-                 '-5' => 'GMT-5',
-                 '-4' => 'GMT-4',
-                 '-3' => 'GMT-3',
-                 '-2' => 'GMT-2',
-                 '-1' => 'GMT-1',
-                 '0' => 'GMT+0',
-                 '1' => 'GMT+1',
-                 '2' => 'GMT+2',
-                 '3' => 'GMT+3',
-                 '4' => 'GMT+4',
-                 '5' => 'GMT+5',
-                 '6' => 'GMT+6',
-                 '7' => 'GMT+7',
-                 '8' => 'GMT+8',
-                 '9' => 'GMT+9',
-                 '10' => 'GMT+10',
-                 '11' => 'GMT+11',
-                 '12' => 'GMT+12',
-                 '13' => 'GMT+13');
-      echo $html->selectTag('User/tz', $tzs, $utz, null, null, false); 
-    ?>
-    (this page was loaded at <?php echo gmdate("Y-m-d H:i:s"); ?> GMT)
-  </div>
-  <div>
-    <label class="label-large" for="password">Password<span class="required">*</span>:</label>
-    <?php echo $html->password('User/password', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/password', 'You must enter a password.')?>
-  </div>
-  <div>
-    <label class="label-large" for="confpassword">Confirm password<span class="required">*</span>:</label>
-    <?php echo $html->password('User/confpass', array('size' => 40)); ?>
-    <?php echo $html->tagErrorMsg('User/confpass', 'The passwords you supplied do not match.')?>
-  </div>
-  <?php if(GMAP_API_KEY != null): ?>
-  <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>"
-      type="text/javascript"></script>
-  <script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
-    <script type="text/javascript">
-    //<![CDATA[
-      function update() {
-        var loc = document.getElementById("location").value;
-        geocode(loc);
-      }
-      
-      function capture(event) {
-        if (event.keyCode == 13) {
-          event.preventDefault();
-          update();
-        }  
-      }
-    //]]>
-    </script>
-    <p><span class="required">*</span> Required field</p>
-    <p>Drag the map or the marker to specify your location. Set the zoom by using the '+' or '-' buttons on the left.</p>
-    <p id="map" class="med-map-r"></p>
-  <div>
-    <?php echo $html->hidden('User/lat', array('id' => 'lat')); 
-          echo $html->hidden('User/long', array('id' => 'long'));
-          echo $html->hidden('User/zoom', array('id' => 'zoom'));
-          echo $html->hidden('User/geocoded', array('id' => 'geocoded', 'value' => 0));
-          echo $html->hidden('User/icode', array('value' => @$icode)); ?>
-  </div>
-  <?php endif; ?>
-  <?php echo $html->submit('Register'); ?>
-</form>

mozilla/webtools/partytool/views/users/view.thtml

@@ -1,44 +0,0 @@
-<?php
-  if (!empty($user['User']['name']))
-    echo "<h1>".$user['User']['name']."</h1><br/>";
-    
-  if ($user['User']['showemail'] == 1 && @$_SESSION['User'])
-    echo "Email: ".$user['User']['email']."<br/>"; 
-  
-  if ($user['User']['showloc'] == 1 && !empty($user['User']['location']))
-    echo "Location: ".$user['User']['location']."<br/>";
-  
-  if (!empty($user['User']['website']) && preg_match("/^(http|https)\:\/\//i", $user['User']['website']))
-    echo 'Website: <a href="'.$user['User']['website'].'" rel="nofollow">'.$user['User']['website'].'</a><br/>';
-  
-  if (!empty($parties)) {
-    echo "Attending: ";
-    $c = count($parties) - 1;
-    $i = 0;
-    
-    foreach ($parties as $party) {
-      echo '<a href="'.$html->url('/parties/view/'.$party['parties']['id']).'">'.$party['parties']['name'].'</a>';
-      echo ($i < $c) ? ', ' : '<br/>';
-      $i++;
-    }
-  }
-  
-  if (!empty($hparties)) {
-    echo "Hosting: ";
-    $c = count($hparties) - 1;
-    $i = 0;
-    
-    foreach ($hparties as $party) {
-      echo '<a href="'.$html->url('/parties/view/'.$party['parties']['id']).'">'.$party['parties']['name'].'</a>';
-      echo ($i < $c) ? ', ' : '<br/>';
-      $i++;
-    }
-  }
-?>
-
-<?php if(isset($map) && $user['User']['showmap'] == 1): ?>
-<br/>
-<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>" type="text/javascript"></script>
-<script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
-<div id="map" style="height: 200px; width: 350px;"></div>
-<?php endif; ?>

mozilla/webtools/partytool/webroot/.htaccess

@@ -1,6 +0,0 @@
-<IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
-</IfModule>

mozilla/webtools/partytool/webroot/css.php

@@ -1,101 +0,0 @@
-<?php
-/* SVN FILE: $Id: css.php,v 1.4 2006-10-08 03:39:23 reed%reedloden.com Exp $ */
-/**
- * Short description for file.
- *
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c)	2006, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package			cake
- * @subpackage		cake.app.webroot
- * @since			CakePHP v 0.2.9
- * @version			$Revision: 1.4 $
- * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2006-10-08 03:39:23 $
- * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-	header('HTTP/1.1 404 Not Found');
-}
-/**
- * Enter description here...
- */
-	require(LIBS . 'folder.php');
-	require(LIBS . 'legacy.php');
-/**
- * Enter description here...
- *
- * @param unknown_type $path
- * @param unknown_type $name
- * @return unknown
- */
-	function make_clean_css($path, $name) {
-		 require(VENDORS . 'csspp' . DS . 'csspp.php');
-		 $data  =file_get_contents($path);
-		 $csspp =new csspp();
-		 $output=$csspp->compress($data);
-		 $ratio =100 - (round(strlen($output) / strlen($data), 3) * 100);
-		 $output=" /* file: $name, ratio: $ratio% */ " . $output;
-		 return $output;
-	}
-/**
- * Enter description here...
- *
- * @param unknown_type $path
- * @param unknown_type $content
- * @return unknown
- */
-	function write_css_cache($path, $content) {
-		 if (!is_dir(dirname($path))) {
-			  mkdir(dirname($path));
-		 }
-		 $cache=new File($path);
-		 return $cache->write($content);
-	}
-
-	if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs)) {
-		 die('Wrong file name.');
-	}
-
-	$filename = 'css/' . $regs[1];
-	$filepath = CSS . $regs[1];
-	$cachepath = CACHE . 'css' . DS . str_replace(array('/','\\'), '-', $regs[1]);
-
-	if (!file_exists($filepath)) {
-		 die('Wrong file name.');
-	}
-
-	if (file_exists($cachepath)) {
-		 $templateModified=filemtime($filepath);
-		 $cacheModified   =filemtime($cachepath);
-
-		 if ($templateModified > $cacheModified) {
-			  $output=make_clean_css($filepath, $filename);
-			  write_css_cache($cachepath, $output);
-		 } else {
-			  $output = file_get_contents($cachepath);
-		 }
-	} else {
-		 $output=make_clean_css($filepath, $filename);
-		 write_css_cache($cachepath, $output);
-	}
-
-	header("Date: " . date("D, j M Y G:i:s ", $templateModified) . 'GMT');
-	header("Content-Type: text/css");
-	header("Expires: " . gmdate("D, j M Y H:i:s", time() + DAY) . " GMT");
-	header("Cache-Control: cache"); // HTTP/1.1
-	header("Pragma: cache");        // HTTP/1.0
-	print $output;
-?>

mozilla/webtools/partytool/webroot/css/main.css

@@ -1,230 +0,0 @@
-.error, .error_message {
-  background: #ffa5a5;
-  border: 1px solid red;
-  text-align: center;
-  font-weight: bold;
-  padding: 5px;
-  margin: 5px 0 5px 0;
-}
-
-.form_error {
-  background: #ffa5a5;
-  border: 1px solid red;
-}
-
-.info {
-  background: #fffe94;
-  border: 1px solid yellow;
-  text-align: center;
-  font-weight: bold;
-  padding: 5px;
-  margin: 5px 0 5px 0;
-}
-
-.att { color: #d4d4d4; }
-
-#f-left {
-  width: 75%;
-  float: left;
-}
-
-#f-right {
-  width: 25%;
-  float: right;
-}
-
-.cbox {
-  text-align: center;
-  border: 1px solid #808080;
-  background: #eee;
-  padding: 5px;
-  margin: 10px;
-}
-
-.cbox a { outline: none; }
-
-.ctxt {
-  font-size: 200%;
-  font-weight: bold;
-}
-
-.cfeed {
-  position: relative;
-  bottom: 15px;
-  float: right;
-  height: 16px;
-  width: 16px;
-}
-
-.ifeed {
-  position: relative;
-  bottom: 15px;
-  float: right;
-  height: 16px;
-  width: 34px;
-}
-
-.required { color: red; font-weight: bold;}
-
-.fxform div {  margin: 1em 0; }
-
-.label-large, .label-medium, .label-small {
-    border-bottom: 1px dashed #eee;
-    float: left;
-    font-weight: bold;
-}
-
-.label-large { width: 14em; }
-
-.large-map { width: 700px; height: 500px; margin: 0 auto; }
-.med-map-r { width: 500px; height: 300px; margin: 0 auto; }
-.med-map-r div { margin: 0; }
-.small-map { width: 400px; height: 200px;}
-.small-map div { margin: 0; }
-
-.load { width: 700px; margin: 0 auto; padding-top: 5px; }
-
-.comment { 
-  border: 1px solid #ccc;
-  border-top: 0;
-  padding: 10px 5px 0 5px;
-}
-.comment-mod { background: #ecedf3; }
-
-.comment-content { font-size: 125%; padding-bottom: 50px; }
-.comment-tag { font-size: 75%; }
-
-h1 { border-bottom: 1px solid #ccc;
-  margin-bottom: 0;}
-  
-#footer { padding: 30px 0 20px 0; }
-
-img { border: none }
-
-body {
-  background: #fff url("../img/body_back.png") top repeat-x;
-  color: #555;
-  font-family: arial, sans-serif;
-  margin: 0 10px;
-  padding: 0;
-  font-size:    x-small;
-  voice-family: "\"}\"";
-  voice-family: inherit;
-  font-size:    small;
-}
-
-a { color: #34518c; text-decoration: none; }
-a:hover { text-decoration: underline; }
-
-#container {
-  width: 740px;
-  margin: 0 auto;
-}
-
-#mozilla-com a {
-  float: right;
-  display: block;
-  outline: none;
-  text-indent: -5000em;
-  width: 110px;
-  height: 25px;
-  text-decoration: none;
-  background: url("../img/mozilla-org.png") no-repeat;
-}
-
-#key-menu {
-  background: #B2C1C8 url("../img/header-bottom.gif") 0 100% no-repeat;
-  padding: 0 0 10px 0;
-  overflow: auto;
-  margin-bottom: 1em;
-}
-
-* html #key-menu {
-  overflow: visible;
-  height: 1px;
-}
-
-#key-menu ul, #key-menu li {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-#key-menu ul {
-  padding: 14px 12px 0 12px;
-  background: url("../img/header-top.gif") 0 0 no-repeat;
-}
-
-#key-menu li {
-  float: left;
-  background: url("../img/tabs.gif") 100% -50px;
-  padding-right: 5px;
-  margin-right: 2px;
-  border-bottom: 1px solid #849CA4;
-  margin-bottom: -10px;
-}
-
-#key-menu li a, #key-menu li span {
-  display: block;
-  float: left;
-  padding: 3px 15px 2px 20px;
-  background: url("../img/tabs.gif") 0 -50px;
-  color: #5A7CBA;
-  text-decoration: none;
-}
-
-#key-menu li:hover a {
-  background-position: 0 -100px;
-}
-
-#key-menu li:hover {
-  background-position: 100% -100px;
-}
-
-#key-menu li.current {
-  background: url("../img/tabs.gif") 100% 0;
-  border-bottom-color: white;
-}
-
-#key-menu li.current a, #key-menu li.current span {
-  background: url("../img/tabs.gif") 0 0;
-  color: #999;
-}
-
-#key-menu a:focus { outline: none; }
-
-#header {
-  clear: both;
-  padding-top: 40px;
-  position: relative;
-} * html #header { padding-top: 20px; }
-
-#header h1 {
-  height: 46px;
-  margin: 0;
-  font-size: 2px;
-  position: absolute;
-  top: 0;
-  left: -4px;
-  border: none;
-  z-index: 5000;
-}
-
-#user {
-  position: absolute;
-  right: 0;
-  top: 9px;
-  margin-left: 200px;
-  font-family: tahoma, arial, sans-serif;
-  font-size: 95%;
-}
-
-.skipLink {
-  position: absolute;
-  left: -1200px;
-  width: 990px;
-}
-
-#map {
-  border: 1px solid #555;
-}