mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove some obsolete/obscure internal define switches:

Browse Source 
- FLAT_INC
- PKCS1_CHECK (the SSL_OP_PKCS1_CHECK options have been
  no-oped)
- PKCS_TESTVECT (debugging leftovers)
- SSL_AD_MISSING_SRP_USERNAME (unfinished feature)
- DTLS_AD_MISSING_HANDSHAKE_MESSAGE (unfinished feature)
- USE_OBJ_MAC (note this removes a define from the public header but
   very unlikely someone would be depending on it)
- SSL_FORBID_ENULL

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Emilia Kasper 2017-02-28 14:13:40 +01:00
parent 06611d0a16
commit 2f0ca54c32
14 changed files with 15 additions and 993 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/cryptlib.c
View File

@ -167,7 +167,13 @@ void OPENSSL_showfatal(const char *fmta, ...)
va_list ap;
TCHAR buf[256];
const TCHAR *fmt;
# ifdef STD_ERROR_HANDLE /* what a dirty trick! */
/*
* First check if it's a console application, in which case the
* error message would be printed to standard error.
* Windows CE does not have a concept of a console application,
* so we need to guard the check.
*/
# ifdef STD_ERROR_HANDLE
HANDLE h;
if ((h = GetStdHandle(STD_ERROR_HANDLE)) != NULL &&

5
crypto/rsa/rsa_oaep.c
View File

@ -78,11 +78,6 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
memcpy(db + emlen - flen - mdlen, from, (unsigned int)flen);
if (RAND_bytes(seed, mdlen) <= 0)
return 0;
#ifdef PKCS_TESTVECT
memcpy(seed,
"\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
20);
#endif
dbmask = OPENSSL_malloc(emlen - mdlen);
if (dbmask == NULL) {

6
demos/engines/e_chil.c
View File

@ -35,11 +35,7 @@
* The hwcryptohook.h included here is from May 2000.
* [Richard Levitte]
*/
# ifdef FLAT_INC
# include "hwcryptohook.h"
# else
# include "vendor_defns/hwcryptohook.h"
# endif
# include "vendor_defns/hwcryptohook.h"
# define HWCRHK_LIB_NAME "CHIL engine"
# include "e_chil_err.c"

7
include/openssl/dtls1.h
View File

@ -37,12 +37,7 @@ extern "C" {
# define DTLS1_CCS_HEADER_LENGTH 1
# ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
# define DTLS1_AL_HEADER_LENGTH 7
# else
# define DTLS1_AL_HEADER_LENGTH 2
# endif
# define DTLS1_AL_HEADER_LENGTH 2
/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
# define DTLS1_TMO_READ_COUNT 2

903
include/openssl/objects.h
View File

@ -10,908 +10,7 @@
#ifndef HEADER_OBJECTS_H
# define HEADER_OBJECTS_H
# define USE_OBJ_MAC
# ifdef USE_OBJ_MAC
# include <openssl/obj_mac.h>
# else
# define SN_undef "UNDEF"
# define LN_undef "undefined"
# define NID_undef 0
# define OBJ_undef 0L
# define SN_Algorithm "Algorithm"
# define LN_algorithm "algorithm"
# define NID_algorithm 38
# define OBJ_algorithm 1L,3L,14L,3L,2L
# define LN_rsadsi "rsadsi"
# define NID_rsadsi 1
# define OBJ_rsadsi 1L,2L,840L,113549L
# define LN_pkcs "pkcs"
# define NID_pkcs 2
# define OBJ_pkcs OBJ_rsadsi,1L
# define SN_md2 "MD2"
# define LN_md2 "md2"
# define NID_md2 3
# define OBJ_md2 OBJ_rsadsi,2L,2L
# define SN_md5 "MD5"
# define LN_md5 "md5"
# define NID_md5 4
# define OBJ_md5 OBJ_rsadsi,2L,5L
# define SN_rc4 "RC4"
# define LN_rc4 "rc4"
# define NID_rc4 5
# define OBJ_rc4 OBJ_rsadsi,3L,4L
# define LN_rsaEncryption "rsaEncryption"
# define NID_rsaEncryption 6
# define OBJ_rsaEncryption OBJ_pkcs,1L,1L
# define SN_md2WithRSAEncryption "RSA-MD2"
# define LN_md2WithRSAEncryption "md2WithRSAEncryption"
# define NID_md2WithRSAEncryption 7
# define OBJ_md2WithRSAEncryption OBJ_pkcs,1L,2L
# define SN_md5WithRSAEncryption "RSA-MD5"
# define LN_md5WithRSAEncryption "md5WithRSAEncryption"
# define NID_md5WithRSAEncryption 8
# define OBJ_md5WithRSAEncryption OBJ_pkcs,1L,4L
# define SN_pbeWithMD2AndDES_CBC "PBE-MD2-DES"
# define LN_pbeWithMD2AndDES_CBC "pbeWithMD2AndDES-CBC"
# define NID_pbeWithMD2AndDES_CBC 9
# define OBJ_pbeWithMD2AndDES_CBC OBJ_pkcs,5L,1L
# define SN_pbeWithMD5AndDES_CBC "PBE-MD5-DES"
# define LN_pbeWithMD5AndDES_CBC "pbeWithMD5AndDES-CBC"
# define NID_pbeWithMD5AndDES_CBC 10
# define OBJ_pbeWithMD5AndDES_CBC OBJ_pkcs,5L,3L
# define LN_X500 "X500"
# define NID_X500 11
# define OBJ_X500 2L,5L
# define LN_X509 "X509"
# define NID_X509 12
# define OBJ_X509 OBJ_X500,4L
# define SN_commonName "CN"
# define LN_commonName "commonName"
# define NID_commonName 13
# define OBJ_commonName OBJ_X509,3L
# define SN_countryName "C"
# define LN_countryName "countryName"
# define NID_countryName 14
# define OBJ_countryName OBJ_X509,6L
# define SN_localityName "L"
# define LN_localityName "localityName"
# define NID_localityName 15
# define OBJ_localityName OBJ_X509,7L
/* Postal Address? PA */
/* should be "ST" (rfc1327) but MS uses 'S' */
# define SN_stateOrProvinceName "ST"
# define LN_stateOrProvinceName "stateOrProvinceName"
# define NID_stateOrProvinceName 16
# define OBJ_stateOrProvinceName OBJ_X509,8L
# define SN_organizationName "O"
# define LN_organizationName "organizationName"
# define NID_organizationName 17
# define OBJ_organizationName OBJ_X509,10L
# define SN_organizationalUnitName "OU"
# define LN_organizationalUnitName "organizationalUnitName"
# define NID_organizationalUnitName 18
# define OBJ_organizationalUnitName OBJ_X509,11L
# define SN_rsa "RSA"
# define LN_rsa "rsa"
# define NID_rsa 19
# define OBJ_rsa OBJ_X500,8L,1L,1L
# define LN_pkcs7 "pkcs7"
# define NID_pkcs7 20
# define OBJ_pkcs7 OBJ_pkcs,7L
# define LN_pkcs7_data "pkcs7-data"
# define NID_pkcs7_data 21
# define OBJ_pkcs7_data OBJ_pkcs7,1L
# define LN_pkcs7_signed "pkcs7-signedData"
# define NID_pkcs7_signed 22
# define OBJ_pkcs7_signed OBJ_pkcs7,2L
# define LN_pkcs7_enveloped "pkcs7-envelopedData"
# define NID_pkcs7_enveloped 23
# define OBJ_pkcs7_enveloped OBJ_pkcs7,3L
# define LN_pkcs7_signedAndEnveloped "pkcs7-signedAndEnvelopedData"
# define NID_pkcs7_signedAndEnveloped 24
# define OBJ_pkcs7_signedAndEnveloped OBJ_pkcs7,4L
# define LN_pkcs7_digest "pkcs7-digestData"
# define NID_pkcs7_digest 25
# define OBJ_pkcs7_digest OBJ_pkcs7,5L
# define LN_pkcs7_encrypted "pkcs7-encryptedData"
# define NID_pkcs7_encrypted 26
# define OBJ_pkcs7_encrypted OBJ_pkcs7,6L
# define LN_pkcs3 "pkcs3"
# define NID_pkcs3 27
# define OBJ_pkcs3 OBJ_pkcs,3L
# define LN_dhKeyAgreement "dhKeyAgreement"
# define NID_dhKeyAgreement 28
# define OBJ_dhKeyAgreement OBJ_pkcs3,1L
# define SN_des_ecb "DES-ECB"
# define LN_des_ecb "des-ecb"
# define NID_des_ecb 29
# define OBJ_des_ecb OBJ_algorithm,6L
# define SN_des_cfb64 "DES-CFB"
# define LN_des_cfb64 "des-cfb"
# define NID_des_cfb64 30
/* IV + num */
# define OBJ_des_cfb64 OBJ_algorithm,9L
# define SN_des_cbc "DES-CBC"
# define LN_des_cbc "des-cbc"
# define NID_des_cbc 31
/* IV */
# define OBJ_des_cbc OBJ_algorithm,7L
# define SN_des_ede "DES-EDE"
# define LN_des_ede "des-ede"
# define NID_des_ede 32
/* ?? */
# define OBJ_des_ede OBJ_algorithm,17L
# define SN_des_ede3 "DES-EDE3"
# define LN_des_ede3 "des-ede3"
# define NID_des_ede3 33
# define SN_idea_cbc "IDEA-CBC"
# define LN_idea_cbc "idea-cbc"
# define NID_idea_cbc 34
# define OBJ_idea_cbc 1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
# define SN_idea_cfb64 "IDEA-CFB"
# define LN_idea_cfb64 "idea-cfb"
# define NID_idea_cfb64 35
# define SN_idea_ecb "IDEA-ECB"
# define LN_idea_ecb "idea-ecb"
# define NID_idea_ecb 36
# define SN_rc2_cbc "RC2-CBC"
# define LN_rc2_cbc "rc2-cbc"
# define NID_rc2_cbc 37
# define OBJ_rc2_cbc OBJ_rsadsi,3L,2L
# define SN_rc2_ecb "RC2-ECB"
# define LN_rc2_ecb "rc2-ecb"
# define NID_rc2_ecb 38
# define SN_rc2_cfb64 "RC2-CFB"
# define LN_rc2_cfb64 "rc2-cfb"
# define NID_rc2_cfb64 39
# define SN_rc2_ofb64 "RC2-OFB"
# define LN_rc2_ofb64 "rc2-ofb"
# define NID_rc2_ofb64 40
# define SN_sha "SHA"
# define LN_sha "sha"
# define NID_sha 41
# define OBJ_sha OBJ_algorithm,18L
# define SN_shaWithRSAEncryption "RSA-SHA"
# define LN_shaWithRSAEncryption "shaWithRSAEncryption"
# define NID_shaWithRSAEncryption 42
# define OBJ_shaWithRSAEncryption OBJ_algorithm,15L
# define SN_des_ede_cbc "DES-EDE-CBC"
# define LN_des_ede_cbc "des-ede-cbc"
# define NID_des_ede_cbc 43
# define SN_des_ede3_cbc "DES-EDE3-CBC"
# define LN_des_ede3_cbc "des-ede3-cbc"
# define NID_des_ede3_cbc 44
# define OBJ_des_ede3_cbc OBJ_rsadsi,3L,7L
# define SN_des_ofb64 "DES-OFB"
# define LN_des_ofb64 "des-ofb"
# define NID_des_ofb64 45
# define OBJ_des_ofb64 OBJ_algorithm,8L
# define SN_idea_ofb64 "IDEA-OFB"
# define LN_idea_ofb64 "idea-ofb"
# define NID_idea_ofb64 46
# define LN_pkcs9 "pkcs9"
# define NID_pkcs9 47
# define OBJ_pkcs9 OBJ_pkcs,9L
# define SN_pkcs9_emailAddress "Email"
# define LN_pkcs9_emailAddress "emailAddress"
# define NID_pkcs9_emailAddress 48
# define OBJ_pkcs9_emailAddress OBJ_pkcs9,1L
# define LN_pkcs9_unstructuredName "unstructuredName"
# define NID_pkcs9_unstructuredName 49
# define OBJ_pkcs9_unstructuredName OBJ_pkcs9,2L
# define LN_pkcs9_contentType "contentType"
# define NID_pkcs9_contentType 50
# define OBJ_pkcs9_contentType OBJ_pkcs9,3L
# define LN_pkcs9_messageDigest "messageDigest"
# define NID_pkcs9_messageDigest 51
# define OBJ_pkcs9_messageDigest OBJ_pkcs9,4L
# define LN_pkcs9_signingTime "signingTime"
# define NID_pkcs9_signingTime 52
# define OBJ_pkcs9_signingTime OBJ_pkcs9,5L
# define LN_pkcs9_countersignature "countersignature"
# define NID_pkcs9_countersignature 53
# define OBJ_pkcs9_countersignature OBJ_pkcs9,6L
# define LN_pkcs9_challengePassword "challengePassword"
# define NID_pkcs9_challengePassword 54
# define OBJ_pkcs9_challengePassword OBJ_pkcs9,7L
# define LN_pkcs9_unstructuredAddress "unstructuredAddress"
# define NID_pkcs9_unstructuredAddress 55
# define OBJ_pkcs9_unstructuredAddress OBJ_pkcs9,8L
# define LN_pkcs9_extCertAttributes "extendedCertificateAttributes"
# define NID_pkcs9_extCertAttributes 56
# define OBJ_pkcs9_extCertAttributes OBJ_pkcs9,9L
# define SN_netscape "Netscape"
# define LN_netscape "Netscape Communications Corp."
# define NID_netscape 57
# define OBJ_netscape 2L,16L,840L,1L,113730L
# define SN_netscape_cert_extension "nsCertExt"
# define LN_netscape_cert_extension "Netscape Certificate Extension"
# define NID_netscape_cert_extension 58
# define OBJ_netscape_cert_extension OBJ_netscape,1L
# define SN_netscape_data_type "nsDataType"
# define LN_netscape_data_type "Netscape Data Type"
# define NID_netscape_data_type 59
# define OBJ_netscape_data_type OBJ_netscape,2L
# define SN_des_ede_cfb64 "DES-EDE-CFB"
# define LN_des_ede_cfb64 "des-ede-cfb"
# define NID_des_ede_cfb64 60
# define SN_des_ede3_cfb64 "DES-EDE3-CFB"
# define LN_des_ede3_cfb64 "des-ede3-cfb"
# define NID_des_ede3_cfb64 61
# define SN_des_ede_ofb64 "DES-EDE-OFB"
# define LN_des_ede_ofb64 "des-ede-ofb"
# define NID_des_ede_ofb64 62
# define SN_des_ede3_ofb64 "DES-EDE3-OFB"
# define LN_des_ede3_ofb64 "des-ede3-ofb"
# define NID_des_ede3_ofb64 63
/* I'm not sure about the object ID */
# define SN_sha1 "SHA1"
# define LN_sha1 "sha1"
# define NID_sha1 64
# define OBJ_sha1 OBJ_algorithm,26L
/* 28 Jun 1996 - eay */
/* #define OBJ_sha1 1L,3L,14L,2L,26L,05L <- wrong */
# define SN_sha1WithRSAEncryption "RSA-SHA1"
# define LN_sha1WithRSAEncryption "sha1WithRSAEncryption"
# define NID_sha1WithRSAEncryption 65
# define OBJ_sha1WithRSAEncryption OBJ_pkcs,1L,5L
# define SN_dsaWithSHA "DSA-SHA"
# define LN_dsaWithSHA "dsaWithSHA"
# define NID_dsaWithSHA 66
# define OBJ_dsaWithSHA OBJ_algorithm,13L
# define SN_dsa_2 "DSA-old"
# define LN_dsa_2 "dsaEncryption-old"
# define NID_dsa_2 67
# define OBJ_dsa_2 OBJ_algorithm,12L
/* proposed by microsoft to RSA */
# define SN_pbeWithSHA1AndRC2_CBC "PBE-SHA1-RC2-64"
# define LN_pbeWithSHA1AndRC2_CBC "pbeWithSHA1AndRC2-CBC"
# define NID_pbeWithSHA1AndRC2_CBC 68
# define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs,5L,11L
/*
* proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now defined
* explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something completely
* different.
*/
# define LN_id_pbkdf2 "PBKDF2"
# define NID_id_pbkdf2 69
# define OBJ_id_pbkdf2 OBJ_pkcs,5L,12L
# define SN_dsaWithSHA1_2 "DSA-SHA1-old"
# define LN_dsaWithSHA1_2 "dsaWithSHA1-old"
# define NID_dsaWithSHA1_2 70
/* Got this one from 'sdn706r20.pdf' which is actually an NSA document :-) */
# define OBJ_dsaWithSHA1_2 OBJ_algorithm,27L
# define SN_netscape_cert_type "nsCertType"
# define LN_netscape_cert_type "Netscape Cert Type"
# define NID_netscape_cert_type 71
# define OBJ_netscape_cert_type OBJ_netscape_cert_extension,1L
# define SN_netscape_base_url "nsBaseUrl"
# define LN_netscape_base_url "Netscape Base Url"
# define NID_netscape_base_url 72
# define OBJ_netscape_base_url OBJ_netscape_cert_extension,2L
# define SN_netscape_revocation_url "nsRevocationUrl"
# define LN_netscape_revocation_url "Netscape Revocation Url"
# define NID_netscape_revocation_url 73
# define OBJ_netscape_revocation_url OBJ_netscape_cert_extension,3L
# define SN_netscape_ca_revocation_url "nsCaRevocationUrl"
# define LN_netscape_ca_revocation_url "Netscape CA Revocation Url"
# define NID_netscape_ca_revocation_url 74
# define OBJ_netscape_ca_revocation_url OBJ_netscape_cert_extension,4L
# define SN_netscape_renewal_url "nsRenewalUrl"
# define LN_netscape_renewal_url "Netscape Renewal Url"
# define NID_netscape_renewal_url 75
# define OBJ_netscape_renewal_url OBJ_netscape_cert_extension,7L
# define SN_netscape_ca_policy_url "nsCaPolicyUrl"
# define LN_netscape_ca_policy_url "Netscape CA Policy Url"
# define NID_netscape_ca_policy_url 76
# define OBJ_netscape_ca_policy_url OBJ_netscape_cert_extension,8L
# define SN_netscape_ssl_server_name "nsSslServerName"
# define LN_netscape_ssl_server_name "Netscape SSL Server Name"
# define NID_netscape_ssl_server_name 77
# define OBJ_netscape_ssl_server_name OBJ_netscape_cert_extension,12L
# define SN_netscape_comment "nsComment"
# define LN_netscape_comment "Netscape Comment"
# define NID_netscape_comment 78
# define OBJ_netscape_comment OBJ_netscape_cert_extension,13L
# define SN_netscape_cert_sequence "nsCertSequence"
# define LN_netscape_cert_sequence "Netscape Certificate Sequence"
# define NID_netscape_cert_sequence 79
# define OBJ_netscape_cert_sequence OBJ_netscape_data_type,5L
# define SN_desx_cbc "DESX-CBC"
# define LN_desx_cbc "desx-cbc"
# define NID_desx_cbc 80
# define SN_id_ce "id-ce"
# define NID_id_ce 81
# define OBJ_id_ce 2L,5L,29L
# define SN_subject_key_identifier "subjectKeyIdentifier"
# define LN_subject_key_identifier "X509v3 Subject Key Identifier"
# define NID_subject_key_identifier 82
# define OBJ_subject_key_identifier OBJ_id_ce,14L
# define SN_key_usage "keyUsage"
# define LN_key_usage "X509v3 Key Usage"
# define NID_key_usage 83
# define OBJ_key_usage OBJ_id_ce,15L
# define SN_private_key_usage_period "privateKeyUsagePeriod"
# define LN_private_key_usage_period "X509v3 Private Key Usage Period"
# define NID_private_key_usage_period 84
# define OBJ_private_key_usage_period OBJ_id_ce,16L
# define SN_subject_alt_name "subjectAltName"
# define LN_subject_alt_name "X509v3 Subject Alternative Name"
# define NID_subject_alt_name 85
# define OBJ_subject_alt_name OBJ_id_ce,17L
# define SN_issuer_alt_name "issuerAltName"
# define LN_issuer_alt_name "X509v3 Issuer Alternative Name"
# define NID_issuer_alt_name 86
# define OBJ_issuer_alt_name OBJ_id_ce,18L
# define SN_basic_constraints "basicConstraints"
# define LN_basic_constraints "X509v3 Basic Constraints"
# define NID_basic_constraints 87
# define OBJ_basic_constraints OBJ_id_ce,19L
# define SN_crl_number "crlNumber"
# define LN_crl_number "X509v3 CRL Number"
# define NID_crl_number 88
# define OBJ_crl_number OBJ_id_ce,20L
# define SN_certificate_policies "certificatePolicies"
# define LN_certificate_policies "X509v3 Certificate Policies"
# define NID_certificate_policies 89
# define OBJ_certificate_policies OBJ_id_ce,32L
# define SN_authority_key_identifier "authorityKeyIdentifier"
# define LN_authority_key_identifier "X509v3 Authority Key Identifier"
# define NID_authority_key_identifier 90
# define OBJ_authority_key_identifier OBJ_id_ce,35L
# define SN_bf_cbc "BF-CBC"
# define LN_bf_cbc "bf-cbc"
# define NID_bf_cbc 91
# define OBJ_bf_cbc 1L,3L,6L,1L,4L,1L,3029L,1L,2L
# define SN_bf_ecb "BF-ECB"
# define LN_bf_ecb "bf-ecb"
# define NID_bf_ecb 92
# define SN_bf_cfb64 "BF-CFB"
# define LN_bf_cfb64 "bf-cfb"
# define NID_bf_cfb64 93
# define SN_bf_ofb64 "BF-OFB"
# define LN_bf_ofb64 "bf-ofb"
# define NID_bf_ofb64 94
# define SN_mdc2 "MDC2"
# define LN_mdc2 "mdc2"
# define NID_mdc2 95
# define OBJ_mdc2 2L,5L,8L,3L,101L
/* An alternative? 1L,3L,14L,3L,2L,19L */
# define SN_mdc2WithRSA "RSA-MDC2"
# define LN_mdc2WithRSA "mdc2withRSA"
# define NID_mdc2WithRSA 96
# define OBJ_mdc2WithRSA 2L,5L,8L,3L,100L
# define SN_rc4_40 "RC4-40"
# define LN_rc4_40 "rc4-40"
# define NID_rc4_40 97
# define SN_rc2_40_cbc "RC2-40-CBC"
# define LN_rc2_40_cbc "rc2-40-cbc"
# define NID_rc2_40_cbc 98
# define SN_givenName "G"
# define LN_givenName "givenName"
# define NID_givenName 99
# define OBJ_givenName OBJ_X509,42L
# define SN_surname "S"
# define LN_surname "surname"
# define NID_surname 100
# define OBJ_surname OBJ_X509,4L
# define SN_initials "I"
# define LN_initials "initials"
# define NID_initials 101
# define OBJ_initials OBJ_X509,43L
# define SN_uniqueIdentifier "UID"
# define LN_uniqueIdentifier "uniqueIdentifier"
# define NID_uniqueIdentifier 102
# define OBJ_uniqueIdentifier OBJ_X509,45L
# define SN_crl_distribution_points "crlDistributionPoints"
# define LN_crl_distribution_points "X509v3 CRL Distribution Points"
# define NID_crl_distribution_points 103
# define OBJ_crl_distribution_points OBJ_id_ce,31L
# define SN_md5WithRSA "RSA-NP-MD5"
# define LN_md5WithRSA "md5WithRSA"
# define NID_md5WithRSA 104
# define OBJ_md5WithRSA OBJ_algorithm,3L
# define SN_serialNumber "SN"
# define LN_serialNumber "serialNumber"
# define NID_serialNumber 105
# define OBJ_serialNumber OBJ_X509,5L
# define SN_title "T"
# define LN_title "title"
# define NID_title 106
# define OBJ_title OBJ_X509,12L
# define SN_description "D"
# define LN_description "description"
# define NID_description 107
# define OBJ_description OBJ_X509,13L
/* CAST5 is CAST-128, I'm just sticking with the documentation */
# define SN_cast5_cbc "CAST5-CBC"
# define LN_cast5_cbc "cast5-cbc"
# define NID_cast5_cbc 108
# define OBJ_cast5_cbc 1L,2L,840L,113533L,7L,66L,10L
# define SN_cast5_ecb "CAST5-ECB"
# define LN_cast5_ecb "cast5-ecb"
# define NID_cast5_ecb 109
# define SN_cast5_cfb64 "CAST5-CFB"
# define LN_cast5_cfb64 "cast5-cfb"
# define NID_cast5_cfb64 110
# define SN_cast5_ofb64 "CAST5-OFB"
# define LN_cast5_ofb64 "cast5-ofb"
# define NID_cast5_ofb64 111
# define LN_pbeWithMD5AndCast5_CBC "pbeWithMD5AndCast5CBC"
# define NID_pbeWithMD5AndCast5_CBC 112
# define OBJ_pbeWithMD5AndCast5_CBC 1L,2L,840L,113533L,7L,66L,12L
/*-
* This is one sun will soon be using :-(
* id-dsa-with-sha1 ID ::= {
* iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
*/
# define SN_dsaWithSHA1 "DSA-SHA1"
# define LN_dsaWithSHA1 "dsaWithSHA1"
# define NID_dsaWithSHA1 113
# define OBJ_dsaWithSHA1 1L,2L,840L,10040L,4L,3L
# define NID_md5_sha1 114
# define SN_md5_sha1 "MD5-SHA1"
# define LN_md5_sha1 "md5-sha1"
# define SN_sha1WithRSA "RSA-SHA1-2"
# define LN_sha1WithRSA "sha1WithRSA"
# define NID_sha1WithRSA 115
# define OBJ_sha1WithRSA OBJ_algorithm,29L
# define SN_dsa "DSA"
# define LN_dsa "dsaEncryption"
# define NID_dsa 116
# define OBJ_dsa 1L,2L,840L,10040L,4L,1L
# define SN_ripemd160 "RIPEMD160"
# define LN_ripemd160 "ripemd160"
# define NID_ripemd160 117
# define OBJ_ripemd160 1L,3L,36L,3L,2L,1L
/*
* The name should actually be rsaSignatureWithripemd160, but I'm going to
* continue using the convention I'm using with the other ciphers
*/
# define SN_ripemd160WithRSA "RSA-RIPEMD160"
# define LN_ripemd160WithRSA "ripemd160WithRSA"
# define NID_ripemd160WithRSA 119
# define OBJ_ripemd160WithRSA 1L,3L,36L,3L,3L,1L,2L
/*-
* Taken from rfc2040
* RC5_CBC_Parameters ::= SEQUENCE {
* version INTEGER (v1_0(16)),
* rounds INTEGER (8..127),
* blockSizeInBits INTEGER (64, 128),
* iv OCTET STRING OPTIONAL
* }
*/
# define SN_rc5_cbc "RC5-CBC"
# define LN_rc5_cbc "rc5-cbc"
# define NID_rc5_cbc 120
# define OBJ_rc5_cbc OBJ_rsadsi,3L,8L
# define SN_rc5_ecb "RC5-ECB"
# define LN_rc5_ecb "rc5-ecb"
# define NID_rc5_ecb 121
# define SN_rc5_cfb64 "RC5-CFB"
# define LN_rc5_cfb64 "rc5-cfb"
# define NID_rc5_cfb64 122
# define SN_rc5_ofb64 "RC5-OFB"
# define LN_rc5_ofb64 "rc5-ofb"
# define NID_rc5_ofb64 123
# define SN_rle_compression "RLE"
# define LN_rle_compression "run length compression"
# define NID_rle_compression 124
# define OBJ_rle_compression 1L,1L,1L,1L,666L,1L
# define SN_zlib_compression "ZLIB"
# define LN_zlib_compression "zlib compression"
# define NID_zlib_compression 125
# define OBJ_zlib_compression 1L,1L,1L,1L,666L,2L
# define SN_ext_key_usage "extendedKeyUsage"
# define LN_ext_key_usage "X509v3 Extended Key Usage"
# define NID_ext_key_usage 126
# define OBJ_ext_key_usage OBJ_id_ce,37
# define SN_id_pkix "PKIX"
# define NID_id_pkix 127
# define OBJ_id_pkix 1L,3L,6L,1L,5L,5L,7L
# define SN_id_kp "id-kp"
# define NID_id_kp 128
# define OBJ_id_kp OBJ_id_pkix,3L
/* PKIX extended key usage OIDs */
# define SN_server_auth "serverAuth"
# define LN_server_auth "TLS Web Server Authentication"
# define NID_server_auth 129
# define OBJ_server_auth OBJ_id_kp,1L
# define SN_client_auth "clientAuth"
# define LN_client_auth "TLS Web Client Authentication"
# define NID_client_auth 130
# define OBJ_client_auth OBJ_id_kp,2L
# define SN_code_sign "codeSigning"
# define LN_code_sign "Code Signing"
# define NID_code_sign 131
# define OBJ_code_sign OBJ_id_kp,3L
# define SN_email_protect "emailProtection"
# define LN_email_protect "E-mail Protection"
# define NID_email_protect 132
# define OBJ_email_protect OBJ_id_kp,4L
# define SN_time_stamp "timeStamping"
# define LN_time_stamp "Time Stamping"
# define NID_time_stamp 133
# define OBJ_time_stamp OBJ_id_kp,8L
/* Additional extended key usage OIDs: Microsoft */
# define SN_ms_code_ind "msCodeInd"
# define LN_ms_code_ind "Microsoft Individual Code Signing"
# define NID_ms_code_ind 134
# define OBJ_ms_code_ind 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
# define SN_ms_code_com "msCodeCom"
# define LN_ms_code_com "Microsoft Commercial Code Signing"
# define NID_ms_code_com 135
# define OBJ_ms_code_com 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
# define SN_ms_ctl_sign "msCTLSign"
# define LN_ms_ctl_sign "Microsoft Trust List Signing"
# define NID_ms_ctl_sign 136
# define OBJ_ms_ctl_sign 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
# define SN_ms_sgc "msSGC"
# define LN_ms_sgc "Microsoft Server Gated Crypto"
# define NID_ms_sgc 137
# define OBJ_ms_sgc 1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
# define SN_ms_efs "msEFS"
# define LN_ms_efs "Microsoft Encrypted File System"
# define NID_ms_efs 138
# define OBJ_ms_efs 1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
/* Additional usage: Netscape */
# define SN_ns_sgc "nsSGC"
# define LN_ns_sgc "Netscape Server Gated Crypto"
# define NID_ns_sgc 139
# define OBJ_ns_sgc OBJ_netscape,4L,1L
# define SN_delta_crl "deltaCRL"
# define LN_delta_crl "X509v3 Delta CRL Indicator"
# define NID_delta_crl 140
# define OBJ_delta_crl OBJ_id_ce,27L
# define SN_crl_reason "CRLReason"
# define LN_crl_reason "CRL Reason Code"
# define NID_crl_reason 141
# define OBJ_crl_reason OBJ_id_ce,21L
# define SN_invalidity_date "invalidityDate"
# define LN_invalidity_date "Invalidity Date"
# define NID_invalidity_date 142
# define OBJ_invalidity_date OBJ_id_ce,24L
# define SN_sxnet "SXNetID"
# define LN_sxnet "Strong Extranet ID"
# define NID_sxnet 143
# define OBJ_sxnet 1L,3L,101L,1L,4L,1L
/* PKCS12 and related OBJECT IDENTIFIERS */
# define OBJ_pkcs12 OBJ_pkcs,12L
# define OBJ_pkcs12_pbeids OBJ_pkcs12, 1
# define SN_pbe_WithSHA1And128BitRC4 "PBE-SHA1-RC4-128"
# define LN_pbe_WithSHA1And128BitRC4 "pbeWithSHA1And128BitRC4"
# define NID_pbe_WithSHA1And128BitRC4 144
# define OBJ_pbe_WithSHA1And128BitRC4 OBJ_pkcs12_pbeids, 1L
# define SN_pbe_WithSHA1And40BitRC4 "PBE-SHA1-RC4-40"
# define LN_pbe_WithSHA1And40BitRC4 "pbeWithSHA1And40BitRC4"
# define NID_pbe_WithSHA1And40BitRC4 145
# define OBJ_pbe_WithSHA1And40BitRC4 OBJ_pkcs12_pbeids, 2L
# define SN_pbe_WithSHA1And3_Key_TripleDES_CBC "PBE-SHA1-3DES"
# define LN_pbe_WithSHA1And3_Key_TripleDES_CBC "pbeWithSHA1And3-KeyTripleDES-CBC"
# define NID_pbe_WithSHA1And3_Key_TripleDES_CBC 146
# define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC OBJ_pkcs12_pbeids, 3L
# define SN_pbe_WithSHA1And2_Key_TripleDES_CBC "PBE-SHA1-2DES"
# define LN_pbe_WithSHA1And2_Key_TripleDES_CBC "pbeWithSHA1And2-KeyTripleDES-CBC"
# define NID_pbe_WithSHA1And2_Key_TripleDES_CBC 147
# define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC OBJ_pkcs12_pbeids, 4L
# define SN_pbe_WithSHA1And128BitRC2_CBC "PBE-SHA1-RC2-128"
# define LN_pbe_WithSHA1And128BitRC2_CBC "pbeWithSHA1And128BitRC2-CBC"
# define NID_pbe_WithSHA1And128BitRC2_CBC 148
# define OBJ_pbe_WithSHA1And128BitRC2_CBC OBJ_pkcs12_pbeids, 5L
# define SN_pbe_WithSHA1And40BitRC2_CBC "PBE-SHA1-RC2-40"
# define LN_pbe_WithSHA1And40BitRC2_CBC "pbeWithSHA1And40BitRC2-CBC"
# define NID_pbe_WithSHA1And40BitRC2_CBC 149
# define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids, 6L
# define OBJ_pkcs12_Version1 OBJ_pkcs12, 10L
# define OBJ_pkcs12_BagIds OBJ_pkcs12_Version1, 1L
# define LN_keyBag "keyBag"
# define NID_keyBag 150
# define OBJ_keyBag OBJ_pkcs12_BagIds, 1L
# define LN_pkcs8ShroudedKeyBag "pkcs8ShroudedKeyBag"
# define NID_pkcs8ShroudedKeyBag 151
# define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds, 2L
# define LN_certBag "certBag"
# define NID_certBag 152
# define OBJ_certBag OBJ_pkcs12_BagIds, 3L
# define LN_crlBag "crlBag"
# define NID_crlBag 153
# define OBJ_crlBag OBJ_pkcs12_BagIds, 4L
# define LN_secretBag "secretBag"
# define NID_secretBag 154
# define OBJ_secretBag OBJ_pkcs12_BagIds, 5L
# define LN_safeContentsBag "safeContentsBag"
# define NID_safeContentsBag 155
# define OBJ_safeContentsBag OBJ_pkcs12_BagIds, 6L
# define LN_friendlyName "friendlyName"
# define NID_friendlyName 156
# define OBJ_friendlyName OBJ_pkcs9, 20L
# define LN_localKeyID "localKeyID"
# define NID_localKeyID 157
# define OBJ_localKeyID OBJ_pkcs9, 21L
# define OBJ_certTypes OBJ_pkcs9, 22L
# define LN_x509Certificate "x509Certificate"
# define NID_x509Certificate 158
# define OBJ_x509Certificate OBJ_certTypes, 1L
# define LN_sdsiCertificate "sdsiCertificate"
# define NID_sdsiCertificate 159
# define OBJ_sdsiCertificate OBJ_certTypes, 2L
# define OBJ_crlTypes OBJ_pkcs9, 23L
# define LN_x509Crl "x509Crl"
# define NID_x509Crl 160
# define OBJ_x509Crl OBJ_crlTypes, 1L
/* PKCS#5 v2 OIDs */
# define LN_pbes2 "PBES2"
# define NID_pbes2 161
# define OBJ_pbes2 OBJ_pkcs,5L,13L
# define LN_pbmac1 "PBMAC1"
# define NID_pbmac1 162
# define OBJ_pbmac1 OBJ_pkcs,5L,14L
# define LN_hmacWithSHA1 "hmacWithSHA1"
# define NID_hmacWithSHA1 163
# define OBJ_hmacWithSHA1 OBJ_rsadsi,2L,7L
/* Policy Qualifier Ids */
# define LN_id_qt_cps "Policy Qualifier CPS"
# define SN_id_qt_cps "id-qt-cps"
# define NID_id_qt_cps 164
# define OBJ_id_qt_cps OBJ_id_pkix,2L,1L
# define LN_id_qt_unotice "Policy Qualifier User Notice"
# define SN_id_qt_unotice "id-qt-unotice"
# define NID_id_qt_unotice 165
# define OBJ_id_qt_unotice OBJ_id_pkix,2L,2L
# define SN_rc2_64_cbc "RC2-64-CBC"
# define LN_rc2_64_cbc "rc2-64-cbc"
# define NID_rc2_64_cbc 166
# define SN_SMIMECapabilities "SMIME-CAPS"
# define LN_SMIMECapabilities "S/MIME Capabilities"
# define NID_SMIMECapabilities 167
# define OBJ_SMIMECapabilities OBJ_pkcs9,15L
# define SN_pbeWithMD2AndRC2_CBC "PBE-MD2-RC2-64"
# define LN_pbeWithMD2AndRC2_CBC "pbeWithMD2AndRC2-CBC"
# define NID_pbeWithMD2AndRC2_CBC 168
# define OBJ_pbeWithMD2AndRC2_CBC OBJ_pkcs,5L,4L
# define SN_pbeWithMD5AndRC2_CBC "PBE-MD5-RC2-64"
# define LN_pbeWithMD5AndRC2_CBC "pbeWithMD5AndRC2-CBC"
# define NID_pbeWithMD5AndRC2_CBC 169
# define OBJ_pbeWithMD5AndRC2_CBC OBJ_pkcs,5L,6L
# define SN_pbeWithSHA1AndDES_CBC "PBE-SHA1-DES"
# define LN_pbeWithSHA1AndDES_CBC "pbeWithSHA1AndDES-CBC"
# define NID_pbeWithSHA1AndDES_CBC 170
# define OBJ_pbeWithSHA1AndDES_CBC OBJ_pkcs,5L,10L
/* Extension request OIDs */
# define LN_ms_ext_req "Microsoft Extension Request"
# define SN_ms_ext_req "msExtReq"
# define NID_ms_ext_req 171
# define OBJ_ms_ext_req 1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
# define LN_ext_req "Extension Request"
# define SN_ext_req "extReq"
# define NID_ext_req 172
# define OBJ_ext_req OBJ_pkcs9,14L
# define SN_name "name"
# define LN_name "name"
# define NID_name 173
# define OBJ_name OBJ_X509,41L
# define SN_dnQualifier "dnQualifier"
# define LN_dnQualifier "dnQualifier"
# define NID_dnQualifier 174
# define OBJ_dnQualifier OBJ_X509,46L
# define SN_id_pe "id-pe"
# define NID_id_pe 175
# define OBJ_id_pe OBJ_id_pkix,1L
# define SN_id_ad "id-ad"
# define NID_id_ad 176
# define OBJ_id_ad OBJ_id_pkix,48L
# define SN_info_access "authorityInfoAccess"
# define LN_info_access "Authority Information Access"
# define NID_info_access 177
# define OBJ_info_access OBJ_id_pe,1L
# define SN_ad_OCSP "OCSP"
# define LN_ad_OCSP "OCSP"
# define NID_ad_OCSP 178
# define OBJ_ad_OCSP OBJ_id_ad,1L
# define SN_ad_ca_issuers "caIssuers"
# define LN_ad_ca_issuers "CA Issuers"
# define NID_ad_ca_issuers 179
# define OBJ_ad_ca_issuers OBJ_id_ad,2L
# define SN_OCSP_sign "OCSPSigning"
# define LN_OCSP_sign "OCSP Signing"
# define NID_OCSP_sign 180
# define OBJ_OCSP_sign OBJ_id_kp,9L
# endif /* USE_OBJ_MAC */
# include <openssl/obj_mac.h>
# include <openssl/bio.h>
# include <openssl/asn1.h>

13
ssl/d1_msg.c
View File

@ -59,23 +59,12 @@ int dtls1_dispatch_alert(SSL *s)
*ptr++ = s->s3->send_alert[0];
*ptr++ = s->s3->send_alert[1];
#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
if (s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE) {
s2n(s->d1->handshake_read_seq, ptr);
l2n3(s->d1->r_msg_hdr.frag_off, ptr);
}
#endif
i = do_dtls1_write(s, SSL3_RT_ALERT, &buf[0], sizeof(buf), 0, &written);
if (i <= 0) {
s->s3->alert_dispatch = 1;
/* fprintf( stderr, "not done with alert\n" ); */
} else {
if (s->s3->send_alert[0] == SSL3_AL_FATAL
#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
|| s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
#endif
)
if (s->s3->send_alert[0] == SSL3_AL_FATAL)
(void)BIO_flush(s->wbio);
if (s->msg_callback)

36
ssl/record/rec_layer_d1.c
View File

@ -599,14 +599,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
* fragmented--don't always expect dest_maxlen bytes
*/
if (SSL3_RECORD_get_length(rr) < dest_maxlen) {
#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
/*
* for normal alerts rr->length is 2, while
* dest_maxlen is 7 if we were to handle this
* non-existing alert...
*/
FIX ME;
#endif
s->rlayer.rstate = SSL_ST_READ_HEADER;
SSL3_RECORD_set_length(rr, 0);
goto start;
@ -678,34 +670,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
s->shutdown |= SSL_RECEIVED_SHUTDOWN;
return 0;
}
#if 0
/* XXX: this is a possible improvement in the future */
/* now check if it's a missing record */
if (alert_descr == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE) {
unsigned short seq;
unsigned int frag_off;
unsigned char *p = &(s->rlayer.d->alert_fragment[2]);
n2s(p, seq);
n2l3(p, frag_off);
dtls1_retransmit_message(s,
dtls1_get_queue_priority
(frag->msg_header.seq, 0), frag_off,
&found);
if (!found && SSL_in_init(s)) {
/*
* fprintf( stderr,"in init = %d\n", SSL_in_init(s));
*/
/*
* requested a message not yet sent, send an alert
* ourselves
*/
ssl3_send_alert(s, SSL3_AL_WARNING,
DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
}
}
#endif
} else if (alert_level == SSL3_AL_FATAL) {
char tmp[16];

4
ssl/record/rec_layer_s3.c
View File

@ -1429,10 +1429,6 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_NO_RENEGOTIATION);
goto f_err;
}
#ifdef SSL_AD_MISSING_SRP_USERNAME
else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
return (0);
#endif
} else if (alert_level == SSL3_AL_FATAL) {
char tmp[16];

3
ssl/ssl_ciph.c
View File

@ -388,9 +388,6 @@ void ssl_load_ciphers(void)
disabled_enc_mask |= t->mask;
}
}
#ifdef SSL_FORBID_ENULL
disabled_enc_mask |= SSL_eNULL;
#endif
disabled_mac_mask = 0;
for (i = 0, t = ssl_cipher_table_mac; i < SSL_MD_NUM_IDX; i++, t++) {
const EVP_MD *md = EVP_get_digestbynid(t->nid);

2
ssl/ssl_locl.h
View File

@ -73,8 +73,6 @@
# define OPENSSL_EXTERN OPENSSL_EXPORT
# endif
# undef PKCS1_CHECK
# define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \
l|=(((unsigned long)(*((c)++)))<< 8), \
l|=(((unsigned long)(*((c)++)))<<16), \

6
ssl/statem/statem_clnt.c
View File

@ -2752,12 +2752,6 @@ static int tls_construct_cke_rsa(SSL *s, WPACKET *pkt, int *al)
}
EVP_PKEY_CTX_free(pctx);
pctx = NULL;
# ifdef PKCS1_CHECK
if (s->options & SSL_OP_PKCS1_CHECK_1)
(*p)[1]++;
if (s->options & SSL_OP_PKCS1_CHECK_2)
tmp_buf[0] = 0x70;
# endif
/* Fix buf for TLS and beyond */
if (s->version > SSL3_VERSION && !WPACKET_close(pkt)) {

2
test/build.info
View File

@ -47,7 +47,7 @@ IF[{- !$disabled{tests} -}]
DEPEND[bntest]=../libcrypto
SOURCE[ectest]=ectest.c
INCLUDE[ectest]=../include
INCLUDE[ectest]=.. ../include
DEPEND[ectest]=../libcrypto
SOURCE[ecdsatest]=ecdsatest.c

7
test/ectest.c
View File

@ -23,14 +23,11 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef FLAT_INC
# include "e_os.h"
#else
# include "../e_os.h"
#endif
#include <string.h>
#include <time.h>
#include "e_os.h"
#ifdef OPENSSL_NO_EC
int main(int argc, char *argv[])
{

6
test/rsa_test.c
View File

@ -292,11 +292,7 @@ int main(int argc, char *argv[])
} else if (memcmp(ctext, ctext_ex, num) == 0)
printf("OAEP test vector %d passed!\n", v);
/*
* Different ciphertexts (rsa_oaep.c without -DPKCS_TESTVECT). Try
* decrypting ctext_ex
*/
/* Different ciphertexts. Try decrypting ctext_ex */
num = RSA_private_decrypt(clen, ctext_ex, ptext, key,
RSA_PKCS1_OAEP_PADDING);