1656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project/* dsa_asn1.c */
2e45f106cb6b47af1f21efe76e933bdea2f5dd1caNagendra Modadugu/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * project 2000.
4656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project */
5656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project/* ====================================================================
6221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
7656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
8656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * Redistribution and use in source and binary forms, with or without
9656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * modification, are permitted provided that the following conditions
10656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * are met:
11656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
12656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * 1. Redistributions of source code must retain the above copyright
13656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    notice, this list of conditions and the following disclaimer.
14656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
15656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * 2. Redistributions in binary form must reproduce the above copyright
16656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    notice, this list of conditions and the following disclaimer in
17656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    the documentation and/or other materials provided with the
18656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    distribution.
19656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
20656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * 3. All advertising materials mentioning features or use of this
21656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    software must display the following acknowledgment:
22656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    "This product includes software developed by the OpenSSL Project
23656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
24656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
25656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    endorse or promote products derived from this software without
27656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    prior written permission. For written permission, please contact
28656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    licensing@OpenSSL.org.
29656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
30656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * 5. Products derived from this software may not be called "OpenSSL"
31656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    nor may "OpenSSL" appear in their names without prior written
32656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    permission of the OpenSSL Project.
33656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
34656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * 6. Redistributions of any form whatsoever must retain the following
35656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    acknowledgment:
36656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    "This product includes software developed by the OpenSSL Project
37656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
38656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
39656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
43656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * OF THE POSSIBILITY OF SUCH DAMAGE.
51656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * ====================================================================
52656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
53656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * This product includes cryptographic software written by Eric Young
54656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * (eay@cryptsoft.com).  This product includes software written by Tim
55656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * Hudson (tjh@cryptsoft.com).
56656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project *
57656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project */
58656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
59656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project#include <stdio.h>
60656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project#include "cryptlib.h"
61656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project#include <openssl/dsa.h>
62656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project#include <openssl/asn1.h>
63656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project#include <openssl/asn1t.h>
64392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom#include <openssl/rand.h>
65656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
66656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project/* Override the default new methods */
67221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstromstatic int sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
68221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom								void *exarg)
69656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project{
70656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	if(operation == ASN1_OP_NEW_PRE) {
71656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		DSA_SIG *sig;
72656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		sig = OPENSSL_malloc(sizeof(DSA_SIG));
73221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom		if (!sig)
74221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom			{
75221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom			DSAerr(DSA_F_SIG_CB, ERR_R_MALLOC_FAILURE);
76221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom			return 0;
77221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom			}
78656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		sig->r = NULL;
79656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		sig->s = NULL;
80656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		*pval = (ASN1_VALUE *)sig;
81221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom		return 2;
82656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	}
83656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	return 1;
84656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project}
85656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
86656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectASN1_SEQUENCE_cb(DSA_SIG, sig_cb) = {
87656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA_SIG, r, CBIGNUM),
88656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA_SIG, s, CBIGNUM)
89656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project} ASN1_SEQUENCE_END_cb(DSA_SIG, DSA_SIG)
90656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
91392aa7cc7d2b122614c5393c3e357da07fd07af3Brian CarlstromIMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA_SIG, DSA_SIG, DSA_SIG)
92656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
93656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project/* Override the default free and new methods */
94221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstromstatic int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
95221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom							void *exarg)
96656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project{
97656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	if(operation == ASN1_OP_NEW_PRE) {
98656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		*pval = (ASN1_VALUE *)DSA_new();
99656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		if(*pval) return 2;
100656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		return 0;
101656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	} else if(operation == ASN1_OP_FREE_PRE) {
102656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		DSA_free((DSA *)*pval);
103656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		*pval = NULL;
104656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project		return 2;
105656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	}
106656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	return 1;
107656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project}
108656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
109656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectASN1_SEQUENCE_cb(DSAPrivateKey, dsa_cb) = {
110656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, version, LONG),
111656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, p, BIGNUM),
112656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, q, BIGNUM),
113656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, g, BIGNUM),
114656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, pub_key, BIGNUM),
115656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, priv_key, BIGNUM)
116656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project} ASN1_SEQUENCE_END_cb(DSA, DSAPrivateKey)
117656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
118656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectIMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPrivateKey, DSAPrivateKey)
119656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
120656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectASN1_SEQUENCE_cb(DSAparams, dsa_cb) = {
121656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, p, BIGNUM),
122656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, q, BIGNUM),
123656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, g, BIGNUM),
124656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project} ASN1_SEQUENCE_END_cb(DSA, DSAparams)
125656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
126656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectIMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAparams, DSAparams)
127656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
128656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project/* DSA public key is a bit trickier... its effectively a CHOICE type
129656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * decided by a field called write_params which can either write out
130656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * just the public key as an INTEGER or the parameters and public key
131656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project * in a SEQUENCE
132656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project */
133656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
134656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectASN1_SEQUENCE(dsa_pub_internal) = {
135656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, pub_key, BIGNUM),
136656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, p, BIGNUM),
137656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, q, BIGNUM),
138656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, g, BIGNUM)
139656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project} ASN1_SEQUENCE_END_name(DSA, dsa_pub_internal)
140656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
141656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectASN1_CHOICE_cb(DSAPublicKey, dsa_cb) = {
142656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_SIMPLE(DSA, pub_key, BIGNUM),
143656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project	ASN1_EX_COMBINE(0, 0, dsa_pub_internal)
144656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project} ASN1_CHOICE_END_cb(DSA, DSAPublicKey, write_params)
145656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source Project
146656d9c7f52f88b3a3daccafa7655dec086c4756eThe Android Open Source ProjectIMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPublicKey, DSAPublicKey)
147e45f106cb6b47af1f21efe76e933bdea2f5dd1caNagendra Modadugu
148221304ee937bc0910948a8be1320cb8cc4eb6d36Brian CarlstromDSA *DSAparams_dup(DSA *dsa)
149e45f106cb6b47af1f21efe76e933bdea2f5dd1caNagendra Modadugu	{
150221304ee937bc0910948a8be1320cb8cc4eb6d36Brian Carlstrom	return ASN1_item_dup(ASN1_ITEM_rptr(DSAparams), dsa);
151e45f106cb6b47af1f21efe76e933bdea2f5dd1caNagendra Modadugu	}
152392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom
153392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstromint DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig,
154392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	     unsigned int *siglen, DSA *dsa)
155392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	{
156392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	DSA_SIG *s;
157392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	RAND_seed(dgst, dlen);
158392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	s=DSA_do_sign(dgst,dlen,dsa);
159392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	if (s == NULL)
160392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom		{
161392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom		*siglen=0;
162392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom		return(0);
163392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom		}
164392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	*siglen=i2d_DSA_SIG(s,&sig);
165392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	DSA_SIG_free(s);
166392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	return(1);
167392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	}
168392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom
169392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom/* data has already been hashed (probably with SHA or SHA-1). */
170392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom/* returns
171392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom *      1: correct signature
172392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom *      0: incorrect signature
173392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom *     -1: error
174392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom */
175392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstromint DSA_verify(int type, const unsigned char *dgst, int dgst_len,
176392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	     const unsigned char *sigbuf, int siglen, DSA *dsa)
177392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	{
178392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	DSA_SIG *s;
179392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	int ret=-1;
180392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom
181392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	s = DSA_SIG_new();
182392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	if (s == NULL) return(ret);
183392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	if (d2i_DSA_SIG(&s,&sigbuf,siglen) == NULL) goto err;
184392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	ret=DSA_do_verify(dgst,dgst_len,s,dsa);
185392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstromerr:
186392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	DSA_SIG_free(s);
187392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	return(ret);
188392aa7cc7d2b122614c5393c3e357da07fd07af3Brian Carlstrom	}
189