This commit was generated by cvs2git to track changes on a CVS vendor

branch.

4 files changed, 455 insertions, 0 deletions

diff --git a/src/lib/libcrypto/objects/obj_xref.c b/src/lib/libcrypto/objects/obj_xref.c
new file mode 100644
index 0000000000..152eca5c67
--- /dev/null
+++ b/src/lib/libcrypto/objects/obj_xref.c
@@ -0,0 +1,231 @@
+/* crypto/objects/obj_xref.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project 2006.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 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/objects.h>
+#include "obj_xref.h"
+
+DECLARE_STACK_OF(nid_triple)
+STACK_OF(nid_triple) *sig_app, *sigx_app;
+
+static int sig_cmp(const nid_triple *a, const nid_triple *b)
+        {
+        return a->sign_id - b->sign_id;
+        }
+
+DECLARE_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
+
+static int sig_sk_cmp(const nid_triple * const *a, const nid_triple * const *b)
+        {
+        return (*a)->sign_id - (*b)->sign_id;
+        }
+
+DECLARE_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
+
+static int sigx_cmp(const nid_triple * const *a, const nid_triple * const *b)
+        {
+        int ret;
+        ret = (*a)->hash_id - (*b)->hash_id;
+        if (ret)
+                return ret;
+        return (*a)->pkey_id - (*b)->pkey_id;
+        }
+
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
+
+int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
+        {
+        nid_triple tmp;
+        const nid_triple *rv = NULL;
+        tmp.sign_id = signid;
+
+        if (sig_app)
+                {
+                int idx = sk_nid_triple_find(sig_app, &tmp);
+                if (idx >= 0)
+                        rv = sk_nid_triple_value(sig_app, idx);
+                }
+
+#ifndef OBJ_XREF_TEST2
+        if (rv == NULL)
+                {
+                rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
+                                 sizeof(sigoid_srt) / sizeof(nid_triple));
+                }
+#endif
+        if (rv == NULL)
+                return 0;
+        *pdig_nid = rv->hash_id;
+        *ppkey_nid = rv->pkey_id;
+        return 1;
+        }
+
+int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
+        {
+        nid_triple tmp;
+        const nid_triple *t=&tmp;
+        const nid_triple **rv = NULL;
+
+        tmp.hash_id = dig_nid;
+        tmp.pkey_id = pkey_nid;
+
+        if (sigx_app)
+                {
+                int idx = sk_nid_triple_find(sigx_app, &tmp);
+                if (idx >= 0)
+                        {
+                        t = sk_nid_triple_value(sigx_app, idx);
+                        rv = &t;
+                        }
+                }
+
+#ifndef OBJ_XREF_TEST2
+        if (rv == NULL)
+                {
+                rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
+                                 sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
+                                 );
+                }
+#endif
+        if (rv == NULL)
+                return 0;
+        *psignid = (*rv)->sign_id;
+        return 1;
+        }
+
+int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
+        {
+        nid_triple *ntr;
+        if (!sig_app)
+                sig_app = sk_nid_triple_new(sig_sk_cmp);
+        if (!sig_app)
+                return 0;
+        if (!sigx_app)
+                sigx_app = sk_nid_triple_new(sigx_cmp);
+        if (!sigx_app)
+                return 0;
+        ntr = OPENSSL_malloc(sizeof(int) * 3);
+        if (!ntr)
+                return 0;
+        ntr->sign_id = signid;
+        ntr->hash_id = dig_id;
+        ntr->pkey_id = pkey_id;
+
+        if (!sk_nid_triple_push(sig_app, ntr))
+                {
+                OPENSSL_free(ntr);
+                return 0;
+                }
+
+        if (!sk_nid_triple_push(sigx_app, ntr))
+                return 0;
+
+        sk_nid_triple_sort(sig_app);
+        sk_nid_triple_sort(sigx_app);
+
+        return 1;
+        }
+
+static void sid_free(nid_triple *tt)
+        {
+        OPENSSL_free(tt);
+        }
+
+void OBJ_sigid_free(void)
+        {
+        if (sig_app)
+                {
+                sk_nid_triple_pop_free(sig_app, sid_free);
+                sig_app = NULL;
+                }
+        if (sigx_app)
+                {
+                sk_nid_triple_free(sigx_app);
+                sigx_app = NULL;
+                }
+        }
+                
+#ifdef OBJ_XREF_TEST
+
+main()
+        {
+        int n1, n2, n3;
+
+        int i, rv;
+#ifdef OBJ_XREF_TEST2
+        for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
+                {
+                OBJ_add_sigid(sigoid_srt[i][0], sigoid_srt[i][1],
+                                sigoid_srt[i][2]);
+                }
+#endif
+
+        for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
+                {
+                n1 = sigoid_srt[i][0];
+                rv = OBJ_find_sigid_algs(n1, &n2, &n3);
+                printf("Forward: %d, %s %s %s\n", rv,
+                        OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
+                n1=0;
+                rv = OBJ_find_sigid_by_algs(&n1, n2, n3);
+                printf("Reverse: %d, %s %s %s\n", rv,
+                        OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
+                }
+        }
+        
+#endif
diff --git a/src/lib/libcrypto/objects/obj_xref.h b/src/lib/libcrypto/objects/obj_xref.h
new file mode 100644
index 0000000000..d5b9b8e198
--- /dev/null
+++ b/src/lib/libcrypto/objects/obj_xref.h
@@ -0,0 +1,75 @@
+/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */
+
+typedef struct
+        {
+        int sign_id;
+        int hash_id;
+        int pkey_id;
+        } nid_triple;
+
+static const nid_triple sigoid_srt[] =
+        {
+        {NID_md2WithRSAEncryption, NID_md2, NID_rsaEncryption},
+        {NID_md5WithRSAEncryption, NID_md5, NID_rsaEncryption},
+        {NID_shaWithRSAEncryption, NID_sha, NID_rsaEncryption},
+        {NID_sha1WithRSAEncryption, NID_sha1, NID_rsaEncryption},
+        {NID_dsaWithSHA, NID_sha, NID_dsa},
+        {NID_dsaWithSHA1_2, NID_sha1, NID_dsa_2},
+        {NID_mdc2WithRSA, NID_mdc2, NID_rsaEncryption},
+        {NID_md5WithRSA, NID_md5, NID_rsa},
+        {NID_dsaWithSHA1, NID_sha1, NID_dsa},
+        {NID_sha1WithRSA, NID_sha1, NID_rsa},
+        {NID_ripemd160WithRSA, NID_ripemd160, NID_rsaEncryption},
+        {NID_md4WithRSAEncryption, NID_md4, NID_rsaEncryption},
+        {NID_ecdsa_with_SHA1, NID_sha1, NID_X9_62_id_ecPublicKey},
+        {NID_sha256WithRSAEncryption, NID_sha256, NID_rsaEncryption},
+        {NID_sha384WithRSAEncryption, NID_sha384, NID_rsaEncryption},
+        {NID_sha512WithRSAEncryption, NID_sha512, NID_rsaEncryption},
+        {NID_sha224WithRSAEncryption, NID_sha224, NID_rsaEncryption},
+        {NID_ecdsa_with_Recommended, NID_undef, NID_X9_62_id_ecPublicKey},
+        {NID_ecdsa_with_Specified, NID_undef, NID_X9_62_id_ecPublicKey},
+        {NID_ecdsa_with_SHA224, NID_sha224, NID_X9_62_id_ecPublicKey},
+        {NID_ecdsa_with_SHA256, NID_sha256, NID_X9_62_id_ecPublicKey},
+        {NID_ecdsa_with_SHA384, NID_sha384, NID_X9_62_id_ecPublicKey},
+        {NID_ecdsa_with_SHA512, NID_sha512, NID_X9_62_id_ecPublicKey},
+        {NID_dsa_with_SHA224, NID_sha224, NID_dsa},
+        {NID_dsa_with_SHA256, NID_sha256, NID_dsa},
+        {NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94, NID_id_GostR3410_2001},
+        {NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94},
+        {NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc},
+        {NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc},
+        };
+
+static const nid_triple * const sigoid_srt_xref[] =
+        {
+        &sigoid_srt[17],
+        &sigoid_srt[18],
+        &sigoid_srt[0],
+        &sigoid_srt[1],
+        &sigoid_srt[7],
+        &sigoid_srt[2],
+        &sigoid_srt[4],
+        &sigoid_srt[3],
+        &sigoid_srt[9],
+        &sigoid_srt[5],
+        &sigoid_srt[8],
+        &sigoid_srt[12],
+        &sigoid_srt[6],
+        &sigoid_srt[10],
+        &sigoid_srt[11],
+        &sigoid_srt[13],
+        &sigoid_srt[24],
+        &sigoid_srt[20],
+        &sigoid_srt[14],
+        &sigoid_srt[21],
+        &sigoid_srt[15],
+        &sigoid_srt[22],
+        &sigoid_srt[16],
+        &sigoid_srt[23],
+        &sigoid_srt[19],
+        &sigoid_srt[25],
+        &sigoid_srt[26],
+        &sigoid_srt[27],
+        &sigoid_srt[28],
+        };
+
diff --git a/src/lib/libcrypto/objects/obj_xref.txt b/src/lib/libcrypto/objects/obj_xref.txt
new file mode 100644
index 0000000000..e45b3d34b9
--- /dev/null
+++ b/src/lib/libcrypto/objects/obj_xref.txt
@@ -0,0 +1,42 @@
+# OID cross reference table.
+# Links signatures OIDs to their corresponding public key algorithms
+# and digests.
+
+md2WithRSAEncryption    md2     rsaEncryption
+md5WithRSAEncryption    md5     rsaEncryption
+shaWithRSAEncryption    sha     rsaEncryption
+sha1WithRSAEncryption   sha1    rsaEncryption
+md4WithRSAEncryption    md4     rsaEncryption
+sha256WithRSAEncryption sha256  rsaEncryption
+sha384WithRSAEncryption sha384  rsaEncryption
+sha512WithRSAEncryption sha512  rsaEncryption
+sha224WithRSAEncryption sha224  rsaEncryption
+mdc2WithRSA             mdc2    rsaEncryption
+ripemd160WithRSA        ripemd160 rsaEncryption
+
+# Alternative deprecated OIDs. By using the older "rsa" OID this
+# type will be recognized by not normally used.
+
+md5WithRSA              md5     rsa
+sha1WithRSA             sha1    rsa
+
+dsaWithSHA              sha     dsa
+dsaWithSHA1             sha1    dsa
+
+dsaWithSHA1_2           sha1    dsa_2
+
+ecdsa_with_SHA1         sha1    X9_62_id_ecPublicKey
+ecdsa_with_SHA224       sha224  X9_62_id_ecPublicKey
+ecdsa_with_SHA256       sha256  X9_62_id_ecPublicKey
+ecdsa_with_SHA384       sha384  X9_62_id_ecPublicKey
+ecdsa_with_SHA512       sha512  X9_62_id_ecPublicKey
+ecdsa_with_Recommended  undef   X9_62_id_ecPublicKey
+ecdsa_with_Specified    undef   X9_62_id_ecPublicKey
+
+dsa_with_SHA224         sha224  dsa
+dsa_with_SHA256         sha256  dsa
+
+id_GostR3411_94_with_GostR3410_2001     id_GostR3411_94 id_GostR3410_2001
+id_GostR3411_94_with_GostR3410_94       id_GostR3411_94 id_GostR3410_94
+id_GostR3411_94_with_GostR3410_94_cc    id_GostR3411_94 id_GostR3410_94_cc
+id_GostR3411_94_with_GostR3410_2001_cc  id_GostR3411_94 id_GostR3410_2001_cc
diff --git a/src/lib/libcrypto/objects/objxref.pl b/src/lib/libcrypto/objects/objxref.pl
new file mode 100644
index 0000000000..731d3ae22c
--- /dev/null
+++ b/src/lib/libcrypto/objects/objxref.pl
@@ -0,0 +1,107 @@
+#!/usr/local/bin/perl
+
+use strict;
+
+my %xref_tbl;
+my %oid_tbl;
+
+my ($mac_file, $xref_file) = @ARGV;
+
+open(IN, $mac_file) || die "Can't open $mac_file";
+
+# Read in OID nid values for a lookup table.
+
+while (<IN>)
+        {
+        chomp;
+        my ($name, $num) = /^(\S+)\s+(\S+)$/;
+        $oid_tbl{$name} = $num;
+        }
+close IN;
+
+open(IN, $xref_file) || die "Can't open $xref_file";
+
+my $ln = 1;
+
+while (<IN>)
+        {
+        chomp;
+        s/#.*$//;
+        next if (/^\S*$/);
+        my ($xr, $p1, $p2) = /^(\S+)\s+(\S+)\s+(\S+)/;
+        check_oid($xr);
+        check_oid($p1);
+        check_oid($p2);
+        $xref_tbl{$xr} = [$p1, $p2, $ln];
+        }
+
+my @xrkeys = keys %xref_tbl;
+
+my @srt1 = sort { $oid_tbl{$a} <=> $oid_tbl{$b}} @xrkeys;
+
+for(my $i = 0; $i <= $#srt1; $i++)
+        {
+        $xref_tbl{$srt1[$i]}[2] = $i;
+        }
+
+my @srt2 = sort
+        {
+        my$ap1 = $oid_tbl{$xref_tbl{$a}[0]};
+        my$bp1 = $oid_tbl{$xref_tbl{$b}[0]};
+        return $ap1 - $bp1 if ($ap1 != $bp1);
+        my$ap2 = $oid_tbl{$xref_tbl{$a}[1]};
+        my$bp2 = $oid_tbl{$xref_tbl{$b}[1]};
+
+        return $ap2 - $bp2;
+        } @xrkeys;
+
+my $pname = $0;
+
+$pname =~ s|^.[^/]/||;
+
+print <<EOF;
+/* AUTOGENERATED BY $pname, DO NOT EDIT */
+
+typedef struct
+        {
+        int sign_id;
+        int hash_id;
+        int pkey_id;
+        } nid_triple;
+
+static const nid_triple sigoid_srt[] =
+        {
+EOF
+
+foreach (@srt1)
+        {
+        my $xr = $_;
+        my ($p1, $p2) = @{$xref_tbl{$_}};
+        print "\t{NID_$xr, NID_$p1, NID_$p2},\n";
+        }
+
+print "\t};";
+print <<EOF;
+
+
+static const nid_triple * const sigoid_srt_xref[] =
+        {
+EOF
+
+foreach (@srt2)
+        {
+        my $x = $xref_tbl{$_}[2];
+        print "\t\&sigoid_srt\[$x\],\n";
+        }
+
+print "\t};\n\n";
+
+sub check_oid
+        {
+        my ($chk) = @_;
+        if (!exists $oid_tbl{$chk})
+                {
+                die "Not Found \"$chk\"\n";
+                }
+        }
+