← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openssl/utopic

« back to all changes in this revision

Viewing changes to crypto/objects/obj_mac.h

  • Committer: Package Import Robot
  • Author(s): Kurt Roeckx
  • Date: 2012-03-19 18:23:32 UTC
  • mfrom: (1.2.6)
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: package-import@ubuntu.com-20120319182332-q4zgqvw51ahauk27
Tags: 1.0.1-1
http://bugs.debian.org/644743
http://bugs.debian.org/663977
http://bugs.debian.org/653495
http://bugs.debian.org/664454
* New upstream version
  - Remove kfreebsd-pipe.patch, fixed upstream
  - Update pic.patch, openssl-pod-misspell.patch and make-targets.patch
  - Add OPENSSL_1.0.1 to version-script.patch and libssl1.0.0.symbols for
    the new functions.
  - AES-NI support (Closes: #644743)
* pic.patch: upstream made OPENSSL_ia32cap_P and OPENSSL_cpuid_setup
  hidden on amd64, no need to access it PIC anymore.
* pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)
* Enable hardening using dpkg-buildflags (Closes: #653495)
* s_client and s_server were forcing SSLv3 only connection when SSLv2 was
  disabled instead of the SSLv2 with upgrade method.  (Closes: #664454)
* Add Beaks on openssh < 1:5.9p1-4, it has a too strict version check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/objects/obj_mac.h
580
580
#define NID_sha1WithRSAEncryption               65
581
581
#define OBJ_sha1WithRSAEncryption               OBJ_pkcs1,5L
582
582
 
 
583
#define SN_rsaesOaep            "RSAES-OAEP"
 
584
#define LN_rsaesOaep            "rsaesOaep"
 
585
#define NID_rsaesOaep           919
 
586
#define OBJ_rsaesOaep           OBJ_pkcs1,7L
 
587
 
 
588
#define SN_mgf1         "MGF1"
 
589
#define LN_mgf1         "mgf1"
 
590
#define NID_mgf1                911
 
591
#define OBJ_mgf1                OBJ_pkcs1,8L
 
592
 
 
593
#define SN_rsassaPss            "RSASSA-PSS"
 
594
#define LN_rsassaPss            "rsassaPss"
 
595
#define NID_rsassaPss           912
 
596
#define OBJ_rsassaPss           OBJ_pkcs1,10L
 
597
 
583
598
#define SN_sha256WithRSAEncryption              "RSA-SHA256"
584
599
#define LN_sha256WithRSAEncryption              "sha256WithRSAEncryption"
585
600
#define NID_sha256WithRSAEncryption             668
981
996
#define NID_id_smime_alg_CMSRC2wrap             247
982
997
#define OBJ_id_smime_alg_CMSRC2wrap             OBJ_id_smime_alg,7L
983
998
 
 
999
#define SN_id_alg_PWRI_KEK              "id-alg-PWRI-KEK"
 
1000
#define NID_id_alg_PWRI_KEK             893
 
1001
#define OBJ_id_alg_PWRI_KEK             OBJ_id_smime_alg,9L
 
1002
 
984
1003
#define SN_id_smime_cd_ldap             "id-smime-cd-ldap"
985
1004
#define NID_id_smime_cd_ldap            248
986
1005
#define OBJ_id_smime_cd_ldap            OBJ_id_smime_cd,1L
2399
2418
#define NID_no_rev_avail                403
2400
2419
#define OBJ_no_rev_avail                OBJ_id_ce,56L
2401
2420
 
 
2421
#define SN_anyExtendedKeyUsage          "anyExtendedKeyUsage"
 
2422
#define LN_anyExtendedKeyUsage          "Any Extended Key Usage"
 
2423
#define NID_anyExtendedKeyUsage         910
 
2424
#define OBJ_anyExtendedKeyUsage         OBJ_ext_key_usage,0L
 
2425
 
2402
2426
#define SN_netscape             "Netscape"
2403
2427
#define LN_netscape             "Netscape Communications Corp."
2404
2428
#define NID_netscape            57
2586
2610
#define NID_aes_128_cfb128              421
2587
2611
#define OBJ_aes_128_cfb128              OBJ_aes,4L
2588
2612
 
 
2613
#define SN_id_aes128_wrap               "id-aes128-wrap"
 
2614
#define NID_id_aes128_wrap              788
 
2615
#define OBJ_id_aes128_wrap              OBJ_aes,5L
 
2616
 
 
2617
#define SN_aes_128_gcm          "id-aes128-GCM"
 
2618
#define LN_aes_128_gcm          "aes-128-gcm"
 
2619
#define NID_aes_128_gcm         895
 
2620
#define OBJ_aes_128_gcm         OBJ_aes,6L
 
2621
 
 
2622
#define SN_aes_128_ccm          "id-aes128-CCM"
 
2623
#define LN_aes_128_ccm          "aes-128-ccm"
 
2624
#define NID_aes_128_ccm         896
 
2625
#define OBJ_aes_128_ccm         OBJ_aes,7L
 
2626
 
 
2627
#define SN_id_aes128_wrap_pad           "id-aes128-wrap-pad"
 
2628
#define NID_id_aes128_wrap_pad          897
 
2629
#define OBJ_id_aes128_wrap_pad          OBJ_aes,8L
 
2630
 
2589
2631
#define SN_aes_192_ecb          "AES-192-ECB"
2590
2632
#define LN_aes_192_ecb          "aes-192-ecb"
2591
2633
#define NID_aes_192_ecb         422
2606
2648
#define NID_aes_192_cfb128              425
2607
2649
#define OBJ_aes_192_cfb128              OBJ_aes,24L
2608
2650
 
 
2651
#define SN_id_aes192_wrap               "id-aes192-wrap"
 
2652
#define NID_id_aes192_wrap              789
 
2653
#define OBJ_id_aes192_wrap              OBJ_aes,25L
 
2654
 
 
2655
#define SN_aes_192_gcm          "id-aes192-GCM"
 
2656
#define LN_aes_192_gcm          "aes-192-gcm"
 
2657
#define NID_aes_192_gcm         898
 
2658
#define OBJ_aes_192_gcm         OBJ_aes,26L
 
2659
 
 
2660
#define SN_aes_192_ccm          "id-aes192-CCM"
 
2661
#define LN_aes_192_ccm          "aes-192-ccm"
 
2662
#define NID_aes_192_ccm         899
 
2663
#define OBJ_aes_192_ccm         OBJ_aes,27L
 
2664
 
 
2665
#define SN_id_aes192_wrap_pad           "id-aes192-wrap-pad"
 
2666
#define NID_id_aes192_wrap_pad          900
 
2667
#define OBJ_id_aes192_wrap_pad          OBJ_aes,28L
 
2668
 
2609
2669
#define SN_aes_256_ecb          "AES-256-ECB"
2610
2670
#define LN_aes_256_ecb          "aes-256-ecb"
2611
2671
#define NID_aes_256_ecb         426
2626
2686
#define NID_aes_256_cfb128              429
2627
2687
#define OBJ_aes_256_cfb128              OBJ_aes,44L
2628
2688
 
 
2689
#define SN_id_aes256_wrap               "id-aes256-wrap"
 
2690
#define NID_id_aes256_wrap              790
 
2691
#define OBJ_id_aes256_wrap              OBJ_aes,45L
 
2692
 
 
2693
#define SN_aes_256_gcm          "id-aes256-GCM"
 
2694
#define LN_aes_256_gcm          "aes-256-gcm"
 
2695
#define NID_aes_256_gcm         901
 
2696
#define OBJ_aes_256_gcm         OBJ_aes,46L
 
2697
 
 
2698
#define SN_aes_256_ccm          "id-aes256-CCM"
 
2699
#define LN_aes_256_ccm          "aes-256-ccm"
 
2700
#define NID_aes_256_ccm         902
 
2701
#define OBJ_aes_256_ccm         OBJ_aes,47L
 
2702
 
 
2703
#define SN_id_aes256_wrap_pad           "id-aes256-wrap-pad"
 
2704
#define NID_id_aes256_wrap_pad          903
 
2705
#define OBJ_id_aes256_wrap_pad          OBJ_aes,48L
 
2706
 
2629
2707
#define SN_aes_128_cfb1         "AES-128-CFB1"
2630
2708
#define LN_aes_128_cfb1         "aes-128-cfb1"
2631
2709
#define NID_aes_128_cfb1                650
2650
2728
#define LN_aes_256_cfb8         "aes-256-cfb8"
2651
2729
#define NID_aes_256_cfb8                655
2652
2730
 
 
2731
#define SN_aes_128_ctr          "AES-128-CTR"
 
2732
#define LN_aes_128_ctr          "aes-128-ctr"
 
2733
#define NID_aes_128_ctr         904
 
2734
 
 
2735
#define SN_aes_192_ctr          "AES-192-CTR"
 
2736
#define LN_aes_192_ctr          "aes-192-ctr"
 
2737
#define NID_aes_192_ctr         905
 
2738
 
 
2739
#define SN_aes_256_ctr          "AES-256-CTR"
 
2740
#define LN_aes_256_ctr          "aes-256-ctr"
 
2741
#define NID_aes_256_ctr         906
 
2742
 
 
2743
#define SN_aes_128_xts          "AES-128-XTS"
 
2744
#define LN_aes_128_xts          "aes-128-xts"
 
2745
#define NID_aes_128_xts         913
 
2746
 
 
2747
#define SN_aes_256_xts          "AES-256-XTS"
 
2748
#define LN_aes_256_xts          "aes-256-xts"
 
2749
#define NID_aes_256_xts         914
 
2750
 
2653
2751
#define SN_des_cfb1             "DES-CFB1"
2654
2752
#define LN_des_cfb1             "des-cfb1"
2655
2753
#define NID_des_cfb1            656
2666
2764
#define LN_des_ede3_cfb8                "des-ede3-cfb8"
2667
2765
#define NID_des_ede3_cfb8               659
2668
2766
 
2669
 
#define SN_id_aes128_wrap               "id-aes128-wrap"
2670
 
#define NID_id_aes128_wrap              788
2671
 
#define OBJ_id_aes128_wrap              OBJ_aes,5L
2672
 
 
2673
 
#define SN_id_aes192_wrap               "id-aes192-wrap"
2674
 
#define NID_id_aes192_wrap              789
2675
 
#define OBJ_id_aes192_wrap              OBJ_aes,25L
2676
 
 
2677
 
#define SN_id_aes256_wrap               "id-aes256-wrap"
2678
 
#define NID_id_aes256_wrap              790
2679
 
#define OBJ_id_aes256_wrap              OBJ_aes,45L
2680
 
 
2681
2767
#define OBJ_nist_hashalgs               OBJ_nistAlgorithms,2L
2682
2768
 
2683
2769
#define SN_sha256               "SHA256"
3810
3896
#define NID_camellia_256_cbc            753
3811
3897
#define OBJ_camellia_256_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,4L
3812
3898
 
 
3899
#define SN_id_camellia128_wrap          "id-camellia128-wrap"
 
3900
#define NID_id_camellia128_wrap         907
 
3901
#define OBJ_id_camellia128_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,2L
 
3902
 
 
3903
#define SN_id_camellia192_wrap          "id-camellia192-wrap"
 
3904
#define NID_id_camellia192_wrap         908
 
3905
#define OBJ_id_camellia192_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,3L
 
3906
 
 
3907
#define SN_id_camellia256_wrap          "id-camellia256-wrap"
 
3908
#define NID_id_camellia256_wrap         909
 
3909
#define OBJ_id_camellia256_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,4L
 
3910
 
3813
3911
#define OBJ_ntt_ds              0L,3L,4401L,5L
3814
3912
 
3815
3913
#define OBJ_camellia            OBJ_ntt_ds,3L,1L,9L
3912
4010
#define LN_hmac         "hmac"
3913
4011
#define NID_hmac                855
3914
4012
 
 
4013
#define SN_cmac         "CMAC"
 
4014
#define LN_cmac         "cmac"
 
4015
#define NID_cmac                894
 
4016
 
 
4017
#define SN_rc4_hmac_md5         "RC4-HMAC-MD5"
 
4018
#define LN_rc4_hmac_md5         "rc4-hmac-md5"
 
4019
#define NID_rc4_hmac_md5                915
 
4020
 
 
4021
#define SN_aes_128_cbc_hmac_sha1                "AES-128-CBC-HMAC-SHA1"
 
4022
#define LN_aes_128_cbc_hmac_sha1                "aes-128-cbc-hmac-sha1"
 
4023
#define NID_aes_128_cbc_hmac_sha1               916
 
4024
 
 
4025
#define SN_aes_192_cbc_hmac_sha1                "AES-192-CBC-HMAC-SHA1"
 
4026
#define LN_aes_192_cbc_hmac_sha1                "aes-192-cbc-hmac-sha1"
 
4027
#define NID_aes_192_cbc_hmac_sha1               917
 
4028
 
 
4029
#define SN_aes_256_cbc_hmac_sha1                "AES-256-CBC-HMAC-SHA1"
 
4030
#define LN_aes_256_cbc_hmac_sha1                "aes-256-cbc-hmac-sha1"
 
4031
#define NID_aes_256_cbc_hmac_sha1               918
 
4032