This commit was manufactured by cvs2git to create tag 'OPENBSD_5_7_BASE'.OPENBSD_5_7_BASE

1 files changed, 0 insertions, 308 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_asn1.c b/src/lib/libcrypto/rsa/rsa_asn1.c
deleted file mode 100644
index 27afdece00..0000000000
--- a/src/lib/libcrypto/rsa/rsa_asn1.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* $OpenBSD: rsa_asn1.c,v 1.12 2015/02/14 15:06:55 jsing Exp $ */
-/* 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 <stdio.h>
-
-#include <openssl/asn1t.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
-
-/* Override the default free and new methods */
-static int
-rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
-{
-        if (operation == ASN1_OP_NEW_PRE) {
-                *pval = (ASN1_VALUE *)RSA_new();
-                if (*pval)
-                        return 2;
-                return 0;
-        } else if (operation == ASN1_OP_FREE_PRE) {
-                RSA_free((RSA *)*pval);
-                *pval = NULL;
-                return 2;
-        }
-        return 1;
-}
-
-static const ASN1_AUX RSAPrivateKey_aux = {
-        .app_data = NULL,
-        .flags = 0,
-        .ref_offset = 0,
-        .ref_lock = 0,
-        .asn1_cb = rsa_cb,
-        .enc_offset = 0,
-};
-static const ASN1_TEMPLATE RSAPrivateKey_seq_tt[] = {
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, version),
-                .field_name = "version",
-                .item = &LONG_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, n),
-                .field_name = "n",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, e),
-                .field_name = "e",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, d),
-                .field_name = "d",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, p),
-                .field_name = "p",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, q),
-                .field_name = "q",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, dmp1),
-                .field_name = "dmp1",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, dmq1),
-                .field_name = "dmq1",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, iqmp),
-                .field_name = "iqmp",
-                .item = &BIGNUM_it,
-        },
-};
-
-const ASN1_ITEM RSAPrivateKey_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = RSAPrivateKey_seq_tt,
-        .tcount = sizeof(RSAPrivateKey_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .funcs = &RSAPrivateKey_aux,
-        .size = sizeof(RSA),
-        .sname = "RSA",
-};
-
-
-static const ASN1_AUX RSAPublicKey_aux = {
-        .app_data = NULL,
-        .flags = 0,
-        .ref_offset = 0,
-        .ref_lock = 0,
-        .asn1_cb = rsa_cb,
-        .enc_offset = 0,
-};
-static const ASN1_TEMPLATE RSAPublicKey_seq_tt[] = {
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, n),
-                .field_name = "n",
-                .item = &BIGNUM_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(RSA, e),
-                .field_name = "e",
-                .item = &BIGNUM_it,
-        },
-};
-
-const ASN1_ITEM RSAPublicKey_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = RSAPublicKey_seq_tt,
-        .tcount = sizeof(RSAPublicKey_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .funcs = &RSAPublicKey_aux,
-        .size = sizeof(RSA),
-        .sname = "RSA",
-};
-
-static const ASN1_TEMPLATE RSA_PSS_PARAMS_seq_tt[] = {
-        {
-                .flags = ASN1_TFLG_EXPLICIT | ASN1_TFLG_OPTIONAL,
-                .tag = 0,
-                .offset = offsetof(RSA_PSS_PARAMS, hashAlgorithm),
-                .field_name = "hashAlgorithm",
-                .item = &X509_ALGOR_it,
-        },
-        {
-                .flags = ASN1_TFLG_EXPLICIT | ASN1_TFLG_OPTIONAL,
-                .tag = 1,
-                .offset = offsetof(RSA_PSS_PARAMS, maskGenAlgorithm),
-                .field_name = "maskGenAlgorithm",
-                .item = &X509_ALGOR_it,
-        },
-        {
-                .flags = ASN1_TFLG_EXPLICIT | ASN1_TFLG_OPTIONAL,
-                .tag = 2,
-                .offset = offsetof(RSA_PSS_PARAMS, saltLength),
-                .field_name = "saltLength",
-                .item = &ASN1_INTEGER_it,
-        },
-        {
-                .flags = ASN1_TFLG_EXPLICIT | ASN1_TFLG_OPTIONAL,
-                .tag = 3,
-                .offset = offsetof(RSA_PSS_PARAMS, trailerField),
-                .field_name = "trailerField",
-                .item = &ASN1_INTEGER_it,
-        },
-};
-
-const ASN1_ITEM RSA_PSS_PARAMS_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = RSA_PSS_PARAMS_seq_tt,
-        .tcount = sizeof(RSA_PSS_PARAMS_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .funcs = NULL,
-        .size = sizeof(RSA_PSS_PARAMS),
-        .sname = "RSA_PSS_PARAMS",
-};
-
-
-RSA_PSS_PARAMS *
-d2i_RSA_PSS_PARAMS(RSA_PSS_PARAMS **a, const unsigned char **in, long len)
-{
-        return (RSA_PSS_PARAMS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &RSA_PSS_PARAMS_it);
-}
-
-int
-i2d_RSA_PSS_PARAMS(RSA_PSS_PARAMS *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &RSA_PSS_PARAMS_it);
-}
-
-RSA_PSS_PARAMS *
-RSA_PSS_PARAMS_new(void)
-{
-        return (RSA_PSS_PARAMS *)ASN1_item_new(&RSA_PSS_PARAMS_it);
-}
-
-void
-RSA_PSS_PARAMS_free(RSA_PSS_PARAMS *a)
-{
-        ASN1_item_free((ASN1_VALUE *)a, &RSA_PSS_PARAMS_it);
-}
-
-
-RSA *
-d2i_RSAPrivateKey(RSA **a, const unsigned char **in, long len)
-{
-        return (RSA *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &RSAPrivateKey_it);
-}
-
-int
-i2d_RSAPrivateKey(const RSA *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &RSAPrivateKey_it);
-}
-
-
-RSA *
-d2i_RSAPublicKey(RSA **a, const unsigned char **in, long len)
-{
-        return (RSA *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &RSAPublicKey_it);
-}
-
-int
-i2d_RSAPublicKey(const RSA *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &RSAPublicKey_it);
-}
-
-RSA *
-RSAPublicKey_dup(RSA *rsa)
-{
-        return ASN1_item_dup(ASN1_ITEM_rptr(RSAPublicKey), rsa);
-}
-
-RSA *
-RSAPrivateKey_dup(RSA *rsa)
-{
-        return ASN1_item_dup(ASN1_ITEM_rptr(RSAPrivateKey), rsa);
-}