summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2011-06-30 15:07:57 -0700
committerVinson Lee <[email protected]>2011-06-30 15:07:57 -0700
commitb61e56756c2d61a94a8dd90abb4dc83e0c0349ae (patch)
treeeb576266d6f4ec75e6d1d891b75621e6180887d3 /src/gallium
parent47362c2a6180e7d6db4f1d4a6a9b8920a3d8dd82 (diff)
gallivm: Rename TargetInstrDesc to MCInstrDesc when using llvm-3.0.
llvm-3.0svn revision 134021 renamed TargetInstrDesc to MCInstrDesc.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 0b724a34948..5036608b571 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -287,7 +287,11 @@ lp_disassemble(const void* func)
pc += Size;
+#if HAVE_LLVM >= 0x0300
+ const MCInstrDesc &TID = TII->get(Inst.getOpcode());
+#else
const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
+#endif
/*
* Keep track of forward jumps to a nearby address.
6'>156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601
/******************************************************
* CVC EAC1.1 tests                                    *
*                                                     *
* (C) 2008 Falko Strenzke                             *
*          strenzke@flexsecure.de                     *
*     2008 Jack Lloyd                                 *
******************************************************/

#include "validate.h"
#include <botan/build.h>

#if defined(BOTAN_HAS_CARD_VERIFIABLE_CERTIFICATES)

#include <iosfwd>
#include <iostream>
#include <iterator>
#include <algorithm>
#include <fstream>
#include <vector>

#include <botan/ecdsa.h>
#include <botan/rsa.h>

#include <botan/x509cert.h>
#include <botan/x509self.h>
#include <botan/oids.h>
#include <botan/look_pk.h>
#include <botan/cvc_self.h>
#include <botan/cvc_cert.h>
#include <botan/util.h>
#include <botan/cvc_ado.h>
#include <botan/enums.h>

#define TEST_DATA_DIR "checks/ecc_testdata"

using namespace Botan;

#define CHECK_MESSAGE(expr, print) try { if(!(expr)) std::cout << print << "\n"; } catch(std::exception& e) { std::cout << __FUNCTION__ << ": " << e.what() << "\n"; }
#define CHECK(expr) try { if(!(expr)) std::cout << #expr << "\n"; } catch(std::exception& e) { std::cout << __FUNCTION__ << ": " << e.what() << "\n"; }

namespace {

// helper functions
void helper_write_file(EAC_Signed_Object const& to_write, std::string const& file_path)
   {
   SecureVector<byte> sv = to_write.BER_encode();
   std::ofstream cert_file(file_path.c_str(), std::ios::binary);
   cert_file.write((char*)sv.begin(), sv.size());
   cert_file.close();
   }

bool helper_files_equal(std::string const& file_path1, std::string const& file_path2)
   {
   std::ifstream cert_1_in(file_path1.c_str());
   std::ifstream cert_2_in(file_path2.c_str());
   SecureVector<byte> sv1;
   SecureVector<byte> sv2;
   if (!cert_1_in || !cert_2_in)
      {
      return false;
      }
   while (!cert_1_in.eof())
      {
      char now;
      cert_1_in.read(&now, 1);
      sv1.append(now);
      }
   while (!cert_2_in.eof())
      {
      char now;
      cert_2_in.read(&now, 1);
      sv2.append(now);
      }
   if (sv1.size() == 0)
      {
      return false;
      }
   return sv1 == sv2;
   }

void test_enc_gen_selfsigned(RandomNumberGenerator& rng)
   {
   std::cout << "." << std::flush;

   EAC1_1_CVC_Options opts;
   //opts.cpi = 0;
   opts.chr = ASN1_Chr("my_opt_chr"); // not used
   opts.car = ASN1_Car("my_opt_car");
   opts.cex = ASN1_Cex("2010 08 13");
   opts.ced = ASN1_Ced("2010 07 27");
   opts.holder_auth_templ = 0xC1;
   opts.hash_alg = "SHA-256";

   // creating a non sense selfsigned cert w/o dom pars
   EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.36.3.3.2.8.1.1.11"));
   ECDSA_PrivateKey key(rng, dom_pars);
   key.set_parameter_encoding(ENC_IMPLICITCA);
   EAC1_1_CVC cert = CVC_EAC::create_self_signed_cert(key, opts, rng);

   SecureVector<byte> der(cert.BER_encode());
   std::ofstream cert_file;
   cert_file.open(TEST_DATA_DIR "/my_cv_cert.ber", std::ios::binary);
   //cert_file << der; // this is bad !!!
   cert_file.write((char*)der.begin(), der.size());
   cert_file.close();

   EAC1_1_CVC cert_in(TEST_DATA_DIR "/my_cv_cert.ber");
   CHECK(cert == cert_in);
   // encoding it again while it has no dp
   SecureVector<byte> der2(cert_in.BER_encode());
   std::ofstream cert_file2(TEST_DATA_DIR "/my_cv_cert2.ber", std::ios::binary);
   cert_file2.write((char*)der2.begin(), der2.size());
   cert_file2.close();
   // read both and compare them
   std::ifstream cert_1_in(TEST_DATA_DIR "/my_cv_cert.ber");
   std::ifstream cert_2_in(TEST_DATA_DIR "/my_cv_cert2.ber");
   SecureVector<byte> sv1;
   SecureVector<byte> sv2;
   if (!cert_1_in || !cert_2_in)
      {
      CHECK_MESSAGE(false, "could not read certificate files");
      }
   while (!cert_1_in.eof())
      {
      char now;

      cert_1_in.read(&now, 1);
      sv1.append(now);
      }
   while (!cert_2_in.eof())
      {
      char now;
      cert_2_in.read(&now, 1);
      sv2.append(now);
      }
   CHECK(sv1.size() > 10);
   CHECK_MESSAGE(sv1 == sv2, "reencoded file of cert without domain parameters is different from original");

   //cout << "reading cert again\n";
   CHECK(cert_in.get_car().value() == "my_opt_car");
   CHECK(cert_in.get_chr().value() == "my_opt_car");
   CHECK(cert_in.get_ced().as_string() == "20100727");
   CHECK(cert_in.get_ced().readable_string() == "2010/07/27 ");

   bool ill_date_exc = false;
   try
      {
      ASN1_Ced("1999 01 01");
      }
   catch (...)
      {
      ill_date_exc = true;
      }
   CHECK(ill_date_exc);

   bool ill_date_exc2 = false;
   try
      {
      ASN1_Ced("2100 01 01");
      }
   catch (...)
      {
      ill_date_exc2 = true;
      }
   CHECK(ill_date_exc2);
   //cout << "readable = '" << cert_in.get_ced().readable_string() << "'\n";
   std::auto_ptr<Public_Key> p_pk = cert_in.subject_public_key();
   //auto_ptr<ECDSA_PublicKey> ecdsa_pk = dynamic_cast<auto_ptr<ECDSA_PublicKey> >(p_pk);
   ECDSA_PublicKey* p_ecdsa_pk = dynamic_cast<ECDSA_PublicKey*>(p_pk.get());
   // let´s see if encoding is truely implicitca, because this is what the key should have
   // been set to when decoding (see above)(because it has no domain params):
   //cout << "encoding = " << p_ecdsa_pk->get_parameter_encoding() << std::endl;
   CHECK(p_ecdsa_pk->get_parameter_encoding() == ENC_IMPLICITCA);
   bool exc = false;
   try
      {
      std::cout << "order = " << p_ecdsa_pk->domain_parameters().get_order() << std::endl;
      }
   catch (Invalid_State)
      {
      exc = true;
      }
   CHECK(exc);
   // set them and try again
   //cert_in.set_domain_parameters(dom_pars);
   std::auto_ptr<Public_Key> p_pk2 = cert_in.subject_public_key();
   ECDSA_PublicKey* p_ecdsa_pk2 = dynamic_cast<ECDSA_PublicKey*>(p_pk2.get());
   p_ecdsa_pk2->set_domain_parameters(dom_pars);
   CHECK(p_ecdsa_pk2->domain_parameters().get_order() == dom_pars.get_order());
   bool ver_ec = cert_in.check_signature(*p_pk2);
   CHECK_MESSAGE(ver_ec, "could not positively verify correct selfsigned cvc certificate");
   }

void test_enc_gen_req(RandomNumberGenerator& rng)
   {
   std::cout << "." << std::flush;

   EAC1_1_CVC_Options opts;

   //opts.cpi = 0;
   opts.chr = ASN1_Chr("my_opt_chr");
   opts.hash_alg = "SHA-160";

   // creating a non sense selfsigned cert w/o dom pars
   EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.132.0.8"));
   ECDSA_PrivateKey key(rng, dom_pars);
   key.set_parameter_encoding(ENC_IMPLICITCA);
   EAC1_1_Req req = CVC_EAC::create_cvc_req(key, opts.chr, opts.hash_alg, rng);
   SecureVector<byte> der(req.BER_encode());
   std::ofstream req_file(TEST_DATA_DIR "/my_cv_req.ber", std::ios::binary);
   req_file.write((char*)der.begin(), der.size());
   req_file.close();

   // read and check signature...
   EAC1_1_Req req_in(TEST_DATA_DIR "/my_cv_req.ber");
   //req_in.set_domain_parameters(dom_pars);
   std::auto_ptr<Public_Key> p_pk = req_in.subject_public_key();
   ECDSA_PublicKey* p_ecdsa_pk = dynamic_cast<ECDSA_PublicKey*>(p_pk.get());
   p_ecdsa_pk->set_domain_parameters(dom_pars);
   CHECK(p_ecdsa_pk->domain_parameters().get_order() == dom_pars.get_order());
   bool ver_ec = req_in.check_signature(*p_pk);
   CHECK_MESSAGE(ver_ec, "could not positively verify correct selfsigned (created by myself) cvc request");
   }

void test_cvc_req_ext(RandomNumberGenerator&)
   {
   std::cout << "." << std::flush;

   EAC1_1_Req req_in(TEST_DATA_DIR "/DE1_flen_chars_cvcRequest_ECDSA.der");
   EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.36.3.3.2.8.1.1.5")); // "german curve"
   //req_in.set_domain_parameters(dom_pars);
   std::auto_ptr<Public_Key> p_pk = req_in.subject_public_key();
   ECDSA_PublicKey* p_ecdsa_pk = dynamic_cast<ECDSA_PublicKey*>(p_pk.get());
   p_ecdsa_pk->set_domain_parameters(dom_pars);
   CHECK(p_ecdsa_pk->domain_parameters().get_order() == dom_pars.get_order());
   bool ver_ec = req_in.check_signature(*p_pk);
   CHECK_MESSAGE(ver_ec, "could not positively verify correct selfsigned (external testdata) cvc request");
   }

void test_cvc_ado_ext(RandomNumberGenerator&)
   {
   std::cout << "." << std::flush;

   EAC1_1_ADO req_in(TEST_DATA_DIR "/ado.cvcreq");
   EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.36.3.3.2.8.1.1.5")); // "german curve"
   //cout << "car = " << req_in.get_car().value() << std::endl;
   //req_in.set_domain_parameters(dom_pars);
   }

void test_cvc_ado_creation(RandomNumberGenerator& rng)
   {
   std::cout << "." << std::flush;

   EAC1_1_CVC_Options opts;
   //opts.cpi = 0;
   opts.chr = ASN1_Chr("my_opt_chr");
   opts.hash_alg = "SHA-256";

   // creating a non sense selfsigned cert w/o dom pars
   EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.36.3.3.2.8.1.1.11"));
   //cout << "mod = " << hex << dom_pars.get_curve().get_p() << std::endl;
   ECDSA_PrivateKey req_key(rng, dom_pars);
   req_key.set_parameter_encoding(ENC_IMPLICITCA);
   //EAC1_1_Req req = CVC_EAC::create_cvc_req(req_key, opts);
   EAC1_1_Req req = CVC_EAC::create_cvc_req(req_key, opts.chr, opts.hash_alg, rng);
   SecureVector<byte> der(req.BER_encode());
   std::ofstream req_file(TEST_DATA_DIR "/my_cv_req.ber", std::ios::binary);
   req_file.write((char*)der.begin(), der.size());
   req_file.close();

   // create an ado with that req
   ECDSA_PrivateKey ado_key(rng, dom_pars);
   EAC1_1_CVC_Options ado_opts;
   ado_opts.car = ASN1_Car("my_ado_car");
   ado_opts.hash_alg = "SHA-256"; // must be equal to req´s hash alg, because ado takes his sig_algo from it´s request

   //EAC1_1_ADO ado = CVC_EAC::create_ado_req(ado_key, req, ado_opts);
   EAC1_1_ADO ado = CVC_EAC::create_ado_req(ado_key, req, ado_opts.car, rng);
   CHECK_MESSAGE(ado.check_signature(ado_key), "failure of ado verification after creation");

   std::ofstream ado_file(TEST_DATA_DIR "/ado", std::ios::binary);
   SecureVector<byte> ado_der(ado.BER_encode());
   ado_file.write((char*)ado_der.begin(), ado_der.size());
   ado_file.close();
   // read it again and check the signature
   EAC1_1_ADO ado2(TEST_DATA_DIR "/ado");
   CHECK(ado == ado2);
   //ECDSA_PublicKey* p_ado_pk = dynamic_cast<ECDSA_PublicKey*>(&ado_key);
   //bool ver = ado2.check_signature(*p_ado_pk);
   bool ver = ado2.check_signature(ado_key);
   CHECK_MESSAGE(ver, "failure of ado verification after reloading");
   }

void test_cvc_ado_comparison(RandomNumberGenerator& rng)
   {
   std::cout << "." << std::flush;

   EAC1_1_CVC_Options opts;
   //opts.cpi = 0;
   opts.chr = ASN1_Chr("my_opt_chr");
   opts.hash_alg = "SHA-224";

   // creating a non sense selfsigned cert w/o dom pars
   EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.36.3.3.2.8.1.1.11"));
   ECDSA_PrivateKey req_key(rng, dom_pars);
   req_key.set_parameter_encoding(ENC_IMPLICITCA);
   //EAC1_1_Req req = CVC_EAC::create_cvc_req(req_key, opts);
   EAC1_1_Req req = CVC_EAC::create_cvc_req(req_key, opts.chr, opts.hash_alg, rng);


   // create an ado with that req
   ECDSA_PrivateKey ado_key(rng, dom_pars);
   EAC1_1_CVC_Options ado_opts;
   ado_opts.car = ASN1_Car("my_ado_car1");
   ado_opts.hash_alg = "SHA-224"; // must be equal to req's hash alg, because ado takes his sig_algo from it's request
   //EAC1_1_ADO ado = CVC_EAC::create_ado_req(ado_key, req, ado_opts);
   EAC1_1_ADO ado = CVC_EAC::create_ado_req(ado_key, req, ado_opts.car, rng);
   CHECK_MESSAGE(ado.check_signature(ado_key), "failure of ado verification after creation");
   // make a second one for comparison
   EAC1_1_CVC_Options opts2;
   //opts2.cpi = 0;
   opts2.chr = ASN1_Chr("my_opt_chr");
   opts2.hash_alg = "SHA-160"; // this is the only difference
   ECDSA_PrivateKey req_key2(rng, dom_pars);
   req_key.set_parameter_encoding(ENC_IMPLICITCA);
   //EAC1_1_Req req2 = CVC_EAC::create_cvc_req(req_key2, opts2, rng);
   EAC1_1_Req req2 = CVC_EAC::create_cvc_req(req_key2, opts2.chr, opts2.hash_alg, rng);
   ECDSA_PrivateKey ado_key2(rng, dom_pars);
   EAC1_1_CVC_Options ado_opts2;
   ado_opts2.car = ASN1_Car("my_ado_car1");
   ado_opts2.hash_alg = "SHA-160"; // must be equal to req's hash alg, because ado takes his sig_algo from it's request

   EAC1_1_ADO ado2 = CVC_EAC::create_ado_req(ado_key2, req2, ado_opts2.car, rng);
   CHECK_MESSAGE(ado2.check_signature(ado_key2), "failure of ado verification after creation");

   CHECK_MESSAGE(ado != ado2, "ado's found to be equal where they are not");
   //     std::ofstream ado_file(TEST_DATA_DIR "/ado");
   //     SecureVector<byte> ado_der(ado.BER_encode());
   //     ado_file.write((char*)ado_der.begin(), ado_der.size());
   //     ado_file.close();
   // read it again and check the signature

   //    EAC1_1_ADO ado2(TEST_DATA_DIR "/ado");
   //    ECDSA_PublicKey* p_ado_pk = dynamic_cast<ECDSA_PublicKey*>(&ado_key);
   //    //bool ver = ado2.check_signature(*p_ado_pk);
   //    bool ver = ado2.check_signature(ado_key);
   //    CHECK_MESSAGE(ver, "failure of ado verification after reloading");
   }

void test_eac_time(RandomNumberGenerator&)
   {
   std::cout << "." << std::flush;

   const u64bit current_time = system_time();
   EAC_Time time(current_time);
   //     std::cout << "time as std::string = " << time.as_string() << std::endl;
   EAC_Time sooner("", ASN1_Tag(99));
   //X509_Time sooner("", ASN1_Tag(99));
   sooner.set_to("2007 12 12");
   //     std::cout << "sooner as std::string = " << sooner.as_string() << std::endl;
   EAC_Time later("2007 12 13");
   //X509_Time later("2007 12 13");
   //     std::cout << "later as std::string = " << later.as_string() << std::endl;
   CHECK(sooner <= later);
   CHECK(sooner == sooner);

   ASN1_Cex my_cex("2007 08 01");
   my_cex.add_months(12);
   CHECK(my_cex.get_year() == 2008);
   CHECK_MESSAGE(my_cex.get_month() == 8, "shoult be 8, was " << my_cex.get_month());

   my_cex.add_months(4);
   CHECK(my_cex.get_year() == 2008);
   CHECK(my_cex.get_month() == 12);

   my_cex.add_months(4);
   CHECK(my_cex.get_year() == 2009);
   CHECK(my_cex.get_month() == 4);

   my_cex.add_months(41);
   CHECK(my_cex.get_year() == 2012);
   CHECK(my_cex.get_month() == 9);



   }

void test_ver_cvca(RandomNumberGenerator&)
   {
   std::cout << "." << std::flush;

   EAC1_1_CVC req_in(TEST_DATA_DIR "/cvca01.cv.crt");

   //auto_ptr<ECDSA_PublicKey> ecdsa_pk = dynamic_cast<auto_ptr<ECDSA_PublicKey> >(p_pk);
   //ECDSA_PublicKey* p_ecdsa_pk = dynamic_cast<ECDSA_PublicKey*>(p_pk.get());
   bool exc = false;

   std::auto_ptr<Public_Key> p_pk2 = req_in.subject_public_key();
   ECDSA_PublicKey* p_ecdsa_pk2 = dynamic_cast<ECDSA_PublicKey*>(p_pk2.get());
   bool ver_ec = req_in.check_signature(*p_pk2);
   CHECK_MESSAGE(ver_ec, "could not positively verify correct selfsigned cvca certificate");

   try
      {
      p_ecdsa_pk2->domain_parameters().get_order();
      }
   catch (Invalid_State)
      {
      exc = true;
      }
   CHECK(!exc);
   }

void test_copy_and_assignment(RandomNumberGenerator&)
   {
   std::cout << "." << std::flush;

   EAC1_1_CVC cert_in(TEST_DATA_DIR "/cvca01.cv.crt");
   EAC1_1_CVC cert_cp(cert_in);
   EAC1_1_CVC cert_ass = cert_in;
   CHECK(cert_in == cert_cp);
   CHECK(cert_in == cert_ass);

   EAC1_1_ADO ado_in(TEST_DATA_DIR "/ado.cvcreq");
   //EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.36.3.3.2.8.1.1.5")); // "german curve"
   EAC1_1_ADO ado_cp(ado_in);
   EAC1_1_ADO ado_ass = ado_in;
   CHECK(ado_in == ado_cp);
   CHECK(ado_in == ado_ass);

   EAC1_1_Req req_in(TEST_DATA_DIR "/DE1_flen_chars_cvcRequest_ECDSA.der");
   //EC_Domain_Params dom_pars(get_EC_Dom_Pars_by_oid("1.3.36.3.3.2.8.1.1.5")); // "german curve"
   EAC1_1_Req req_cp(req_in);
   EAC1_1_Req req_ass = req_in;
   CHECK(req_in == req_cp);
   CHECK(req_in == req_ass);
   }

void test_eac_str_illegal_values(RandomNumberGenerator&)
   {
   std::cout << "." << std::flush;

   bool exc = false;
   try
      {
      EAC1_1_CVC(TEST_DATA_DIR "/cvca_illegal_chars.cv.crt");

      }
   catch (Decoding_Error)
      {
      exc = true;
      }
   CHECK(exc);

   bool exc2 = false;
   try
      {
      EAC1_1_CVC(TEST_DATA_DIR "/cvca_illegal_chars2.cv.crt");

      }
   catch (Decoding_Error)
      {
      exc2 = true;
      }
   CHECK(exc2);
   }

void test_tmp_eac_str_enc(RandomNumberGenerator&)
   {
   std::cout << "." << std::flush;

   bool exc = false;
   try
      {
      ASN1_Car("abc!+-µ\n");
      }
   catch (Invalid_Argument)
      {