3cadf63c68
This imports upstream's ea6b07b54c1f8fc2275a121cdda071e2df7bd6c1 along with a bugfix in 987157f6f63fa70dbeffca3c8bc62f26e9767ff2. In an SPKI, a DSA key is only an INTEGER, with the group information in the AlgorithmIdentifier. But a standalone DSAPublicKey is more complex (and apparently made up by OpenSSL). OpenSSL implemented this with a write_params boolean and making DSAPublicKey a CHOICE. Instead, have p_dsa_asn1.c encode an INTEGER directly. d2i_DSAPublicKey only parses the standalone form. (That code will be replaced later, but first do this in preparation for rewriting the DSA ASN.1 code.) Change-Id: I6fbe298d2723b9816806e9c196c724359b9ffd63 Reviewed-on: https://boringssl-review.googlesource.com/7021 Reviewed-by: Adam Langley <agl@google.com>
141 lines
4.9 KiB
C
141 lines
4.9 KiB
C
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
|
* project 2000. */
|
|
/* ====================================================================
|
|
* Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* 3. All advertising materials mentioning features or use of this
|
|
* software must display the following acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
|
|
*
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
* endorse or promote products derived from this software without
|
|
* prior written permission. For written permission, please contact
|
|
* licensing@OpenSSL.org.
|
|
*
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
* permission of the OpenSSL Project.
|
|
*
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
* acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
* ====================================================================
|
|
*
|
|
* This product includes cryptographic software written by Eric Young
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
* Hudson (tjh@cryptsoft.com). */
|
|
|
|
#include <openssl/dsa.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/asn1t.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/mem.h>
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
static int dsa_sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
|
|
void *exarg) {
|
|
if (operation != ASN1_OP_NEW_PRE) {
|
|
return 1;
|
|
}
|
|
|
|
DSA_SIG *sig;
|
|
sig = OPENSSL_malloc(sizeof(DSA_SIG));
|
|
if (!sig) {
|
|
OPENSSL_PUT_ERROR(DSA, ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
|
|
memset(sig, 0, sizeof(DSA_SIG));
|
|
*pval = (ASN1_VALUE *)sig;
|
|
return 2;
|
|
}
|
|
|
|
ASN1_SEQUENCE_cb(DSA_SIG, dsa_sig_cb) = {
|
|
ASN1_SIMPLE(DSA_SIG, r, CBIGNUM),
|
|
ASN1_SIMPLE(DSA_SIG, s, CBIGNUM)} ASN1_SEQUENCE_END_cb(DSA_SIG, DSA_SIG);
|
|
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA_SIG, DSA_SIG, DSA_SIG);
|
|
|
|
|
|
static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
|
|
void *exarg) {
|
|
switch (operation) {
|
|
case ASN1_OP_NEW_PRE:
|
|
*pval = (ASN1_VALUE *)DSA_new();
|
|
if (*pval) {
|
|
return 2;
|
|
}
|
|
return 0;
|
|
|
|
case ASN1_OP_FREE_PRE:
|
|
DSA_free((DSA *)*pval);
|
|
*pval = NULL;
|
|
return 2;
|
|
|
|
default:
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
ASN1_SEQUENCE_cb(DSAPrivateKey, dsa_cb) = {
|
|
ASN1_SIMPLE(DSA, version, LONG),
|
|
ASN1_SIMPLE(DSA, p, BIGNUM),
|
|
ASN1_SIMPLE(DSA, q, BIGNUM),
|
|
ASN1_SIMPLE(DSA, g, BIGNUM),
|
|
ASN1_SIMPLE(DSA, pub_key, BIGNUM),
|
|
ASN1_SIMPLE(DSA, priv_key, BIGNUM)} ASN1_SEQUENCE_END_cb(DSA,
|
|
DSAPrivateKey);
|
|
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPrivateKey, DSAPrivateKey);
|
|
|
|
ASN1_SEQUENCE_cb(DSAparams, dsa_cb) = {
|
|
ASN1_SIMPLE(DSA, p, BIGNUM), ASN1_SIMPLE(DSA, q, BIGNUM),
|
|
ASN1_SIMPLE(DSA, g, BIGNUM), } ASN1_SEQUENCE_END_cb(DSA, DSAparams);
|
|
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAparams, DSAparams);
|
|
|
|
ASN1_SEQUENCE_cb(DSAPublicKey, dsa_cb) = {
|
|
ASN1_SIMPLE(DSA, pub_key, BIGNUM),
|
|
ASN1_SIMPLE(DSA, p, BIGNUM),
|
|
ASN1_SIMPLE(DSA, q, BIGNUM),
|
|
ASN1_SIMPLE(DSA, g, BIGNUM)
|
|
} ASN1_SEQUENCE_END_cb(DSA, DSAPublicKey);
|
|
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPublicKey, DSAPublicKey);
|
|
|
|
DSA *DSAparams_dup(const DSA *dsa) {
|
|
return ASN1_item_dup(ASN1_ITEM_rptr(DSAparams), (DSA*) dsa);
|
|
}
|