summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2002-06-07 03:45:34 +0000
committerbeck <>2002-06-07 03:45:34 +0000
commit820a20ea2b5f97e4a8fb714fedf33edafd40740a (patch)
tree595b35cf9e1ff104d11fb8ab64ebb6a5c5f42755 /src
parentd13d58e31ac54f9b283fe3ec100f31030e050fb4 (diff)
downloadopenbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.gz
openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.bz2
openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.zip
Merge OpenSSL 0.9.7-stable-20020605,
correctly autogenerate obj_mac.h
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/Makefile.ssl8
-rw-r--r--src/lib/libcrypto/aes/aes_cfb.c2
-rw-r--r--src/lib/libcrypto/aes/aes_ctr.c2
-rw-r--r--src/lib/libcrypto/asn1/a_bitstr.c6
-rw-r--r--src/lib/libcrypto/asn1/a_enum.c12
-rw-r--r--src/lib/libcrypto/asn1/a_int.c11
-rw-r--r--src/lib/libcrypto/asn1/a_set.c4
-rw-r--r--src/lib/libcrypto/asn1/a_utctm.c3
-rw-r--r--src/lib/libcrypto/asn1/x_pubkey.c10
-rw-r--r--src/lib/libcrypto/bio/bf_nbio.c2
-rw-r--r--src/lib/libcrypto/bn/bn_div.c8
-rw-r--r--src/lib/libcrypto/bn/bn_mont.c6
-rw-r--r--src/lib/libcrypto/bn/bn_mul.c14
-rw-r--r--src/lib/libcrypto/crypto-lib.com40
-rw-r--r--src/lib/libcrypto/dso/dso_dlfcn.c2
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c8
-rw-r--r--src/lib/libcrypto/engine/Makefile.ssl2
-rw-r--r--src/lib/libcrypto/engine/hw_4758_cca.c28
-rw-r--r--src/lib/libcrypto/evp/bio_enc.c2
-rw-r--r--src/lib/libcrypto/evp/c_allc.c15
-rw-r--r--src/lib/libcrypto/evp/e_aes.c4
-rw-r--r--src/lib/libcrypto/evp/evp.h15
-rw-r--r--src/lib/libcrypto/evp/evp_test.c143
-rw-r--r--src/lib/libcrypto/evp/evptests.txt125
-rw-r--r--src/lib/libcrypto/objects/Makefile.ssl1
-rw-r--r--src/lib/libcrypto/objects/o_names.c3
-rw-r--r--src/lib/libcrypto/objects/obj_dat.c2
-rw-r--r--src/lib/libcrypto/objects/obj_mac.h2307
-rw-r--r--src/lib/libcrypto/opensslv.h4
-rw-r--r--src/lib/libcrypto/pem/pem_pkey.c1
-rw-r--r--src/lib/libcrypto/rand/rand_egd.c2
-rw-r--r--src/lib/libcrypto/rsa/rsa_eay.c2
-rw-r--r--src/lib/libcrypto/txt_db/txt_db.c2
-rw-r--r--src/lib/libcrypto/util/domd4
-rw-r--r--src/lib/libcrypto/util/libeay.num6
-rw-r--r--src/lib/libcrypto/util/mkerr.pl4
-rw-r--r--src/lib/libcrypto/util/pod2man.pl4
-rw-r--r--src/lib/libcrypto/x509v3/v3_ia5.c2
-rw-r--r--src/lib/libssl/Makefile15
-rw-r--r--src/lib/libssl/src/CHANGES4
-rw-r--r--src/lib/libssl/src/Configure35
-rw-r--r--src/lib/libssl/src/Makefile.org14
-rw-r--r--src/lib/libssl/src/README2
-rw-r--r--src/lib/libssl/src/STATUS8
-rw-r--r--src/lib/libssl/src/TABLE107
-rw-r--r--src/lib/libssl/src/apps/Makefile.ssl1
-rw-r--r--src/lib/libssl/src/apps/apps.c13
-rw-r--r--src/lib/libssl/src/apps/asn1pars.c3
-rw-r--r--src/lib/libssl/src/apps/makeapps.com39
-rw-r--r--src/lib/libssl/src/apps/speed.c5
-rw-r--r--src/lib/libssl/src/apps/x509.c2
-rw-r--r--src/lib/libssl/src/config8
-rw-r--r--src/lib/libssl/src/crypto/Makefile.ssl8
-rw-r--r--src/lib/libssl/src/crypto/aes/aes_cfb.c2
-rw-r--r--src/lib/libssl/src/crypto/aes/aes_ctr.c2
-rw-r--r--src/lib/libssl/src/crypto/asn1/a_bitstr.c6
-rw-r--r--src/lib/libssl/src/crypto/asn1/a_enum.c12
-rw-r--r--src/lib/libssl/src/crypto/asn1/a_int.c11
-rw-r--r--src/lib/libssl/src/crypto/asn1/a_set.c4
-rw-r--r--src/lib/libssl/src/crypto/asn1/a_utctm.c3
-rw-r--r--src/lib/libssl/src/crypto/asn1/x_pubkey.c10
-rw-r--r--src/lib/libssl/src/crypto/bio/bf_nbio.c2
-rw-r--r--src/lib/libssl/src/crypto/bn/bn_div.c8
-rw-r--r--src/lib/libssl/src/crypto/bn/bn_mont.c6
-rw-r--r--src/lib/libssl/src/crypto/bn/bn_mul.c14
-rw-r--r--src/lib/libssl/src/crypto/crypto-lib.com40
-rw-r--r--src/lib/libssl/src/crypto/dso/dso_dlfcn.c2
-rw-r--r--src/lib/libssl/src/crypto/ec/ec_lib.c8
-rw-r--r--src/lib/libssl/src/crypto/engine/Makefile.ssl2
-rw-r--r--src/lib/libssl/src/crypto/engine/hw_4758_cca.c28
-rw-r--r--src/lib/libssl/src/crypto/evp/bio_enc.c2
-rw-r--r--src/lib/libssl/src/crypto/evp/c_allc.c15
-rw-r--r--src/lib/libssl/src/crypto/evp/e_aes.c4
-rw-r--r--src/lib/libssl/src/crypto/evp/evp.h15
-rw-r--r--src/lib/libssl/src/crypto/evp/evp_test.c143
-rw-r--r--src/lib/libssl/src/crypto/evp/evptests.txt125
-rw-r--r--src/lib/libssl/src/crypto/objects/Makefile.ssl1
-rw-r--r--src/lib/libssl/src/crypto/objects/o_names.c3
-rw-r--r--src/lib/libssl/src/crypto/objects/obj_dat.c2
-rw-r--r--src/lib/libssl/src/crypto/objects/obj_mac.h2307
-rw-r--r--src/lib/libssl/src/crypto/opensslv.h4
-rw-r--r--src/lib/libssl/src/crypto/pem/pem_pkey.c1
-rw-r--r--src/lib/libssl/src/crypto/rand/rand_egd.c2
-rw-r--r--src/lib/libssl/src/crypto/rsa/rsa_eay.c2
-rw-r--r--src/lib/libssl/src/crypto/txt_db/txt_db.c2
-rw-r--r--src/lib/libssl/src/crypto/x509v3/v3_ia5.c2
-rw-r--r--src/lib/libssl/src/doc/apps/smime.pod1
-rw-r--r--src/lib/libssl/src/doc/crypto/BN_rand.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.pod2
-rw-r--r--src/lib/libssl/src/e_os.h2
-rw-r--r--src/lib/libssl/src/makevms.com66
-rw-r--r--src/lib/libssl/src/ssl/ssl-lib.com41
-rw-r--r--src/lib/libssl/src/test/Makefile.ssl1
-rw-r--r--src/lib/libssl/src/test/maketests.com38
-rw-r--r--src/lib/libssl/src/util/domd4
-rw-r--r--src/lib/libssl/src/util/libeay.num6
-rw-r--r--src/lib/libssl/src/util/mkerr.pl4
-rw-r--r--src/lib/libssl/src/util/pod2man.pl4
-rw-r--r--src/lib/libssl/test/Makefile.ssl1
-rw-r--r--src/lib/libssl/test/maketests.com38
100 files changed, 1076 insertions, 5004 deletions
diff --git a/src/lib/libcrypto/Makefile.ssl b/src/lib/libcrypto/Makefile.ssl
index 9d1a180571..6a52e04218 100644
--- a/src/lib/libcrypto/Makefile.ssl
+++ b/src/lib/libcrypto/Makefile.ssl
@@ -54,11 +54,11 @@ all: buildinf.h lib subdirs shared
54 54
55buildinf.h: ../Makefile.ssl 55buildinf.h: ../Makefile.ssl
56 ( echo "#ifndef MK1MF_BUILD"; \ 56 ( echo "#ifndef MK1MF_BUILD"; \
57 echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \ 57 echo ' /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */'; \
58 echo " #define CFLAGS \"$(CC) $(CFLAG)\""; \ 58 echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \
59 echo " #define PLATFORM \"$(PLATFORM)\""; \ 59 echo ' #define PLATFORM "$(PLATFORM)"'; \
60 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ 60 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
61 echo "#endif" ) >buildinf.h 61 echo '#endif' ) >buildinf.h
62 62
63testapps: 63testapps:
64 if echo ${SDIRS} | fgrep ' des '; \ 64 if echo ${SDIRS} | fgrep ' des '; \
diff --git a/src/lib/libcrypto/aes/aes_cfb.c b/src/lib/libcrypto/aes/aes_cfb.c
index 9b2917298a..41c2a5ec3d 100644
--- a/src/lib/libcrypto/aes/aes_cfb.c
+++ b/src/lib/libcrypto/aes/aes_cfb.c
@@ -137,7 +137,7 @@ void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
137 } else { 137 } else {
138 while (l--) { 138 while (l--) {
139 if (n == 0) { 139 if (n == 0) {
140 AES_decrypt(ivec, ivec, key); 140 AES_encrypt(ivec, ivec, key);
141 } 141 }
142 c = *(in); 142 c = *(in);
143 *(out++) = *(in++) ^ ivec[n]; 143 *(out++) = *(in++) ^ ivec[n];
diff --git a/src/lib/libcrypto/aes/aes_ctr.c b/src/lib/libcrypto/aes/aes_ctr.c
index 8e800481de..aea3db2092 100644
--- a/src/lib/libcrypto/aes/aes_ctr.c
+++ b/src/lib/libcrypto/aes/aes_ctr.c
@@ -106,8 +106,8 @@ void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
106 106
107 while (l--) { 107 while (l--) {
108 if (n == 0) { 108 if (n == 0) {
109 AES_ctr128_inc(counter);
110 AES_encrypt(counter, tmp, key); 109 AES_encrypt(counter, tmp, key);
110 AES_ctr128_inc(counter);
111 } 111 }
112 *(out++) = *(in++) ^ tmp[n]; 112 *(out++) = *(in++) ^ tmp[n];
113 n = (n+1) % AES_BLOCK_SIZE; 113 n = (n+1) % AES_BLOCK_SIZE;
diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index c36817c1ee..ed0bdfbde1 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.c
@@ -71,8 +71,6 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
71 if (a == NULL) return(0); 71 if (a == NULL) return(0);
72 72
73 len=a->length; 73 len=a->length;
74 ret=1+len;
75 if (pp == NULL) return(ret);
76 74
77 if (len > 0) 75 if (len > 0)
78 { 76 {
@@ -100,6 +98,10 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
100 } 98 }
101 else 99 else
102 bits=0; 100 bits=0;
101
102 ret=1+len;
103 if (pp == NULL) return(ret);
104
103 p= *pp; 105 p= *pp;
104 106
105 *(p++)=(unsigned char)bits; 107 *(p++)=(unsigned char)bits;
diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c
index 8a315fa371..ad8f0ffd1a 100644
--- a/src/lib/libcrypto/asn1/a_enum.c
+++ b/src/lib/libcrypto/asn1/a_enum.c
@@ -151,7 +151,17 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
151 else ret->type=V_ASN1_ENUMERATED; 151 else ret->type=V_ASN1_ENUMERATED;
152 j=BN_num_bits(bn); 152 j=BN_num_bits(bn);
153 len=((j == 0)?0:((j/8)+1)); 153 len=((j == 0)?0:((j/8)+1));
154 ret->data=(unsigned char *)OPENSSL_malloc(len+4); 154 if (ret->length < len+4)
155 {
156 unsigned char *new_data=OPENSSL_realloc(ret->data, len+4);
157 if (!new_data)
158 {
159 ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_MALLOC_FAILURE);
160 goto err;
161 }
162 ret->data=new_data;
163 }
164
155 ret->length=BN_bn2bin(bn,ret->data); 165 ret->length=BN_bn2bin(bn,ret->data);
156 return(ret); 166 return(ret);
157err: 167err:
diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
index 496704b9a5..edb243c021 100644
--- a/src/lib/libcrypto/asn1/a_int.c
+++ b/src/lib/libcrypto/asn1/a_int.c
@@ -397,7 +397,16 @@ ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai)
397 else ret->type=V_ASN1_INTEGER; 397 else ret->type=V_ASN1_INTEGER;
398 j=BN_num_bits(bn); 398 j=BN_num_bits(bn);
399 len=((j == 0)?0:((j/8)+1)); 399 len=((j == 0)?0:((j/8)+1));
400 ret->data=(unsigned char *)OPENSSL_malloc(len+4); 400 if (ret->length < len+4)
401 {
402 unsigned char *new_data=OPENSSL_realloc(ret->data, len+4);
403 if (!new_data)
404 {
405 ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_MALLOC_FAILURE);
406 goto err;
407 }
408 ret->data=new_data;
409 }
401 ret->length=BN_bn2bin(bn,ret->data); 410 ret->length=BN_bn2bin(bn,ret->data);
402 /* Correct zero case */ 411 /* Correct zero case */
403 if(!ret->length) 412 if(!ret->length)
diff --git a/src/lib/libcrypto/asn1/a_set.c b/src/lib/libcrypto/asn1/a_set.c
index 19bb60fca8..0f839822ff 100644
--- a/src/lib/libcrypto/asn1/a_set.c
+++ b/src/lib/libcrypto/asn1/a_set.c
@@ -118,7 +118,7 @@ int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(), int ex_tag,
118 } 118 }
119 119
120 pStart = p; /* Catch the beg of Setblobs*/ 120 pStart = p; /* Catch the beg of Setblobs*/
121 rgSetBlob = (MYBLOB *)OPENSSL_malloc( sk_num(a) * sizeof(MYBLOB)); /* In this array 121 if (!(rgSetBlob = (MYBLOB *)OPENSSL_malloc( sk_num(a) * sizeof(MYBLOB)))) return 0; /* In this array
122we will store the SET blobs */ 122we will store the SET blobs */
123 123
124 for (i=0; i<sk_num(a); i++) 124 for (i=0; i<sk_num(a); i++)
@@ -135,7 +135,7 @@ SetBlob
135 /* Now we have to sort the blobs. I am using a simple algo. 135 /* Now we have to sort the blobs. I am using a simple algo.
136 *Sort ptrs *Copy to temp-mem *Copy from temp-mem to user-mem*/ 136 *Sort ptrs *Copy to temp-mem *Copy from temp-mem to user-mem*/
137 qsort( rgSetBlob, sk_num(a), sizeof(MYBLOB), SetBlobCmp); 137 qsort( rgSetBlob, sk_num(a), sizeof(MYBLOB), SetBlobCmp);
138 pTempMem = OPENSSL_malloc(totSize); 138 if (!(pTempMem = OPENSSL_malloc(totSize))) return 0;
139 139
140/* Copy to temp mem */ 140/* Copy to temp mem */
141 p = pTempMem; 141 p = pTempMem;
diff --git a/src/lib/libcrypto/asn1/a_utctm.c b/src/lib/libcrypto/asn1/a_utctm.c
index ed2d827db2..dbb4a42c9d 100644
--- a/src/lib/libcrypto/asn1/a_utctm.c
+++ b/src/lib/libcrypto/asn1/a_utctm.c
@@ -222,6 +222,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
222int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t) 222int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
223 { 223 {
224 struct tm *tm; 224 struct tm *tm;
225 struct tm data;
225 int offset; 226 int offset;
226 int year; 227 int year;
227 228
@@ -238,7 +239,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
238 239
239 t -= offset*60; /* FIXME: may overflow in extreme cases */ 240 t -= offset*60; /* FIXME: may overflow in extreme cases */
240 241
241 { struct tm data; tm = OPENSSL_gmtime(&t, &data); } 242 tm = OPENSSL_gmtime(&t, &data);
242 243
243#define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1 244#define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1
244 year = g2(s->data); 245 year = g2(s->data);
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c
index 55630294b6..d958540120 100644
--- a/src/lib/libcrypto/asn1/x_pubkey.c
+++ b/src/lib/libcrypto/asn1/x_pubkey.c
@@ -84,7 +84,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
84 X509_PUBKEY *pk; 84 X509_PUBKEY *pk;
85 X509_ALGOR *a; 85 X509_ALGOR *a;
86 ASN1_OBJECT *o; 86 ASN1_OBJECT *o;
87 unsigned char *s,*p; 87 unsigned char *s,*p = NULL;
88 int i; 88 int i;
89 89
90 if (x == NULL) return(0); 90 if (x == NULL) return(0);
@@ -119,7 +119,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
119 dsa->write_params=0; 119 dsa->write_params=0;
120 ASN1_TYPE_free(a->parameter); 120 ASN1_TYPE_free(a->parameter);
121 i=i2d_DSAparams(dsa,NULL); 121 i=i2d_DSAparams(dsa,NULL);
122 p=(unsigned char *)OPENSSL_malloc(i); 122 if ((p=(unsigned char *)OPENSSL_malloc(i)) == NULL) goto err;
123 pp=p; 123 pp=p;
124 i2d_DSAparams(dsa,&pp); 124 i2d_DSAparams(dsa,&pp);
125 a->parameter=ASN1_TYPE_new(); 125 a->parameter=ASN1_TYPE_new();
@@ -136,7 +136,11 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
136 } 136 }
137 137
138 if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err; 138 if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err;
139 if ((s=(unsigned char *)OPENSSL_malloc(i+1)) == NULL) goto err; 139 if ((s=(unsigned char *)OPENSSL_malloc(i+1)) == NULL)
140 {
141 X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE);
142 goto err;
143 }
140 p=s; 144 p=s;
141 i2d_PublicKey(pkey,&p); 145 i2d_PublicKey(pkey,&p);
142 if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err; 146 if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err;
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c
index c193e9debf..1ce2bfacc0 100644
--- a/src/lib/libcrypto/bio/bf_nbio.c
+++ b/src/lib/libcrypto/bio/bf_nbio.c
@@ -103,7 +103,7 @@ static int nbiof_new(BIO *bi)
103 { 103 {
104 NBIO_TEST *nt; 104 NBIO_TEST *nt;
105 105
106 nt=(NBIO_TEST *)OPENSSL_malloc(sizeof(NBIO_TEST)); 106 if (!(nt=(NBIO_TEST *)OPENSSL_malloc(sizeof(NBIO_TEST)))) return(0);
107 nt->lrn= -1; 107 nt->lrn= -1;
108 nt->lwn= -1; 108 nt->lwn= -1;
109 bi->ptr=(char *)nt; 109 bi->ptr=(char *)nt;
diff --git a/src/lib/libcrypto/bn/bn_div.c b/src/lib/libcrypto/bn/bn_div.c
index ac1a09615a..f9a095e3b3 100644
--- a/src/lib/libcrypto/bn/bn_div.c
+++ b/src/lib/libcrypto/bn/bn_div.c
@@ -200,10 +200,10 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
200 200
201 /* First we normalise the numbers */ 201 /* First we normalise the numbers */
202 norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2); 202 norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2);
203 BN_lshift(sdiv,divisor,norm_shift); 203 if (!(BN_lshift(sdiv,divisor,norm_shift))) goto err;
204 sdiv->neg=0; 204 sdiv->neg=0;
205 norm_shift+=BN_BITS2; 205 norm_shift+=BN_BITS2;
206 BN_lshift(snum,num,norm_shift); 206 if (!(BN_lshift(snum,num,norm_shift))) goto err;
207 snum->neg=0; 207 snum->neg=0;
208 div_n=sdiv->top; 208 div_n=sdiv->top;
209 num_n=snum->top; 209 num_n=snum->top;
@@ -327,7 +327,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
327 tmp->top=j; 327 tmp->top=j;
328 328
329 j=wnum.top; 329 j=wnum.top;
330 BN_sub(&wnum,&wnum,tmp); 330 if (!BN_sub(&wnum,&wnum,tmp)) goto err;
331 331
332 snum->top=snum->top+wnum.top-j; 332 snum->top=snum->top+wnum.top-j;
333 333
@@ -335,7 +335,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
335 { 335 {
336 q--; 336 q--;
337 j=wnum.top; 337 j=wnum.top;
338 BN_add(&wnum,&wnum,sdiv); 338 if (!BN_add(&wnum,&wnum,sdiv)) goto err;
339 snum->top+=wnum.top-j; 339 snum->top+=wnum.top-j;
340 } 340 }
341 *(resp--)=q; 341 *(resp--)=q;
diff --git a/src/lib/libcrypto/bn/bn_mont.c b/src/lib/libcrypto/bn/bn_mont.c
index 82942a4759..c9ebdbaabe 100644
--- a/src/lib/libcrypto/bn/bn_mont.c
+++ b/src/lib/libcrypto/bn/bn_mont.c
@@ -221,7 +221,7 @@ int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
221 221
222 if (!BN_mul(t1,t2,&mont->N,ctx)) goto err; 222 if (!BN_mul(t1,t2,&mont->N,ctx)) goto err;
223 if (!BN_add(t2,a,t1)) goto err; 223 if (!BN_add(t2,a,t1)) goto err;
224 BN_rshift(ret,t2,mont->ri); 224 if (!BN_rshift(ret,t2,mont->ri)) goto err;
225#endif /* MONT_WORD */ 225#endif /* MONT_WORD */
226 226
227 if (BN_ucmp(ret, &(mont->N)) >= 0) 227 if (BN_ucmp(ret, &(mont->N)) >= 0)
@@ -282,8 +282,8 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
282 BN_ULONG buf[2]; 282 BN_ULONG buf[2];
283 283
284 mont->ri=(BN_num_bits(mod)+(BN_BITS2-1))/BN_BITS2*BN_BITS2; 284 mont->ri=(BN_num_bits(mod)+(BN_BITS2-1))/BN_BITS2*BN_BITS2;
285 BN_zero(R); 285 if (!(BN_zero(R))) goto err;
286 BN_set_bit(R,BN_BITS2); /* R */ 286 if (!(BN_set_bit(R,BN_BITS2))) goto err; /* R */
287 287
288 buf[0]=mod->d[0]; /* tmod = N mod word size */ 288 buf[0]=mod->d[0]; /* tmod = N mod word size */
289 buf[1]=0; 289 buf[1]=0;
diff --git a/src/lib/libcrypto/bn/bn_mul.c b/src/lib/libcrypto/bn/bn_mul.c
index 7bffc9c16a..fd598b8b3d 100644
--- a/src/lib/libcrypto/bn/bn_mul.c
+++ b/src/lib/libcrypto/bn/bn_mul.c
@@ -964,7 +964,7 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
964 964
965 if ((al == 0) || (bl == 0)) 965 if ((al == 0) || (bl == 0))
966 { 966 {
967 BN_zero(r); 967 if (!BN_zero(r)) goto err;
968 return(1); 968 return(1);
969 } 969 }
970 top=al+bl; 970 top=al+bl;
@@ -1044,7 +1044,7 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
1044 if (i == 1 && !BN_get_flags(b,BN_FLG_STATIC_DATA)) 1044 if (i == 1 && !BN_get_flags(b,BN_FLG_STATIC_DATA))
1045 { 1045 {
1046 BIGNUM *tmp_bn = (BIGNUM *)b; 1046 BIGNUM *tmp_bn = (BIGNUM *)b;
1047 bn_wexpand(tmp_bn,al); 1047 if (bn_wexpand(tmp_bn,al) == NULL) goto err;
1048 tmp_bn->d[bl]=0; 1048 tmp_bn->d[bl]=0;
1049 bl++; 1049 bl++;
1050 i--; 1050 i--;
@@ -1052,7 +1052,7 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
1052 else if (i == -1 && !BN_get_flags(a,BN_FLG_STATIC_DATA)) 1052 else if (i == -1 && !BN_get_flags(a,BN_FLG_STATIC_DATA))
1053 { 1053 {
1054 BIGNUM *tmp_bn = (BIGNUM *)a; 1054 BIGNUM *tmp_bn = (BIGNUM *)a;
1055 bn_wexpand(tmp_bn,bl); 1055 if (bn_wexpand(tmp_bn,bl) == NULL) goto err;
1056 tmp_bn->d[al]=0; 1056 tmp_bn->d[al]=0;
1057 al++; 1057 al++;
1058 i++; 1058 i++;
@@ -1067,14 +1067,14 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
1067 t = BN_CTX_get(ctx); 1067 t = BN_CTX_get(ctx);
1068 if (al == j) /* exact multiple */ 1068 if (al == j) /* exact multiple */
1069 { 1069 {
1070 bn_wexpand(t,k*2); 1070 if (bn_wexpand(t,k*2) == NULL) goto err;
1071 bn_wexpand(rr,k*2); 1071 if (bn_wexpand(rr,k*2) == NULL) goto err;
1072 bn_mul_recursive(rr->d,a->d,b->d,al,t->d); 1072 bn_mul_recursive(rr->d,a->d,b->d,al,t->d);
1073 } 1073 }
1074 else 1074 else
1075 { 1075 {
1076 bn_wexpand(t,k*4); 1076 if (bn_wexpand(t,k*4) == NULL) goto err;
1077 bn_wexpand(rr,k*4); 1077 if (bn_wexpand(rr,k*4) == NULL) goto err;
1078 bn_mul_part_recursive(rr->d,a->d,b->d,al-j,j,t->d); 1078 bn_mul_part_recursive(rr->d,a->d,b->d,al-j,j,t->d);
1079 } 1079 }
1080 rr->top=top; 1080 rr->top=top;
diff --git a/src/lib/libcrypto/crypto-lib.com b/src/lib/libcrypto/crypto-lib.com
index ca0247be00..4847a69a71 100644
--- a/src/lib/libcrypto/crypto-lib.com
+++ b/src/lib/libcrypto/crypto-lib.com
@@ -49,6 +49,7 @@ $! P5, if defined, sets a TCP/IP library to use, through one of the following
49$! keywords: 49$! keywords:
50$! 50$!
51$! UCX for UCX 51$! UCX for UCX
52$! TCPIP for TCPIP (post UCX)
52$! SOCKETSHR for SOCKETSHR+NETLIB 53$! SOCKETSHR for SOCKETSHR+NETLIB
53$! 54$!
54$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up) 55$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
@@ -640,6 +641,7 @@ $ WRITE SYS$OUTPUT " ",APPLICATION,".exe"
640$! 641$!
641$! Link The Program, Check To See If We Need To Link With RSAREF Or Not. 642$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
642$! 643$!
644$ ON ERROR THEN GOTO NEXT_APPLICATION
643$ IF (RSAREF.EQS."TRUE") 645$ IF (RSAREF.EQS."TRUE")
644$ THEN 646$ THEN
645$! 647$!
@@ -1358,7 +1360,8 @@ $ WRITE SYS$OUTPUT "Main MACRO Compiling Command: ",MACRO
1358$! 1360$!
1359$! Time to check the contents, and to make sure we get the correct library. 1361$! Time to check the contents, and to make sure we get the correct library.
1360$! 1362$!
1361$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" 1363$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
1364 .OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
1362$ THEN 1365$ THEN
1363$! 1366$!
1364$! Check to see if SOCKETSHR was chosen 1367$! Check to see if SOCKETSHR was chosen
@@ -1368,7 +1371,7 @@ $ THEN
1368$! 1371$!
1369$! Set the library to use SOCKETSHR 1372$! Set the library to use SOCKETSHR
1370$! 1373$!
1371$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT" 1374$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
1372$! 1375$!
1373$! Done with SOCKETSHR 1376$! Done with SOCKETSHR
1374$! 1377$!
@@ -1394,19 +1397,45 @@ $ THEN
1394$! 1397$!
1395$! Set the library to use UCX. 1398$! Set the library to use UCX.
1396$! 1399$!
1397$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT" 1400$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
1398$ IF F$TRNLNM("UCX$IPC_SHR") .NES. "" 1401$ IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
1399$ THEN 1402$ THEN
1400$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT" 1403$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
1401$ ELSE 1404$ ELSE
1402$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN - 1405$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
1403 TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT" 1406 TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
1404$ ENDIF 1407$ ENDIF
1405$! 1408$!
1406$! Done with UCX 1409$! Done with UCX
1407$! 1410$!
1408$ ENDIF 1411$ ENDIF
1409$! 1412$!
1413$! Check to see if TCPIP was chosen
1414$!
1415$ IF P5.EQS."TCPIP"
1416$ THEN
1417$!
1418$! Set the library to use TCPIP (post UCX).
1419$!
1420$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
1421$!
1422$! Done with TCPIP
1423$!
1424$ ENDIF
1425$!
1426$! Check to see if NONE was chosen
1427$!
1428$ IF P5.EQS."NONE"
1429$ THEN
1430$!
1431$! Do not use a TCPIP library.
1432$!
1433$ TCPIP_LIB = ""
1434$!
1435$! Done with TCPIP
1436$!
1437$ ENDIF
1438$!
1410$! Print info 1439$! Print info
1411$! 1440$!
1412$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB 1441$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -1422,6 +1451,7 @@ $ WRITE SYS$OUTPUT "The Option ",P5," Is Invalid. The Valid Options Are:"
1422$ WRITE SYS$OUTPUT "" 1451$ WRITE SYS$OUTPUT ""
1423$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 1452$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
1424$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 1453$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1454$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
1425$ WRITE SYS$OUTPUT "" 1455$ WRITE SYS$OUTPUT ""
1426$! 1456$!
1427$! Time To EXIT. 1457$! Time To EXIT.
diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c
index 1a19164d3b..906b4703de 100644
--- a/src/lib/libcrypto/dso/dso_dlfcn.c
+++ b/src/lib/libcrypto/dso/dso_dlfcn.c
@@ -114,7 +114,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
114 * as we don't have autoconf yet, I'm implementing a hack that could 114 * as we don't have autoconf yet, I'm implementing a hack that could
115 * be hacked further relatively easily to deal with cases as we find 115 * be hacked further relatively easily to deal with cases as we find
116 * them. Initially this is to cope with OpenBSD. */ 116 * them. Initially this is to cope with OpenBSD. */
117#ifdef __OpenBSD__ 117#if defined(__OpenBSD__) || defined(__NetBSD__)
118# ifdef DL_LAZY 118# ifdef DL_LAZY
119# define DLOPEN_FLAG DL_LAZY 119# define DLOPEN_FLAG DL_LAZY
120# else 120# else
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index e0d78d67fb..0cf485de60 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -106,6 +106,8 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
106 106
107void EC_GROUP_free(EC_GROUP *group) 107void EC_GROUP_free(EC_GROUP *group)
108 { 108 {
109 if (!group) return;
110
109 if (group->meth->group_finish != 0) 111 if (group->meth->group_finish != 0)
110 group->meth->group_finish(group); 112 group->meth->group_finish(group);
111 113
@@ -117,6 +119,8 @@ void EC_GROUP_free(EC_GROUP *group)
117 119
118void EC_GROUP_clear_free(EC_GROUP *group) 120void EC_GROUP_clear_free(EC_GROUP *group)
119 { 121 {
122 if (!group) return;
123
120 if (group->meth->group_clear_finish != 0) 124 if (group->meth->group_clear_finish != 0)
121 group->meth->group_clear_finish(group); 125 group->meth->group_clear_finish(group);
122 else if (group->meth != NULL && group->meth->group_finish != 0) 126 else if (group->meth != NULL && group->meth->group_finish != 0)
@@ -337,6 +341,8 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group)
337 341
338void EC_POINT_free(EC_POINT *point) 342void EC_POINT_free(EC_POINT *point)
339 { 343 {
344 if (!point) return;
345
340 if (point->meth->point_finish != 0) 346 if (point->meth->point_finish != 0)
341 point->meth->point_finish(point); 347 point->meth->point_finish(point);
342 OPENSSL_free(point); 348 OPENSSL_free(point);
@@ -345,6 +351,8 @@ void EC_POINT_free(EC_POINT *point)
345 351
346void EC_POINT_clear_free(EC_POINT *point) 352void EC_POINT_clear_free(EC_POINT *point)
347 { 353 {
354 if (!point) return;
355
348 if (point->meth->point_clear_finish != 0) 356 if (point->meth->point_clear_finish != 0)
349 point->meth->point_clear_finish(point); 357 point->meth->point_clear_finish(point);
350 else if (point->meth != NULL && point->meth->point_finish != 0) 358 else if (point->meth != NULL && point->meth->point_finish != 0)
diff --git a/src/lib/libcrypto/engine/Makefile.ssl b/src/lib/libcrypto/engine/Makefile.ssl
index 5172028f93..8ee3b7d2dd 100644
--- a/src/lib/libcrypto/engine/Makefile.ssl
+++ b/src/lib/libcrypto/engine/Makefile.ssl
@@ -74,7 +74,7 @@ tags:
74 74
75errors: 75errors:
76 $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \ 76 $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \
77 -nostatic -staticloader -write hw_*.c; \ 77 -nostatic -staticloader -write hw_*.c
78 78
79tests: 79tests:
80 80
diff --git a/src/lib/libcrypto/engine/hw_4758_cca.c b/src/lib/libcrypto/engine/hw_4758_cca.c
index 959d8f1a61..77d3d2ffdf 100644
--- a/src/lib/libcrypto/engine/hw_4758_cca.c
+++ b/src/lib/libcrypto/engine/hw_4758_cca.c
@@ -287,13 +287,13 @@ err:
287 DSO_free(dso); 287 DSO_free(dso);
288 dso = NULL; 288 dso = NULL;
289 289
290 keyRecordRead = (F_KEYRECORDREAD)NULL; 290 keyRecordRead = (F_KEYRECORDREAD)0;
291 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL; 291 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
292 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL; 292 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
293 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL; 293 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
294 publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL; 294 publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
295 pkaEncrypt = (F_PKAENCRYPT)NULL; 295 pkaEncrypt = (F_PKAENCRYPT)0;
296 pkaDecrypt = (F_PKADECRYPT)NULL; 296 pkaDecrypt = (F_PKADECRYPT)0;
297 return 0; 297 return 0;
298 } 298 }
299 299
@@ -312,13 +312,13 @@ static int ibm_4758_cca_finish(ENGINE *e)
312 return 0; 312 return 0;
313 } 313 }
314 dso = NULL; 314 dso = NULL;
315 keyRecordRead = (F_KEYRECORDREAD)NULL; 315 keyRecordRead = (F_KEYRECORDREAD)0;
316 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL; 316 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
317 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL; 317 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
318 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL; 318 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
319 publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL; 319 publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
320 pkaEncrypt = (F_PKAENCRYPT)NULL; 320 pkaEncrypt = (F_PKAENCRYPT)0;
321 pkaDecrypt = (F_PKADECRYPT)NULL; 321 pkaDecrypt = (F_PKADECRYPT)0;
322 return 1; 322 return 1;
323 } 323 }
324 324
diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c
index 05f4249458..64fb2353af 100644
--- a/src/lib/libcrypto/evp/bio_enc.c
+++ b/src/lib/libcrypto/evp/bio_enc.c
@@ -110,8 +110,8 @@ static int enc_new(BIO *bi)
110 BIO_ENC_CTX *ctx; 110 BIO_ENC_CTX *ctx;
111 111
112 ctx=(BIO_ENC_CTX *)OPENSSL_malloc(sizeof(BIO_ENC_CTX)); 112 ctx=(BIO_ENC_CTX *)OPENSSL_malloc(sizeof(BIO_ENC_CTX));
113 EVP_CIPHER_CTX_init(&ctx->cipher);
114 if (ctx == NULL) return(0); 113 if (ctx == NULL) return(0);
114 EVP_CIPHER_CTX_init(&ctx->cipher);
115 115
116 ctx->buf_len=0; 116 ctx->buf_len=0;
117 ctx->buf_off=0; 117 ctx->buf_off=0;
diff --git a/src/lib/libcrypto/evp/c_allc.c b/src/lib/libcrypto/evp/c_allc.c
index 37e6ab83a5..341a958fd4 100644
--- a/src/lib/libcrypto/evp/c_allc.c
+++ b/src/lib/libcrypto/evp/c_allc.c
@@ -149,14 +149,29 @@ void OpenSSL_add_all_ciphers(void)
149#ifndef OPENSSL_NO_AES 149#ifndef OPENSSL_NO_AES
150 EVP_add_cipher(EVP_aes_128_ecb()); 150 EVP_add_cipher(EVP_aes_128_ecb());
151 EVP_add_cipher(EVP_aes_128_cbc()); 151 EVP_add_cipher(EVP_aes_128_cbc());
152 EVP_add_cipher(EVP_aes_128_cfb());
153 EVP_add_cipher(EVP_aes_128_ofb());
154#if 0
155 EVP_add_cipher(EVP_aes_128_ctr());
156#endif
152 EVP_add_cipher_alias(SN_aes_128_cbc,"AES128"); 157 EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
153 EVP_add_cipher_alias(SN_aes_128_cbc,"aes128"); 158 EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
154 EVP_add_cipher(EVP_aes_192_ecb()); 159 EVP_add_cipher(EVP_aes_192_ecb());
155 EVP_add_cipher(EVP_aes_192_cbc()); 160 EVP_add_cipher(EVP_aes_192_cbc());
161 EVP_add_cipher(EVP_aes_192_cfb());
162 EVP_add_cipher(EVP_aes_192_ofb());
163#if 0
164 EVP_add_cipher(EVP_aes_192_ctr());
165#endif
156 EVP_add_cipher_alias(SN_aes_192_cbc,"AES192"); 166 EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
157 EVP_add_cipher_alias(SN_aes_192_cbc,"aes192"); 167 EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
158 EVP_add_cipher(EVP_aes_256_ecb()); 168 EVP_add_cipher(EVP_aes_256_ecb());
159 EVP_add_cipher(EVP_aes_256_cbc()); 169 EVP_add_cipher(EVP_aes_256_cbc());
170 EVP_add_cipher(EVP_aes_256_cfb());
171 EVP_add_cipher(EVP_aes_256_ofb());
172#if 0
173 EVP_add_cipher(EVP_aes_256_ctr());
174#endif
160 EVP_add_cipher_alias(SN_aes_256_cbc,"AES256"); 175 EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
161 EVP_add_cipher_alias(SN_aes_256_cbc,"aes256"); 176 EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
162#endif 177#endif
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 9d03a9602f..c323fa2892 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -88,7 +88,9 @@ IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY,
88static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 88static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
89 const unsigned char *iv, int enc) { 89 const unsigned char *iv, int enc) {
90 90
91 if (enc) 91 if ((ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_CFB_MODE
92 || (ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_OFB_MODE
93 || enc)
92 AES_set_encrypt_key(key, ctx->key_len * 8, ctx->cipher_data); 94 AES_set_encrypt_key(key, ctx->key_len * 8, ctx->cipher_data);
93 else 95 else
94 AES_set_decrypt_key(key, ctx->key_len * 8, ctx->cipher_data); 96 AES_set_decrypt_key(key, ctx->key_len * 8, ctx->cipher_data);
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 0d870d60be..fb16de6852 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -641,10 +641,25 @@ const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
641#ifndef OPENSSL_NO_AES 641#ifndef OPENSSL_NO_AES
642const EVP_CIPHER *EVP_aes_128_ecb(void); 642const EVP_CIPHER *EVP_aes_128_ecb(void);
643const EVP_CIPHER *EVP_aes_128_cbc(void); 643const EVP_CIPHER *EVP_aes_128_cbc(void);
644const EVP_CIPHER *EVP_aes_128_cfb(void);
645const EVP_CIPHER *EVP_aes_128_ofb(void);
646#if 0
647const EVP_CIPHER *EVP_aes_128_ctr(void);
648#endif
644const EVP_CIPHER *EVP_aes_192_ecb(void); 649const EVP_CIPHER *EVP_aes_192_ecb(void);
645const EVP_CIPHER *EVP_aes_192_cbc(void); 650const EVP_CIPHER *EVP_aes_192_cbc(void);
651const EVP_CIPHER *EVP_aes_192_cfb(void);
652const EVP_CIPHER *EVP_aes_192_ofb(void);
653#if 0
654const EVP_CIPHER *EVP_aes_192_ctr(void);
655#endif
646const EVP_CIPHER *EVP_aes_256_ecb(void); 656const EVP_CIPHER *EVP_aes_256_ecb(void);
647const EVP_CIPHER *EVP_aes_256_cbc(void); 657const EVP_CIPHER *EVP_aes_256_cbc(void);
658const EVP_CIPHER *EVP_aes_256_cfb(void);
659const EVP_CIPHER *EVP_aes_256_ofb(void);
660#if 0
661const EVP_CIPHER *EVP_aes_256_ctr(void);
662#endif
648#endif 663#endif
649 664
650void OPENSSL_add_all_algorithms_noconf(void); 665void OPENSSL_add_all_algorithms_noconf(void);
diff --git a/src/lib/libcrypto/evp/evp_test.c b/src/lib/libcrypto/evp/evp_test.c
index decd0713d6..90294ef686 100644
--- a/src/lib/libcrypto/evp/evp_test.c
+++ b/src/lib/libcrypto/evp/evp_test.c
@@ -118,18 +118,20 @@ static char *sstrsep(char **string, const char *delim)
118 } 118 }
119 119
120static unsigned char *ustrsep(char **p,const char *sep) 120static unsigned char *ustrsep(char **p,const char *sep)
121 { return (unsigned char *)sstrsep((char **)p,sep); } 121 { return (unsigned char *)sstrsep(p,sep); }
122 122
123static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn, 123static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
124 const unsigned char *iv,int in, 124 const unsigned char *iv,int in,
125 const unsigned char *plaintext,int pn, 125 const unsigned char *plaintext,int pn,
126 const unsigned char *ciphertext,int cn) 126 const unsigned char *ciphertext,int cn,
127 int encdec)
127 { 128 {
128 EVP_CIPHER_CTX ctx; 129 EVP_CIPHER_CTX ctx;
129 unsigned char out[4096]; 130 unsigned char out[4096];
130 int outl,outl2; 131 int outl,outl2;
131 132
132 printf("Testing cipher %s\n",EVP_CIPHER_name(c)); 133 printf("Testing cipher %s%s\n",EVP_CIPHER_name(c),
134 (encdec == 1 ? "(encrypt)" : (encdec == 0 ? "(decrypt)" : "(encrypt/decrypt)")));
133 hexdump(stdout,"Key",key,kn); 135 hexdump(stdout,"Key",key,kn);
134 if(in) 136 if(in)
135 hexdump(stdout,"IV",iv,in); 137 hexdump(stdout,"IV",iv,in);
@@ -143,70 +145,76 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
143 exit(5); 145 exit(5);
144 } 146 }
145 EVP_CIPHER_CTX_init(&ctx); 147 EVP_CIPHER_CTX_init(&ctx);
146 if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv)) 148 if (encdec != 0)
147 { 149 {
148 fprintf(stderr,"EncryptInit failed\n"); 150 if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
149 exit(10); 151 {
150 } 152 fprintf(stderr,"EncryptInit failed\n");
151 EVP_CIPHER_CTX_set_padding(&ctx,0); 153 exit(10);
154 }
155 EVP_CIPHER_CTX_set_padding(&ctx,0);
152 156
153 if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn)) 157 if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
154 { 158 {
155 fprintf(stderr,"Encrypt failed\n"); 159 fprintf(stderr,"Encrypt failed\n");
156 exit(6); 160 exit(6);
157 } 161 }
158 if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2)) 162 if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2))
159 { 163 {
160 fprintf(stderr,"EncryptFinal failed\n"); 164 fprintf(stderr,"EncryptFinal failed\n");
161 exit(7); 165 exit(7);
162 } 166 }
163 167
164 if(outl+outl2 != cn) 168 if(outl+outl2 != cn)
165 { 169 {
166 fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n", 170 fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
167 outl+outl2,cn); 171 outl+outl2,cn);
168 exit(8); 172 exit(8);
169 } 173 }
170 174
171 if(memcmp(out,ciphertext,cn)) 175 if(memcmp(out,ciphertext,cn))
172 { 176 {
173 fprintf(stderr,"Ciphertext mismatch\n"); 177 fprintf(stderr,"Ciphertext mismatch\n");
174 hexdump(stderr,"Got",out,cn); 178 hexdump(stderr,"Got",out,cn);
175 hexdump(stderr,"Expected",ciphertext,cn); 179 hexdump(stderr,"Expected",ciphertext,cn);
176 exit(9); 180 exit(9);
181 }
177 } 182 }
178 183
179 if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv)) 184 if (encdec <= 0)
180 { 185 {
181 fprintf(stderr,"DecryptInit failed\n"); 186 if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
182 exit(11); 187 {
183 } 188 fprintf(stderr,"DecryptInit failed\n");
184 EVP_CIPHER_CTX_set_padding(&ctx,0); 189 exit(11);
190 }
191 EVP_CIPHER_CTX_set_padding(&ctx,0);
185 192
186 if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,pn)) 193 if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn))
187 { 194 {
188 fprintf(stderr,"Decrypt failed\n"); 195 fprintf(stderr,"Decrypt failed\n");
189 exit(6); 196 exit(6);
190 } 197 }
191 if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2)) 198 if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
192 { 199 {
193 fprintf(stderr,"DecryptFinal failed\n"); 200 fprintf(stderr,"DecryptFinal failed\n");
194 exit(7); 201 exit(7);
195 } 202 }
196 203
197 if(outl+outl2 != cn) 204 if(outl+outl2 != cn)
198 { 205 {
199 fprintf(stderr,"Plaintext length mismatch got %d expected %d\n", 206 fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
200 outl+outl2,cn); 207 outl+outl2,cn);
201 exit(8); 208 exit(8);
202 } 209 }
203 210
204 if(memcmp(out,plaintext,cn)) 211 if(memcmp(out,plaintext,cn))
205 { 212 {
206 fprintf(stderr,"Plaintext mismatch\n"); 213 fprintf(stderr,"Plaintext mismatch\n");
207 hexdump(stderr,"Got",out,cn); 214 hexdump(stderr,"Got",out,cn);
208 hexdump(stderr,"Expected",plaintext,cn); 215 hexdump(stderr,"Expected",plaintext,cn);
209 exit(9); 216 exit(9);
217 }
210 } 218 }
211 219
212 EVP_CIPHER_CTX_cleanup(&ctx); 220 EVP_CIPHER_CTX_cleanup(&ctx);
@@ -217,7 +225,8 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
217static int test_cipher(const char *cipher,const unsigned char *key,int kn, 225static int test_cipher(const char *cipher,const unsigned char *key,int kn,
218 const unsigned char *iv,int in, 226 const unsigned char *iv,int in,
219 const unsigned char *plaintext,int pn, 227 const unsigned char *plaintext,int pn,
220 const unsigned char *ciphertext,int cn) 228 const unsigned char *ciphertext,int cn,
229 int encdec)
221 { 230 {
222 const EVP_CIPHER *c; 231 const EVP_CIPHER *c;
223 232
@@ -225,7 +234,7 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
225 if(!c) 234 if(!c)
226 return 0; 235 return 0;
227 236
228 test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn); 237 test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec);
229 238
230 return 1; 239 return 1;
231 } 240 }
@@ -332,6 +341,7 @@ int main(int argc,char **argv)
332 char *p; 341 char *p;
333 char *cipher; 342 char *cipher;
334 unsigned char *iv,*key,*plaintext,*ciphertext; 343 unsigned char *iv,*key,*plaintext,*ciphertext;
344 int encdec;
335 int kn,in,pn,cn; 345 int kn,in,pn,cn;
336 346
337 if(!fgets((char *)line,sizeof line,f)) 347 if(!fgets((char *)line,sizeof line,f))
@@ -343,14 +353,21 @@ int main(int argc,char **argv)
343 key=ustrsep(&p,":"); 353 key=ustrsep(&p,":");
344 iv=ustrsep(&p,":"); 354 iv=ustrsep(&p,":");
345 plaintext=ustrsep(&p,":"); 355 plaintext=ustrsep(&p,":");
346 ciphertext=ustrsep(&p,"\n"); 356 ciphertext=ustrsep(&p,":");
357 if (p[-1] == '\n') {
358 p[-1] = '\0';
359 encdec = -1;
360 } else {
361 encdec = atoi(sstrsep(&p,"\n"));
362 }
363
347 364
348 kn=convert(key); 365 kn=convert(key);
349 in=convert(iv); 366 in=convert(iv);
350 pn=convert(plaintext); 367 pn=convert(plaintext);
351 cn=convert(ciphertext); 368 cn=convert(ciphertext);
352 369
353 if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn) 370 if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec)
354 && !test_digest(cipher,plaintext,pn,ciphertext,cn)) 371 && !test_digest(cipher,plaintext,pn,ciphertext,cn))
355 { 372 {
356 fprintf(stderr,"Can't find %s\n",cipher); 373 fprintf(stderr,"Can't find %s\n",cipher);
diff --git a/src/lib/libcrypto/evp/evptests.txt b/src/lib/libcrypto/evp/evptests.txt
index 6c1529db37..80bd9c7765 100644
--- a/src/lib/libcrypto/evp/evptests.txt
+++ b/src/lib/libcrypto/evp/evptests.txt
@@ -1,4 +1,4 @@
1#cipher:key:iv:input:output 1#cipher:key:iv:plaintext:ciphertext:0/1(decrypt/encrypt)
2#digest:::input:output 2#digest:::input:output
3 3
4# SHA(1) tests (from shatest.c) 4# SHA(1) tests (from shatest.c)
@@ -15,47 +15,148 @@ MD5:::31323334353637383930313233343536373839303132333435363738393031323334353637
15 15
16# AES 128 ECB tests (from FIPS-197 test vectors, encrypt) 16# AES 128 ECB tests (from FIPS-197 test vectors, encrypt)
17 17
18AES-128-ECB:000102030405060708090A0B0C0D0E0F::00112233445566778899AABBCCDDEEFF:69C4E0D86A7B0430D8CDB78070B4C55A 18AES-128-ECB:000102030405060708090A0B0C0D0E0F::00112233445566778899AABBCCDDEEFF:69C4E0D86A7B0430D8CDB78070B4C55A:1
19 19
20# AES 192 ECB tests (from FIPS-197 test vectors, encrypt) 20# AES 192 ECB tests (from FIPS-197 test vectors, encrypt)
21 21
22AES-192-ECB:000102030405060708090A0B0C0D0E0F1011121314151617::00112233445566778899AABBCCDDEEFF:DDA97CA4864CDFE06EAF70A0EC0D7191 22AES-192-ECB:000102030405060708090A0B0C0D0E0F1011121314151617::00112233445566778899AABBCCDDEEFF:DDA97CA4864CDFE06EAF70A0EC0D7191:1
23 23
24# AES 256 ECB tests (from FIPS-197 test vectors, encrypt) 24# AES 256 ECB tests (from FIPS-197 test vectors, encrypt)
25 25
26AES-256-ECB:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F::00112233445566778899AABBCCDDEEFF:8EA2B7CA516745BFEAFC49904B496089 26AES-256-ECB:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F::00112233445566778899AABBCCDDEEFF:8EA2B7CA516745BFEAFC49904B496089:1
27 27
28# AES 128 ECB tests (from NIST test vectors, encrypt) 28# AES 128 ECB tests (from NIST test vectors, encrypt)
29 29
30#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F 30#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F:1
31 31
32# AES 128 ECB tests (from NIST test vectors, decrypt) 32# AES 128 ECB tests (from NIST test vectors, decrypt)
33 33
34#AES-128-ECB:00000000000000000000000000000000::44416AC2D1F53C583303917E6BE9EBE0:00000000000000000000000000000000 34#AES-128-ECB:00000000000000000000000000000000::44416AC2D1F53C583303917E6BE9EBE0:00000000000000000000000000000000:0
35 35
36# AES 192 ECB tests (from NIST test vectors, decrypt) 36# AES 192 ECB tests (from NIST test vectors, decrypt)
37 37
38#AES-192-ECB:000000000000000000000000000000000000000000000000::48E31E9E256718F29229319C19F15BA4:00000000000000000000000000000000 38#AES-192-ECB:000000000000000000000000000000000000000000000000::48E31E9E256718F29229319C19F15BA4:00000000000000000000000000000000:0
39 39
40# AES 256 ECB tests (from NIST test vectors, decrypt) 40# AES 256 ECB tests (from NIST test vectors, decrypt)
41 41
42#AES-256-ECB:0000000000000000000000000000000000000000000000000000000000000000::058CCFFDBBCB382D1F6F56585D8A4ADE:00000000000000000000000000000000 42#AES-256-ECB:0000000000000000000000000000000000000000000000000000000000000000::058CCFFDBBCB382D1F6F56585D8A4ADE:00000000000000000000000000000000:0
43 43
44# AES 128 CBC tests (from NIST test vectors, encrypt) 44# AES 128 CBC tests (from NIST test vectors, encrypt)
45 45
46#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:8A05FC5E095AF4848A08D328D3688E3D 46#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:8A05FC5E095AF4848A08D328D3688E3D:1
47 47
48# AES 192 CBC tests (from NIST test vectors, encrypt) 48# AES 192 CBC tests (from NIST test vectors, encrypt)
49 49
50#AES-192-CBC:000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:7BD966D53AD8C1BB85D2ADFAE87BB104 50#AES-192-CBC:000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:7BD966D53AD8C1BB85D2ADFAE87BB104:1
51 51
52# AES 256 CBC tests (from NIST test vectors, encrypt) 52# AES 256 CBC tests (from NIST test vectors, encrypt)
53 53
54#AES-256-CBC:0000000000000000000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:FE3C53653E2F45B56FCD88B2CC898FF0 54#AES-256-CBC:0000000000000000000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:FE3C53653E2F45B56FCD88B2CC898FF0:1
55 55
56# AES 128 CBC tests (from NIST test vectors, decrypt) 56# AES 128 CBC tests (from NIST test vectors, decrypt)
57 57
58#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:FACA37E0B0C85373DF706E73F7C9AF86:00000000000000000000000000000000 58#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:FACA37E0B0C85373DF706E73F7C9AF86:00000000000000000000000000000000:0
59
60# AES tests from NIST document SP800-38A
61# For all ECB encrypts and decrypts, the transformed sequence is
62# AES-bits-ECB:key::plaintext:ciphertext:encdec
63# ECB-AES128.Encrypt and ECB-AES128.Decrypt
64AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::6BC1BEE22E409F96E93D7E117393172A:3AD77BB40D7A3660A89ECAF32466EF97
65AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::AE2D8A571E03AC9C9EB76FAC45AF8E51:F5D3D58503B9699DE785895A96FDBAAF
66AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::30C81C46A35CE411E5FBC1191A0A52EF:43B1CD7F598ECE23881B00E3ED030688
67AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::F69F2445DF4F9B17AD2B417BE66C3710:7B0C785E27E8AD3F8223207104725DD4
68# ECB-AES192.Encrypt and ECB-AES192.Decrypt
69AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::6BC1BEE22E409F96E93D7E117393172A:BD334F1D6E45F25FF712A214571FA5CC
70AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::AE2D8A571E03AC9C9EB76FAC45AF8E51:974104846D0AD3AD7734ECB3ECEE4EEF
71AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::30C81C46A35CE411E5FBC1191A0A52EF:EF7AFD2270E2E60ADCE0BA2FACE6444E
72AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::F69F2445DF4F9B17AD2B417BE66C3710:9A4B41BA738D6C72FB16691603C18E0E
73# ECB-AES256.Encrypt and ECB-AES256.Decrypt
74AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::6BC1BEE22E409F96E93D7E117393172A:F3EED1BDB5D2A03C064B5A7E3DB181F8
75AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::AE2D8A571E03AC9C9EB76FAC45AF8E51:591CCB10D410ED26DC5BA74A31362870
76AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::30C81C46A35CE411E5FBC1191A0A52EF:B6ED21B99CA6F4F9F153E7B1BEAFED1D
77AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::F69F2445DF4F9B17AD2B417BE66C3710:23304B7A39F9F3FF067D8D8F9E24ECC7
78# For all CBC encrypts and decrypts, the transformed sequence is
79# AES-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec
80# CBC-AES128.Encrypt and CBC-AES128.Decrypt
81AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:7649ABAC8119B246CEE98E9B12E9197D
82AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:7649ABAC8119B246CEE98E9B12E9197D:AE2D8A571E03AC9C9EB76FAC45AF8E51:5086CB9B507219EE95DB113A917678B2
83AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:5086CB9B507219EE95DB113A917678B2:30C81C46A35CE411E5FBC1191A0A52EF:73BED6B8E3C1743B7116E69E22229516
84AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:73BED6B8E3C1743B7116E69E22229516:F69F2445DF4F9B17AD2B417BE66C3710:3FF1CAA1681FAC09120ECA307586E1A7
85# CBC-AES192.Encrypt and CBC-AES192.Decrypt
86AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:4F021DB243BC633D7178183A9FA071E8
87AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:4F021DB243BC633D7178183A9FA071E8:AE2D8A571E03AC9C9EB76FAC45AF8E51:B4D9ADA9AD7DEDF4E5E738763F69145A
88AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:B4D9ADA9AD7DEDF4E5E738763F69145A:30C81C46A35CE411E5FBC1191A0A52EF:571B242012FB7AE07FA9BAAC3DF102E0
89AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:571B242012FB7AE07FA9BAAC3DF102E0:F69F2445DF4F9B17AD2B417BE66C3710:08B0E27988598881D920A9E64F5615CD
90# CBC-AES256.Encrypt and CBC-AES256.Decrypt
91AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:F58C4C04D6E5F1BA779EABFB5F7BFBD6
92AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:F58C4C04D6E5F1BA779EABFB5F7BFBD6:AE2D8A571E03AC9C9EB76FAC45AF8E51:9CFC4E967EDB808D679F777BC6702C7D
93AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:9CFC4E967EDB808D679F777BC6702C7D:30C81C46A35CE411E5FBC1191A0A52EF:39F23369A9D9BACFA530E26304231461
94AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39F23369A9D9BACFA530E26304231461:F69F2445DF4F9B17AD2B417BE66C3710:B2EB05E2C39BE9FCDA6C19078C6A9D1B
95# We don't support CFB{1,8}-AESxxx.{En,De}crypt
96# For all CFB128 encrypts and decrypts, the transformed sequence is
97# AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec
98# CFB128-AES128.Encrypt
99AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:1
100AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:3B3FD92EB72DAD20333449F8E83CFB4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:C8A64537A0B3A93FCDE3CDAD9F1CE58B:1
101AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:C8A64537A0B3A93FCDE3CDAD9F1CE58B:30C81C46A35CE411E5FBC1191A0A52EF:26751F67A3CBB140B1808CF187A4F4DF:1
102AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:26751F67A3CBB140B1808CF187A4F4DF:F69F2445DF4F9B17AD2B417BE66C3710:C04B05357C5D1C0EEAC4C66F9FF7F2E6:1
103# CFB128-AES128.Decrypt
104AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:0
105AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:3B3FD92EB72DAD20333449F8E83CFB4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:C8A64537A0B3A93FCDE3CDAD9F1CE58B:0
106AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:C8A64537A0B3A93FCDE3CDAD9F1CE58B:30C81C46A35CE411E5FBC1191A0A52EF:26751F67A3CBB140B1808CF187A4F4DF:0
107AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:26751F67A3CBB140B1808CF187A4F4DF:F69F2445DF4F9B17AD2B417BE66C3710:C04B05357C5D1C0EEAC4C66F9FF7F2E6:0
108# CFB128-AES192.Encrypt
109AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:1
110AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:CDC80D6FDDF18CAB34C25909C99A4174:AE2D8A571E03AC9C9EB76FAC45AF8E51:67CE7F7F81173621961A2B70171D3D7A:1
111AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:67CE7F7F81173621961A2B70171D3D7A:30C81C46A35CE411E5FBC1191A0A52EF:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:1
112AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:F69F2445DF4F9B17AD2B417BE66C3710:C05F9F9CA9834FA042AE8FBA584B09FF:1
113# CFB128-AES192.Decrypt
114AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:0
115AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:CDC80D6FDDF18CAB34C25909C99A4174:AE2D8A571E03AC9C9EB76FAC45AF8E51:67CE7F7F81173621961A2B70171D3D7A:0
116AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:67CE7F7F81173621961A2B70171D3D7A:30C81C46A35CE411E5FBC1191A0A52EF:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:0
117AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:F69F2445DF4F9B17AD2B417BE66C3710:C05F9F9CA9834FA042AE8FBA584B09FF:0
118# CFB128-AES256.Encrypt
119AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:1
120AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DC7E84BFDA79164B7ECD8486985D3860:AE2D8A571E03AC9C9EB76FAC45AF8E51:39FFED143B28B1C832113C6331E5407B:1
121AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39FFED143B28B1C832113C6331E5407B:30C81C46A35CE411E5FBC1191A0A52EF:DF10132415E54B92A13ED0A8267AE2F9:1
122AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DF10132415E54B92A13ED0A8267AE2F9:F69F2445DF4F9B17AD2B417BE66C3710:75A385741AB9CEF82031623D55B1E471:1
123# CFB128-AES256.Decrypt
124AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:0
125AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DC7E84BFDA79164B7ECD8486985D3860:AE2D8A571E03AC9C9EB76FAC45AF8E51:39FFED143B28B1C832113C6331E5407B:0
126AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39FFED143B28B1C832113C6331E5407B:30C81C46A35CE411E5FBC1191A0A52EF:DF10132415E54B92A13ED0A8267AE2F9:0
127AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DF10132415E54B92A13ED0A8267AE2F9:F69F2445DF4F9B17AD2B417BE66C3710:75A385741AB9CEF82031623D55B1E471:0
128# For all OFB encrypts and decrypts, the transformed sequence is
129# AES-bits-CFB:key:IV/output':plaintext:ciphertext:encdec
130# OFB-AES128.Encrypt
131AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:1
132AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:7789508D16918F03F53C52DAC54ED825:1
133AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:9740051E9C5FECF64344F7A82260EDCC:1
134AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:304C6528F659C77866A510D9C1D6AE5E:1
135# OFB-AES128.Decrypt
136AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:0
137AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:7789508D16918F03F53C52DAC54ED825:0
138AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:9740051E9C5FECF64344F7A82260EDCC:0
139AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:304C6528F659C77866A510D9C1D6AE5E:0
140# OFB-AES192.Encrypt
141AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:1
142AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:FCC28B8D4C63837C09E81700C1100401:1
143AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:8D9A9AEAC0F6596F559C6D4DAF59A5F2:1
144AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:6D9F200857CA6C3E9CAC524BD9ACC92A:1
145# OFB-AES192.Decrypt
146AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:0
147AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:FCC28B8D4C63837C09E81700C1100401:0
148AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:8D9A9AEAC0F6596F559C6D4DAF59A5F2:0
149AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:6D9F200857CA6C3E9CAC524BD9ACC92A:0
150# OFB-AES256.Encrypt
151AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:1
152AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:4FEBDC6740D20B3AC88F6AD82A4FB08D:1
153AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:1
154AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:1
155# OFB-AES256.Decrypt
156AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:0
157AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:4FEBDC6740D20B3AC88F6AD82A4FB08D:0
158AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:0
159AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:0
59 160
60# DES ECB tests (from destest) 161# DES ECB tests (from destest)
61 162
diff --git a/src/lib/libcrypto/objects/Makefile.ssl b/src/lib/libcrypto/objects/Makefile.ssl
index 7962a089db..c8e54facee 100644
--- a/src/lib/libcrypto/objects/Makefile.ssl
+++ b/src/lib/libcrypto/objects/Makefile.ssl
@@ -15,7 +15,6 @@ MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) 15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile.ssl 16MAKEFILE= Makefile.ssl
17AR= ar r 17AR= ar r
18PERL= perl
19 18
20CFLAGS= $(INCLUDES) $(CFLAG) 19CFLAGS= $(INCLUDES) $(CFLAG)
21 20
diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c
index 2b80243256..b4453b4a98 100644
--- a/src/lib/libcrypto/objects/o_names.c
+++ b/src/lib/libcrypto/objects/o_names.c
@@ -79,6 +79,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
79 { 79 {
80 MemCheck_off(); 80 MemCheck_off();
81 name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS)); 81 name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS));
82 MemCheck_on();
83 if (!name_funcs) return(0);
82 name_funcs->hash_func = lh_strhash; 84 name_funcs->hash_func = lh_strhash;
83 name_funcs->cmp_func = OPENSSL_strcmp; 85 name_funcs->cmp_func = OPENSSL_strcmp;
84 name_funcs->free_func = 0; /* NULL is often declared to 86 name_funcs->free_func = 0; /* NULL is often declared to
@@ -86,6 +88,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
86 * to Compaq C is not really 88 * to Compaq C is not really
87 * compatible with a function 89 * compatible with a function
88 * pointer. -- Richard Levitte*/ 90 * pointer. -- Richard Levitte*/
91 MemCheck_off();
89 sk_NAME_FUNCS_push(name_funcs_stack,name_funcs); 92 sk_NAME_FUNCS_push(name_funcs_stack,name_funcs);
90 MemCheck_on(); 93 MemCheck_on();
91 } 94 }
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index 8779ba7d1d..3ff64bb8d1 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -236,7 +236,7 @@ int OBJ_add_object(const ASN1_OBJECT *obj)
236 if (added == NULL) 236 if (added == NULL)
237 if (!init_added()) return(0); 237 if (!init_added()) return(0);
238 if ((o=OBJ_dup(obj)) == NULL) goto err; 238 if ((o=OBJ_dup(obj)) == NULL) goto err;
239 ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); 239 if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err;
240 if ((o->length != 0) && (obj->data != NULL)) 240 if ((o->length != 0) && (obj->data != NULL))
241 ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); 241 ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
242 if (o->sn != NULL) 242 if (o->sn != NULL)
diff --git a/src/lib/libcrypto/objects/obj_mac.h b/src/lib/libcrypto/objects/obj_mac.h
deleted file mode 100644
index 6d77fcba3f..0000000000
--- a/src/lib/libcrypto/objects/obj_mac.h
+++ /dev/null
@@ -1,2307 +0,0 @@
1/* crypto/objects/obj_mac.h */
2
3/* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
4 * following command:
5 * perl objects.pl objects.txt obj_mac.num obj_mac.h
6 */
7
8/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
9 * All rights reserved.
10 *
11 * This package is an SSL implementation written
12 * by Eric Young (eay@cryptsoft.com).
13 * The implementation was written so as to conform with Netscapes SSL.
14 *
15 * This library is free for commercial and non-commercial use as long as
16 * the following conditions are aheared to. The following conditions
17 * apply to all code found in this distribution, be it the RC4, RSA,
18 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
19 * included with this distribution is covered by the same copyright terms
20 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
21 *
22 * Copyright remains Eric Young's, and as such any Copyright notices in
23 * the code are not to be removed.
24 * If this package is used in a product, Eric Young should be given attribution
25 * as the author of the parts of the library used.
26 * This can be in the form of a textual message at program startup or
27 * in documentation (online or textual) provided with the package.
28 *
29 * Redistribution and use in source and binary forms, with or without
30 * modification, are permitted provided that the following conditions
31 * are met:
32 * 1. Redistributions of source code must retain the copyright
33 * notice, this list of conditions and the following disclaimer.
34 * 2. Redistributions in binary form must reproduce the above copyright
35 * notice, this list of conditions and the following disclaimer in the
36 * documentation and/or other materials provided with the distribution.
37 * 3. All advertising materials mentioning features or use of this software
38 * must display the following acknowledgement:
39 * "This product includes cryptographic software written by
40 * Eric Young (eay@cryptsoft.com)"
41 * The word 'cryptographic' can be left out if the rouines from the library
42 * being used are not cryptographic related :-).
43 * 4. If you include any Windows specific code (or a derivative thereof) from
44 * the apps directory (application code) you must include an acknowledgement:
45 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
46 *
47 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
48 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
49 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
50 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
51 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
52 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
53 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
54 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
55 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
56 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
57 * SUCH DAMAGE.
58 *
59 * The licence and distribution terms for any publically available version or
60 * derivative of this code cannot be changed. i.e. this code cannot simply be
61 * copied and put under another distribution licence
62 * [including the GNU Public Licence.]
63 */
64
65#define SN_undef "UNDEF"
66#define LN_undef "undefined"
67#define NID_undef 0
68#define OBJ_undef 0L
69
70#define SN_ccitt "CCITT"
71#define LN_ccitt "ccitt"
72#define NID_ccitt 404
73#define OBJ_ccitt 0L
74
75#define SN_iso "ISO"
76#define LN_iso "iso"
77#define NID_iso 181
78#define OBJ_iso 1L
79
80#define SN_joint_iso_ccitt "JOINT-ISO-CCITT"
81#define LN_joint_iso_ccitt "joint-iso-ccitt"
82#define NID_joint_iso_ccitt 393
83#define OBJ_joint_iso_ccitt 2L
84
85#define SN_member_body "member-body"
86#define LN_member_body "ISO Member Body"
87#define NID_member_body 182
88#define OBJ_member_body OBJ_iso,2L
89
90#define SN_selected_attribute_types "selected-attribute-types"
91#define LN_selected_attribute_types "Selected Attribute Types"
92#define NID_selected_attribute_types 394
93#define OBJ_selected_attribute_types OBJ_joint_iso_ccitt,5L,1L,5L
94
95#define SN_clearance "clearance"
96#define NID_clearance 395
97#define OBJ_clearance OBJ_selected_attribute_types,55L
98
99#define SN_ISO_US "ISO-US"
100#define LN_ISO_US "ISO US Member Body"
101#define NID_ISO_US 183
102#define OBJ_ISO_US OBJ_member_body,840L
103
104#define SN_X9_57 "X9-57"
105#define LN_X9_57 "X9.57"
106#define NID_X9_57 184
107#define OBJ_X9_57 OBJ_ISO_US,10040L
108
109#define SN_X9cm "X9cm"
110#define LN_X9cm "X9.57 CM ?"
111#define NID_X9cm 185
112#define OBJ_X9cm OBJ_X9_57,4L
113
114#define SN_dsa "DSA"
115#define LN_dsa "dsaEncryption"
116#define NID_dsa 116
117#define OBJ_dsa OBJ_X9cm,1L
118
119#define SN_dsaWithSHA1 "DSA-SHA1"
120#define LN_dsaWithSHA1 "dsaWithSHA1"
121#define NID_dsaWithSHA1 113
122#define OBJ_dsaWithSHA1 OBJ_X9cm,3L
123
124#define SN_ansi_X9_62 "ansi-X9-62"
125#define LN_ansi_X9_62 "ANSI X9.62"
126#define NID_ansi_X9_62 405
127#define OBJ_ansi_X9_62 OBJ_ISO_US,10045L
128
129#define OBJ_X9_62_id_fieldType OBJ_ansi_X9_62,1L
130
131#define SN_X9_62_prime_field "prime-field"
132#define NID_X9_62_prime_field 406
133#define OBJ_X9_62_prime_field OBJ_X9_62_id_fieldType,1L
134
135#define SN_X9_62_characteristic_two_field "characteristic-two-field"
136#define NID_X9_62_characteristic_two_field 407
137#define OBJ_X9_62_characteristic_two_field OBJ_X9_62_id_fieldType,2L
138
139#define OBJ_X9_62_id_publicKeyType OBJ_ansi_X9_62,2L
140
141#define SN_X9_62_id_ecPublicKey "id-ecPublicKey"
142#define NID_X9_62_id_ecPublicKey 408
143#define OBJ_X9_62_id_ecPublicKey OBJ_X9_62_id_publicKeyType,1L
144
145#define OBJ_X9_62_ellipticCurve OBJ_ansi_X9_62,3L
146
147#define OBJ_X9_62_c_TwoCurve OBJ_X9_62_ellipticCurve,0L
148
149#define OBJ_X9_62_primeCurve OBJ_X9_62_ellipticCurve,1L
150
151#define SN_X9_62_prime192v1 "prime192v1"
152#define NID_X9_62_prime192v1 409
153#define OBJ_X9_62_prime192v1 OBJ_X9_62_primeCurve,1L
154
155#define SN_X9_62_prime192v2 "prime192v2"
156#define NID_X9_62_prime192v2 410
157#define OBJ_X9_62_prime192v2 OBJ_X9_62_primeCurve,2L
158
159#define SN_X9_62_prime192v3 "prime192v3"
160#define NID_X9_62_prime192v3 411
161#define OBJ_X9_62_prime192v3 OBJ_X9_62_primeCurve,3L
162
163#define SN_X9_62_prime239v1 "prime239v1"
164#define NID_X9_62_prime239v1 412
165#define OBJ_X9_62_prime239v1 OBJ_X9_62_primeCurve,4L
166
167#define SN_X9_62_prime239v2 "prime239v2"
168#define NID_X9_62_prime239v2 413
169#define OBJ_X9_62_prime239v2 OBJ_X9_62_primeCurve,5L
170
171#define SN_X9_62_prime239v3 "prime239v3"
172#define NID_X9_62_prime239v3 414
173#define OBJ_X9_62_prime239v3 OBJ_X9_62_primeCurve,6L
174
175#define SN_X9_62_prime256v1 "prime256v1"
176#define NID_X9_62_prime256v1 415
177#define OBJ_X9_62_prime256v1 OBJ_X9_62_primeCurve,7L
178
179#define OBJ_X9_62_id_ecSigType OBJ_ansi_X9_62,4L
180
181#define SN_ecdsa_with_SHA1 "ecdsa-with-SHA1"
182#define NID_ecdsa_with_SHA1 416
183#define OBJ_ecdsa_with_SHA1 OBJ_X9_62_id_ecSigType,1L
184
185#define SN_cast5_cbc "CAST5-CBC"
186#define LN_cast5_cbc "cast5-cbc"
187#define NID_cast5_cbc 108
188#define OBJ_cast5_cbc OBJ_ISO_US,113533L,7L,66L,10L
189
190#define SN_cast5_ecb "CAST5-ECB"
191#define LN_cast5_ecb "cast5-ecb"
192#define NID_cast5_ecb 109
193
194#define SN_cast5_cfb64 "CAST5-CFB"
195#define LN_cast5_cfb64 "cast5-cfb"
196#define NID_cast5_cfb64 110
197
198#define SN_cast5_ofb64 "CAST5-OFB"
199#define LN_cast5_ofb64 "cast5-ofb"
200#define NID_cast5_ofb64 111
201
202#define LN_pbeWithMD5AndCast5_CBC "pbeWithMD5AndCast5CBC"
203#define NID_pbeWithMD5AndCast5_CBC 112
204#define OBJ_pbeWithMD5AndCast5_CBC OBJ_ISO_US,113533L,7L,66L,12L
205
206#define SN_rsadsi "rsadsi"
207#define LN_rsadsi "RSA Data Security, Inc."
208#define NID_rsadsi 1
209#define OBJ_rsadsi OBJ_ISO_US,113549L
210
211#define SN_pkcs "pkcs"
212#define LN_pkcs "RSA Data Security, Inc. PKCS"
213#define NID_pkcs 2
214#define OBJ_pkcs OBJ_rsadsi,1L
215
216#define SN_pkcs1 "pkcs1"
217#define NID_pkcs1 186
218#define OBJ_pkcs1 OBJ_pkcs,1L
219
220#define LN_rsaEncryption "rsaEncryption"
221#define NID_rsaEncryption 6
222#define OBJ_rsaEncryption OBJ_pkcs1,1L
223
224#define SN_md2WithRSAEncryption "RSA-MD2"
225#define LN_md2WithRSAEncryption "md2WithRSAEncryption"
226#define NID_md2WithRSAEncryption 7
227#define OBJ_md2WithRSAEncryption OBJ_pkcs1,2L
228
229#define SN_md4WithRSAEncryption "RSA-MD4"
230#define LN_md4WithRSAEncryption "md4WithRSAEncryption"
231#define NID_md4WithRSAEncryption 396
232#define OBJ_md4WithRSAEncryption OBJ_pkcs1,3L
233
234#define SN_md5WithRSAEncryption "RSA-MD5"
235#define LN_md5WithRSAEncryption "md5WithRSAEncryption"
236#define NID_md5WithRSAEncryption 8
237#define OBJ_md5WithRSAEncryption OBJ_pkcs1,4L
238
239#define SN_sha1WithRSAEncryption "RSA-SHA1"
240#define LN_sha1WithRSAEncryption "sha1WithRSAEncryption"
241#define NID_sha1WithRSAEncryption 65
242#define OBJ_sha1WithRSAEncryption OBJ_pkcs1,5L
243
244#define SN_pkcs3 "pkcs3"
245#define NID_pkcs3 27
246#define OBJ_pkcs3 OBJ_pkcs,3L
247
248#define LN_dhKeyAgreement "dhKeyAgreement"
249#define NID_dhKeyAgreement 28
250#define OBJ_dhKeyAgreement OBJ_pkcs3,1L
251
252#define SN_pkcs5 "pkcs5"
253#define NID_pkcs5 187
254#define OBJ_pkcs5 OBJ_pkcs,5L
255
256#define SN_pbeWithMD2AndDES_CBC "PBE-MD2-DES"
257#define LN_pbeWithMD2AndDES_CBC "pbeWithMD2AndDES-CBC"
258#define NID_pbeWithMD2AndDES_CBC 9
259#define OBJ_pbeWithMD2AndDES_CBC OBJ_pkcs5,1L
260
261#define SN_pbeWithMD5AndDES_CBC "PBE-MD5-DES"
262#define LN_pbeWithMD5AndDES_CBC "pbeWithMD5AndDES-CBC"
263#define NID_pbeWithMD5AndDES_CBC 10
264#define OBJ_pbeWithMD5AndDES_CBC OBJ_pkcs5,3L
265
266#define SN_pbeWithMD2AndRC2_CBC "PBE-MD2-RC2-64"
267#define LN_pbeWithMD2AndRC2_CBC "pbeWithMD2AndRC2-CBC"
268#define NID_pbeWithMD2AndRC2_CBC 168
269#define OBJ_pbeWithMD2AndRC2_CBC OBJ_pkcs5,4L
270
271#define SN_pbeWithMD5AndRC2_CBC "PBE-MD5-RC2-64"
272#define LN_pbeWithMD5AndRC2_CBC "pbeWithMD5AndRC2-CBC"
273#define NID_pbeWithMD5AndRC2_CBC 169
274#define OBJ_pbeWithMD5AndRC2_CBC OBJ_pkcs5,6L
275
276#define SN_pbeWithSHA1AndDES_CBC "PBE-SHA1-DES"
277#define LN_pbeWithSHA1AndDES_CBC "pbeWithSHA1AndDES-CBC"
278#define NID_pbeWithSHA1AndDES_CBC 170
279#define OBJ_pbeWithSHA1AndDES_CBC OBJ_pkcs5,10L
280
281#define SN_pbeWithSHA1AndRC2_CBC "PBE-SHA1-RC2-64"
282#define LN_pbeWithSHA1AndRC2_CBC "pbeWithSHA1AndRC2-CBC"
283#define NID_pbeWithSHA1AndRC2_CBC 68
284#define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs5,11L
285
286#define LN_id_pbkdf2 "PBKDF2"
287#define NID_id_pbkdf2 69
288#define OBJ_id_pbkdf2 OBJ_pkcs5,12L
289
290#define LN_pbes2 "PBES2"
291#define NID_pbes2 161
292#define OBJ_pbes2 OBJ_pkcs5,13L
293
294#define LN_pbmac1 "PBMAC1"
295#define NID_pbmac1 162
296#define OBJ_pbmac1 OBJ_pkcs5,14L
297
298#define SN_pkcs7 "pkcs7"
299#define NID_pkcs7 20
300#define OBJ_pkcs7 OBJ_pkcs,7L
301
302#define LN_pkcs7_data "pkcs7-data"
303#define NID_pkcs7_data 21
304#define OBJ_pkcs7_data OBJ_pkcs7,1L
305
306#define LN_pkcs7_signed "pkcs7-signedData"
307#define NID_pkcs7_signed 22
308#define OBJ_pkcs7_signed OBJ_pkcs7,2L
309
310#define LN_pkcs7_enveloped "pkcs7-envelopedData"
311#define NID_pkcs7_enveloped 23
312#define OBJ_pkcs7_enveloped OBJ_pkcs7,3L
313
314#define LN_pkcs7_signedAndEnveloped "pkcs7-signedAndEnvelopedData"
315#define NID_pkcs7_signedAndEnveloped 24
316#define OBJ_pkcs7_signedAndEnveloped OBJ_pkcs7,4L
317
318#define LN_pkcs7_digest "pkcs7-digestData"
319#define NID_pkcs7_digest 25
320#define OBJ_pkcs7_digest OBJ_pkcs7,5L
321
322#define LN_pkcs7_encrypted "pkcs7-encryptedData"
323#define NID_pkcs7_encrypted 26
324#define OBJ_pkcs7_encrypted OBJ_pkcs7,6L
325
326#define SN_pkcs9 "pkcs9"
327#define NID_pkcs9 47
328#define OBJ_pkcs9 OBJ_pkcs,9L
329
330#define LN_pkcs9_emailAddress "emailAddress"
331#define NID_pkcs9_emailAddress 48
332#define OBJ_pkcs9_emailAddress OBJ_pkcs9,1L
333
334#define LN_pkcs9_unstructuredName "unstructuredName"
335#define NID_pkcs9_unstructuredName 49
336#define OBJ_pkcs9_unstructuredName OBJ_pkcs9,2L
337
338#define LN_pkcs9_contentType "contentType"
339#define NID_pkcs9_contentType 50
340#define OBJ_pkcs9_contentType OBJ_pkcs9,3L
341
342#define LN_pkcs9_messageDigest "messageDigest"
343#define NID_pkcs9_messageDigest 51
344#define OBJ_pkcs9_messageDigest OBJ_pkcs9,4L
345
346#define LN_pkcs9_signingTime "signingTime"
347#define NID_pkcs9_signingTime 52
348#define OBJ_pkcs9_signingTime OBJ_pkcs9,5L
349
350#define LN_pkcs9_countersignature "countersignature"
351#define NID_pkcs9_countersignature 53
352#define OBJ_pkcs9_countersignature OBJ_pkcs9,6L
353
354#define LN_pkcs9_challengePassword "challengePassword"
355#define NID_pkcs9_challengePassword 54
356#define OBJ_pkcs9_challengePassword OBJ_pkcs9,7L
357
358#define LN_pkcs9_unstructuredAddress "unstructuredAddress"
359#define NID_pkcs9_unstructuredAddress 55
360#define OBJ_pkcs9_unstructuredAddress OBJ_pkcs9,8L
361
362#define LN_pkcs9_extCertAttributes "extendedCertificateAttributes"
363#define NID_pkcs9_extCertAttributes 56
364#define OBJ_pkcs9_extCertAttributes OBJ_pkcs9,9L
365
366#define SN_ext_req "extReq"
367#define LN_ext_req "Extension Request"
368#define NID_ext_req 172
369#define OBJ_ext_req OBJ_pkcs9,14L
370
371#define SN_SMIMECapabilities "SMIME-CAPS"
372#define LN_SMIMECapabilities "S/MIME Capabilities"
373#define NID_SMIMECapabilities 167
374#define OBJ_SMIMECapabilities OBJ_pkcs9,15L
375
376#define SN_SMIME "SMIME"
377#define LN_SMIME "S/MIME"
378#define NID_SMIME 188
379#define OBJ_SMIME OBJ_pkcs9,16L
380
381#define SN_id_smime_mod "id-smime-mod"
382#define NID_id_smime_mod 189
383#define OBJ_id_smime_mod OBJ_SMIME,0L
384
385#define SN_id_smime_ct "id-smime-ct"
386#define NID_id_smime_ct 190
387#define OBJ_id_smime_ct OBJ_SMIME,1L
388
389#define SN_id_smime_aa "id-smime-aa"
390#define NID_id_smime_aa 191
391#define OBJ_id_smime_aa OBJ_SMIME,2L
392
393#define SN_id_smime_alg "id-smime-alg"
394#define NID_id_smime_alg 192
395#define OBJ_id_smime_alg OBJ_SMIME,3L
396
397#define SN_id_smime_cd "id-smime-cd"
398#define NID_id_smime_cd 193
399#define OBJ_id_smime_cd OBJ_SMIME,4L
400
401#define SN_id_smime_spq "id-smime-spq"
402#define NID_id_smime_spq 194
403#define OBJ_id_smime_spq OBJ_SMIME,5L
404
405#define SN_id_smime_cti "id-smime-cti"
406#define NID_id_smime_cti 195
407#define OBJ_id_smime_cti OBJ_SMIME,6L
408
409#define SN_id_smime_mod_cms "id-smime-mod-cms"
410#define NID_id_smime_mod_cms 196
411#define OBJ_id_smime_mod_cms OBJ_id_smime_mod,1L
412
413#define SN_id_smime_mod_ess "id-smime-mod-ess"
414#define NID_id_smime_mod_ess 197
415#define OBJ_id_smime_mod_ess OBJ_id_smime_mod,2L
416
417#define SN_id_smime_mod_oid "id-smime-mod-oid"
418#define NID_id_smime_mod_oid 198
419#define OBJ_id_smime_mod_oid OBJ_id_smime_mod,3L
420
421#define SN_id_smime_mod_msg_v3 "id-smime-mod-msg-v3"
422#define NID_id_smime_mod_msg_v3 199
423#define OBJ_id_smime_mod_msg_v3 OBJ_id_smime_mod,4L
424
425#define SN_id_smime_mod_ets_eSignature_88 "id-smime-mod-ets-eSignature-88"
426#define NID_id_smime_mod_ets_eSignature_88 200
427#define OBJ_id_smime_mod_ets_eSignature_88 OBJ_id_smime_mod,5L
428
429#define SN_id_smime_mod_ets_eSignature_97 "id-smime-mod-ets-eSignature-97"
430#define NID_id_smime_mod_ets_eSignature_97 201
431#define OBJ_id_smime_mod_ets_eSignature_97 OBJ_id_smime_mod,6L
432
433#define SN_id_smime_mod_ets_eSigPolicy_88 "id-smime-mod-ets-eSigPolicy-88"
434#define NID_id_smime_mod_ets_eSigPolicy_88 202
435#define OBJ_id_smime_mod_ets_eSigPolicy_88 OBJ_id_smime_mod,7L
436
437#define SN_id_smime_mod_ets_eSigPolicy_97 "id-smime-mod-ets-eSigPolicy-97"
438#define NID_id_smime_mod_ets_eSigPolicy_97 203
439#define OBJ_id_smime_mod_ets_eSigPolicy_97 OBJ_id_smime_mod,8L
440
441#define SN_id_smime_ct_receipt "id-smime-ct-receipt"
442#define NID_id_smime_ct_receipt 204
443#define OBJ_id_smime_ct_receipt OBJ_id_smime_ct,1L
444
445#define SN_id_smime_ct_authData "id-smime-ct-authData"
446#define NID_id_smime_ct_authData 205
447#define OBJ_id_smime_ct_authData OBJ_id_smime_ct,2L
448
449#define SN_id_smime_ct_publishCert "id-smime-ct-publishCert"
450#define NID_id_smime_ct_publishCert 206
451#define OBJ_id_smime_ct_publishCert OBJ_id_smime_ct,3L
452
453#define SN_id_smime_ct_TSTInfo "id-smime-ct-TSTInfo"
454#define NID_id_smime_ct_TSTInfo 207
455#define OBJ_id_smime_ct_TSTInfo OBJ_id_smime_ct,4L
456
457#define SN_id_smime_ct_TDTInfo "id-smime-ct-TDTInfo"
458#define NID_id_smime_ct_TDTInfo 208
459#define OBJ_id_smime_ct_TDTInfo OBJ_id_smime_ct,5L
460
461#define SN_id_smime_ct_contentInfo "id-smime-ct-contentInfo"
462#define NID_id_smime_ct_contentInfo 209
463#define OBJ_id_smime_ct_contentInfo OBJ_id_smime_ct,6L
464
465#define SN_id_smime_ct_DVCSRequestData "id-smime-ct-DVCSRequestData"
466#define NID_id_smime_ct_DVCSRequestData 210
467#define OBJ_id_smime_ct_DVCSRequestData OBJ_id_smime_ct,7L
468
469#define SN_id_smime_ct_DVCSResponseData "id-smime-ct-DVCSResponseData"
470#define NID_id_smime_ct_DVCSResponseData 211
471#define OBJ_id_smime_ct_DVCSResponseData OBJ_id_smime_ct,8L
472
473#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
474#define NID_id_smime_aa_receiptRequest 212
475#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
476
477#define SN_id_smime_aa_securityLabel "id-smime-aa-securityLabel"
478#define NID_id_smime_aa_securityLabel 213
479#define OBJ_id_smime_aa_securityLabel OBJ_id_smime_aa,2L
480
481#define SN_id_smime_aa_mlExpandHistory "id-smime-aa-mlExpandHistory"
482#define NID_id_smime_aa_mlExpandHistory 214
483#define OBJ_id_smime_aa_mlExpandHistory OBJ_id_smime_aa,3L
484
485#define SN_id_smime_aa_contentHint "id-smime-aa-contentHint"
486#define NID_id_smime_aa_contentHint 215
487#define OBJ_id_smime_aa_contentHint OBJ_id_smime_aa,4L
488
489#define SN_id_smime_aa_msgSigDigest "id-smime-aa-msgSigDigest"
490#define NID_id_smime_aa_msgSigDigest 216
491#define OBJ_id_smime_aa_msgSigDigest OBJ_id_smime_aa,5L
492
493#define SN_id_smime_aa_encapContentType "id-smime-aa-encapContentType"
494#define NID_id_smime_aa_encapContentType 217
495#define OBJ_id_smime_aa_encapContentType OBJ_id_smime_aa,6L
496
497#define SN_id_smime_aa_contentIdentifier "id-smime-aa-contentIdentifier"
498#define NID_id_smime_aa_contentIdentifier 218
499#define OBJ_id_smime_aa_contentIdentifier OBJ_id_smime_aa,7L
500
501#define SN_id_smime_aa_macValue "id-smime-aa-macValue"
502#define NID_id_smime_aa_macValue 219
503#define OBJ_id_smime_aa_macValue OBJ_id_smime_aa,8L
504
505#define SN_id_smime_aa_equivalentLabels "id-smime-aa-equivalentLabels"
506#define NID_id_smime_aa_equivalentLabels 220
507#define OBJ_id_smime_aa_equivalentLabels OBJ_id_smime_aa,9L
508
509#define SN_id_smime_aa_contentReference "id-smime-aa-contentReference"
510#define NID_id_smime_aa_contentReference 221
511#define OBJ_id_smime_aa_contentReference OBJ_id_smime_aa,10L
512
513#define SN_id_smime_aa_encrypKeyPref "id-smime-aa-encrypKeyPref"
514#define NID_id_smime_aa_encrypKeyPref 222
515#define OBJ_id_smime_aa_encrypKeyPref OBJ_id_smime_aa,11L
516
517#define SN_id_smime_aa_signingCertificate "id-smime-aa-signingCertificate"
518#define NID_id_smime_aa_signingCertificate 223
519#define OBJ_id_smime_aa_signingCertificate OBJ_id_smime_aa,12L
520
521#define SN_id_smime_aa_smimeEncryptCerts "id-smime-aa-smimeEncryptCerts"
522#define NID_id_smime_aa_smimeEncryptCerts 224
523#define OBJ_id_smime_aa_smimeEncryptCerts OBJ_id_smime_aa,13L
524
525#define SN_id_smime_aa_timeStampToken "id-smime-aa-timeStampToken"
526#define NID_id_smime_aa_timeStampToken 225
527#define OBJ_id_smime_aa_timeStampToken OBJ_id_smime_aa,14L
528
529#define SN_id_smime_aa_ets_sigPolicyId "id-smime-aa-ets-sigPolicyId"
530#define NID_id_smime_aa_ets_sigPolicyId 226
531#define OBJ_id_smime_aa_ets_sigPolicyId OBJ_id_smime_aa,15L
532
533#define SN_id_smime_aa_ets_commitmentType "id-smime-aa-ets-commitmentType"
534#define NID_id_smime_aa_ets_commitmentType 227
535#define OBJ_id_smime_aa_ets_commitmentType OBJ_id_smime_aa,16L
536
537#define SN_id_smime_aa_ets_signerLocation "id-smime-aa-ets-signerLocation"
538#define NID_id_smime_aa_ets_signerLocation 228
539#define OBJ_id_smime_aa_ets_signerLocation OBJ_id_smime_aa,17L
540
541#define SN_id_smime_aa_ets_signerAttr "id-smime-aa-ets-signerAttr"
542#define NID_id_smime_aa_ets_signerAttr 229
543#define OBJ_id_smime_aa_ets_signerAttr OBJ_id_smime_aa,18L
544
545#define SN_id_smime_aa_ets_otherSigCert "id-smime-aa-ets-otherSigCert"
546#define NID_id_smime_aa_ets_otherSigCert 230
547#define OBJ_id_smime_aa_ets_otherSigCert OBJ_id_smime_aa,19L
548
549#define SN_id_smime_aa_ets_contentTimestamp "id-smime-aa-ets-contentTimestamp"
550#define NID_id_smime_aa_ets_contentTimestamp 231
551#define OBJ_id_smime_aa_ets_contentTimestamp OBJ_id_smime_aa,20L
552
553#define SN_id_smime_aa_ets_CertificateRefs "id-smime-aa-ets-CertificateRefs"
554#define NID_id_smime_aa_ets_CertificateRefs 232
555#define OBJ_id_smime_aa_ets_CertificateRefs OBJ_id_smime_aa,21L
556
557#define SN_id_smime_aa_ets_RevocationRefs "id-smime-aa-ets-RevocationRefs"
558#define NID_id_smime_aa_ets_RevocationRefs 233
559#define OBJ_id_smime_aa_ets_RevocationRefs OBJ_id_smime_aa,22L
560
561#define SN_id_smime_aa_ets_certValues "id-smime-aa-ets-certValues"
562#define NID_id_smime_aa_ets_certValues 234
563#define OBJ_id_smime_aa_ets_certValues OBJ_id_smime_aa,23L
564
565#define SN_id_smime_aa_ets_revocationValues "id-smime-aa-ets-revocationValues"
566#define NID_id_smime_aa_ets_revocationValues 235
567#define OBJ_id_smime_aa_ets_revocationValues OBJ_id_smime_aa,24L
568
569#define SN_id_smime_aa_ets_escTimeStamp "id-smime-aa-ets-escTimeStamp"
570#define NID_id_smime_aa_ets_escTimeStamp 236
571#define OBJ_id_smime_aa_ets_escTimeStamp OBJ_id_smime_aa,25L
572
573#define SN_id_smime_aa_ets_certCRLTimestamp "id-smime-aa-ets-certCRLTimestamp"
574#define NID_id_smime_aa_ets_certCRLTimestamp 237
575#define OBJ_id_smime_aa_ets_certCRLTimestamp OBJ_id_smime_aa,26L
576
577#define SN_id_smime_aa_ets_archiveTimeStamp "id-smime-aa-ets-archiveTimeStamp"
578#define NID_id_smime_aa_ets_archiveTimeStamp 238
579#define OBJ_id_smime_aa_ets_archiveTimeStamp OBJ_id_smime_aa,27L
580
581#define SN_id_smime_aa_signatureType "id-smime-aa-signatureType"
582#define NID_id_smime_aa_signatureType 239
583#define OBJ_id_smime_aa_signatureType OBJ_id_smime_aa,28L
584
585#define SN_id_smime_aa_dvcs_dvc "id-smime-aa-dvcs-dvc"
586#define NID_id_smime_aa_dvcs_dvc 240
587#define OBJ_id_smime_aa_dvcs_dvc OBJ_id_smime_aa,29L
588
589#define SN_id_smime_alg_ESDHwith3DES "id-smime-alg-ESDHwith3DES"
590#define NID_id_smime_alg_ESDHwith3DES 241
591#define OBJ_id_smime_alg_ESDHwith3DES OBJ_id_smime_alg,1L
592
593#define SN_id_smime_alg_ESDHwithRC2 "id-smime-alg-ESDHwithRC2"
594#define NID_id_smime_alg_ESDHwithRC2 242
595#define OBJ_id_smime_alg_ESDHwithRC2 OBJ_id_smime_alg,2L
596
597#define SN_id_smime_alg_3DESwrap "id-smime-alg-3DESwrap"
598#define NID_id_smime_alg_3DESwrap 243
599#define OBJ_id_smime_alg_3DESwrap OBJ_id_smime_alg,3L
600
601#define SN_id_smime_alg_RC2wrap "id-smime-alg-RC2wrap"
602#define NID_id_smime_alg_RC2wrap 244
603#define OBJ_id_smime_alg_RC2wrap OBJ_id_smime_alg,4L
604
605#define SN_id_smime_alg_ESDH "id-smime-alg-ESDH"
606#define NID_id_smime_alg_ESDH 245
607#define OBJ_id_smime_alg_ESDH OBJ_id_smime_alg,5L
608
609#define SN_id_smime_alg_CMS3DESwrap "id-smime-alg-CMS3DESwrap"
610#define NID_id_smime_alg_CMS3DESwrap 246
611#define OBJ_id_smime_alg_CMS3DESwrap OBJ_id_smime_alg,6L
612
613#define SN_id_smime_alg_CMSRC2wrap "id-smime-alg-CMSRC2wrap"
614#define NID_id_smime_alg_CMSRC2wrap 247
615#define OBJ_id_smime_alg_CMSRC2wrap OBJ_id_smime_alg,7L
616
617#define SN_id_smime_cd_ldap "id-smime-cd-ldap"
618#define NID_id_smime_cd_ldap 248
619#define OBJ_id_smime_cd_ldap OBJ_id_smime_cd,1L
620
621#define SN_id_smime_spq_ets_sqt_uri "id-smime-spq-ets-sqt-uri"
622#define NID_id_smime_spq_ets_sqt_uri 249
623#define OBJ_id_smime_spq_ets_sqt_uri OBJ_id_smime_spq,1L
624
625#define SN_id_smime_spq_ets_sqt_unotice "id-smime-spq-ets-sqt-unotice"
626#define NID_id_smime_spq_ets_sqt_unotice 250
627#define OBJ_id_smime_spq_ets_sqt_unotice OBJ_id_smime_spq,2L
628
629#define SN_id_smime_cti_ets_proofOfOrigin "id-smime-cti-ets-proofOfOrigin"
630#define NID_id_smime_cti_ets_proofOfOrigin 251
631#define OBJ_id_smime_cti_ets_proofOfOrigin OBJ_id_smime_cti,1L
632
633#define SN_id_smime_cti_ets_proofOfReceipt "id-smime-cti-ets-proofOfReceipt"
634#define NID_id_smime_cti_ets_proofOfReceipt 252
635#define OBJ_id_smime_cti_ets_proofOfReceipt OBJ_id_smime_cti,2L
636
637#define SN_id_smime_cti_ets_proofOfDelivery "id-smime-cti-ets-proofOfDelivery"
638#define NID_id_smime_cti_ets_proofOfDelivery 253
639#define OBJ_id_smime_cti_ets_proofOfDelivery OBJ_id_smime_cti,3L
640
641#define SN_id_smime_cti_ets_proofOfSender "id-smime-cti-ets-proofOfSender"
642#define NID_id_smime_cti_ets_proofOfSender 254
643#define OBJ_id_smime_cti_ets_proofOfSender OBJ_id_smime_cti,4L
644
645#define SN_id_smime_cti_ets_proofOfApproval "id-smime-cti-ets-proofOfApproval"
646#define NID_id_smime_cti_ets_proofOfApproval 255
647#define OBJ_id_smime_cti_ets_proofOfApproval OBJ_id_smime_cti,5L
648
649#define SN_id_smime_cti_ets_proofOfCreation "id-smime-cti-ets-proofOfCreation"
650#define NID_id_smime_cti_ets_proofOfCreation 256
651#define OBJ_id_smime_cti_ets_proofOfCreation OBJ_id_smime_cti,6L
652
653#define LN_friendlyName "friendlyName"
654#define NID_friendlyName 156
655#define OBJ_friendlyName OBJ_pkcs9,20L
656
657#define LN_localKeyID "localKeyID"
658#define NID_localKeyID 157
659#define OBJ_localKeyID OBJ_pkcs9,21L
660
661#define SN_ms_csp_name "CSPName"
662#define LN_ms_csp_name "Microsoft CSP Name"
663#define NID_ms_csp_name 417
664#define OBJ_ms_csp_name 1L,3L,6L,1L,4L,1L,311L,17L,1L
665
666#define OBJ_certTypes OBJ_pkcs9,22L
667
668#define LN_x509Certificate "x509Certificate"
669#define NID_x509Certificate 158
670#define OBJ_x509Certificate OBJ_certTypes,1L
671
672#define LN_sdsiCertificate "sdsiCertificate"
673#define NID_sdsiCertificate 159
674#define OBJ_sdsiCertificate OBJ_certTypes,2L
675
676#define OBJ_crlTypes OBJ_pkcs9,23L
677
678#define LN_x509Crl "x509Crl"
679#define NID_x509Crl 160
680#define OBJ_x509Crl OBJ_crlTypes,1L
681
682#define OBJ_pkcs12 OBJ_pkcs,12L
683
684#define OBJ_pkcs12_pbeids OBJ_pkcs12,1L
685
686#define SN_pbe_WithSHA1And128BitRC4 "PBE-SHA1-RC4-128"
687#define LN_pbe_WithSHA1And128BitRC4 "pbeWithSHA1And128BitRC4"
688#define NID_pbe_WithSHA1And128BitRC4 144
689#define OBJ_pbe_WithSHA1And128BitRC4 OBJ_pkcs12_pbeids,1L
690
691#define SN_pbe_WithSHA1And40BitRC4 "PBE-SHA1-RC4-40"
692#define LN_pbe_WithSHA1And40BitRC4 "pbeWithSHA1And40BitRC4"
693#define NID_pbe_WithSHA1And40BitRC4 145
694#define OBJ_pbe_WithSHA1And40BitRC4 OBJ_pkcs12_pbeids,2L
695
696#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC "PBE-SHA1-3DES"
697#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC "pbeWithSHA1And3-KeyTripleDES-CBC"
698#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC 146
699#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC OBJ_pkcs12_pbeids,3L
700
701#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC "PBE-SHA1-2DES"
702#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC "pbeWithSHA1And2-KeyTripleDES-CBC"
703#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC 147
704#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC OBJ_pkcs12_pbeids,4L
705
706#define SN_pbe_WithSHA1And128BitRC2_CBC "PBE-SHA1-RC2-128"
707#define LN_pbe_WithSHA1And128BitRC2_CBC "pbeWithSHA1And128BitRC2-CBC"
708#define NID_pbe_WithSHA1And128BitRC2_CBC 148
709#define OBJ_pbe_WithSHA1And128BitRC2_CBC OBJ_pkcs12_pbeids,5L
710
711#define SN_pbe_WithSHA1And40BitRC2_CBC "PBE-SHA1-RC2-40"
712#define LN_pbe_WithSHA1And40BitRC2_CBC "pbeWithSHA1And40BitRC2-CBC"
713#define NID_pbe_WithSHA1And40BitRC2_CBC 149
714#define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids,6L
715
716#define OBJ_pkcs12_Version1 OBJ_pkcs12,10L
717
718#define OBJ_pkcs12_BagIds OBJ_pkcs12_Version1,1L
719
720#define LN_keyBag "keyBag"
721#define NID_keyBag 150
722#define OBJ_keyBag OBJ_pkcs12_BagIds,1L
723
724#define LN_pkcs8ShroudedKeyBag "pkcs8ShroudedKeyBag"
725#define NID_pkcs8ShroudedKeyBag 151
726#define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds,2L
727
728#define LN_certBag "certBag"
729#define NID_certBag 152
730#define OBJ_certBag OBJ_pkcs12_BagIds,3L
731
732#define LN_crlBag "crlBag"
733#define NID_crlBag 153
734#define OBJ_crlBag OBJ_pkcs12_BagIds,4L
735
736#define LN_secretBag "secretBag"
737#define NID_secretBag 154
738#define OBJ_secretBag OBJ_pkcs12_BagIds,5L
739
740#define LN_safeContentsBag "safeContentsBag"
741#define NID_safeContentsBag 155
742#define OBJ_safeContentsBag OBJ_pkcs12_BagIds,6L
743
744#define SN_md2 "MD2"
745#define LN_md2 "md2"
746#define NID_md2 3
747#define OBJ_md2 OBJ_rsadsi,2L,2L
748
749#define SN_md4 "MD4"
750#define LN_md4 "md4"
751#define NID_md4 257
752#define OBJ_md4 OBJ_rsadsi,2L,4L
753
754#define SN_md5 "MD5"
755#define LN_md5 "md5"
756#define NID_md5 4
757#define OBJ_md5 OBJ_rsadsi,2L,5L
758
759#define SN_md5_sha1 "MD5-SHA1"
760#define LN_md5_sha1 "md5-sha1"
761#define NID_md5_sha1 114
762
763#define LN_hmacWithSHA1 "hmacWithSHA1"
764#define NID_hmacWithSHA1 163
765#define OBJ_hmacWithSHA1 OBJ_rsadsi,2L,7L
766
767#define SN_rc2_cbc "RC2-CBC"
768#define LN_rc2_cbc "rc2-cbc"
769#define NID_rc2_cbc 37
770#define OBJ_rc2_cbc OBJ_rsadsi,3L,2L
771
772#define SN_rc2_ecb "RC2-ECB"
773#define LN_rc2_ecb "rc2-ecb"
774#define NID_rc2_ecb 38
775
776#define SN_rc2_cfb64 "RC2-CFB"
777#define LN_rc2_cfb64 "rc2-cfb"
778#define NID_rc2_cfb64 39
779
780#define SN_rc2_ofb64 "RC2-OFB"
781#define LN_rc2_ofb64 "rc2-ofb"
782#define NID_rc2_ofb64 40
783
784#define SN_rc2_40_cbc "RC2-40-CBC"
785#define LN_rc2_40_cbc "rc2-40-cbc"
786#define NID_rc2_40_cbc 98
787
788#define SN_rc2_64_cbc "RC2-64-CBC"
789#define LN_rc2_64_cbc "rc2-64-cbc"
790#define NID_rc2_64_cbc 166
791
792#define SN_rc4 "RC4"
793#define LN_rc4 "rc4"
794#define NID_rc4 5
795#define OBJ_rc4 OBJ_rsadsi,3L,4L
796
797#define SN_rc4_40 "RC4-40"
798#define LN_rc4_40 "rc4-40"
799#define NID_rc4_40 97
800
801#define SN_des_ede3_cbc "DES-EDE3-CBC"
802#define LN_des_ede3_cbc "des-ede3-cbc"
803#define NID_des_ede3_cbc 44
804#define OBJ_des_ede3_cbc OBJ_rsadsi,3L,7L
805
806#define SN_rc5_cbc "RC5-CBC"
807#define LN_rc5_cbc "rc5-cbc"
808#define NID_rc5_cbc 120
809#define OBJ_rc5_cbc OBJ_rsadsi,3L,8L
810
811#define SN_rc5_ecb "RC5-ECB"
812#define LN_rc5_ecb "rc5-ecb"
813#define NID_rc5_ecb 121
814
815#define SN_rc5_cfb64 "RC5-CFB"
816#define LN_rc5_cfb64 "rc5-cfb"
817#define NID_rc5_cfb64 122
818
819#define SN_rc5_ofb64 "RC5-OFB"
820#define LN_rc5_ofb64 "rc5-ofb"
821#define NID_rc5_ofb64 123
822
823#define SN_ms_ext_req "msExtReq"
824#define LN_ms_ext_req "Microsoft Extension Request"
825#define NID_ms_ext_req 171
826#define OBJ_ms_ext_req 1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
827
828#define SN_ms_code_ind "msCodeInd"
829#define LN_ms_code_ind "Microsoft Individual Code Signing"
830#define NID_ms_code_ind 134
831#define OBJ_ms_code_ind 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
832
833#define SN_ms_code_com "msCodeCom"
834#define LN_ms_code_com "Microsoft Commercial Code Signing"
835#define NID_ms_code_com 135
836#define OBJ_ms_code_com 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
837
838#define SN_ms_ctl_sign "msCTLSign"
839#define LN_ms_ctl_sign "Microsoft Trust List Signing"
840#define NID_ms_ctl_sign 136
841#define OBJ_ms_ctl_sign 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
842
843#define SN_ms_sgc "msSGC"
844#define LN_ms_sgc "Microsoft Server Gated Crypto"
845#define NID_ms_sgc 137
846#define OBJ_ms_sgc 1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
847
848#define SN_ms_efs "msEFS"
849#define LN_ms_efs "Microsoft Encrypted File System"
850#define NID_ms_efs 138
851#define OBJ_ms_efs 1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
852
853#define SN_idea_cbc "IDEA-CBC"
854#define LN_idea_cbc "idea-cbc"
855#define NID_idea_cbc 34
856#define OBJ_idea_cbc 1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
857
858#define SN_idea_ecb "IDEA-ECB"
859#define LN_idea_ecb "idea-ecb"
860#define NID_idea_ecb 36
861
862#define SN_idea_cfb64 "IDEA-CFB"
863#define LN_idea_cfb64 "idea-cfb"
864#define NID_idea_cfb64 35
865
866#define SN_idea_ofb64 "IDEA-OFB"
867#define LN_idea_ofb64 "idea-ofb"
868#define NID_idea_ofb64 46
869
870#define SN_bf_cbc "BF-CBC"
871#define LN_bf_cbc "bf-cbc"
872#define NID_bf_cbc 91
873#define OBJ_bf_cbc 1L,3L,6L,1L,4L,1L,3029L,1L,2L
874
875#define SN_bf_ecb "BF-ECB"
876#define LN_bf_ecb "bf-ecb"
877#define NID_bf_ecb 92
878
879#define SN_bf_cfb64 "BF-CFB"
880#define LN_bf_cfb64 "bf-cfb"
881#define NID_bf_cfb64 93
882
883#define SN_bf_ofb64 "BF-OFB"
884#define LN_bf_ofb64 "bf-ofb"
885#define NID_bf_ofb64 94
886
887#define SN_id_pkix "PKIX"
888#define NID_id_pkix 127
889#define OBJ_id_pkix 1L,3L,6L,1L,5L,5L,7L
890
891#define SN_id_pkix_mod "id-pkix-mod"
892#define NID_id_pkix_mod 258
893#define OBJ_id_pkix_mod OBJ_id_pkix,0L
894
895#define SN_id_pe "id-pe"
896#define NID_id_pe 175
897#define OBJ_id_pe OBJ_id_pkix,1L
898
899#define SN_id_qt "id-qt"
900#define NID_id_qt 259
901#define OBJ_id_qt OBJ_id_pkix,2L
902
903#define SN_id_kp "id-kp"
904#define NID_id_kp 128
905#define OBJ_id_kp OBJ_id_pkix,3L
906
907#define SN_id_it "id-it"
908#define NID_id_it 260
909#define OBJ_id_it OBJ_id_pkix,4L
910
911#define SN_id_pkip "id-pkip"
912#define NID_id_pkip 261
913#define OBJ_id_pkip OBJ_id_pkix,5L
914
915#define SN_id_alg "id-alg"
916#define NID_id_alg 262
917#define OBJ_id_alg OBJ_id_pkix,6L
918
919#define SN_id_cmc "id-cmc"
920#define NID_id_cmc 263
921#define OBJ_id_cmc OBJ_id_pkix,7L
922
923#define SN_id_on "id-on"
924#define NID_id_on 264
925#define OBJ_id_on OBJ_id_pkix,8L
926
927#define SN_id_pda "id-pda"
928#define NID_id_pda 265
929#define OBJ_id_pda OBJ_id_pkix,9L
930
931#define SN_id_aca "id-aca"
932#define NID_id_aca 266
933#define OBJ_id_aca OBJ_id_pkix,10L
934
935#define SN_id_qcs "id-qcs"
936#define NID_id_qcs 267
937#define OBJ_id_qcs OBJ_id_pkix,11L
938
939#define SN_id_cct "id-cct"
940#define NID_id_cct 268
941#define OBJ_id_cct OBJ_id_pkix,12L
942
943#define SN_id_ad "id-ad"
944#define NID_id_ad 176
945#define OBJ_id_ad OBJ_id_pkix,48L
946
947#define SN_id_pkix1_explicit_88 "id-pkix1-explicit-88"
948#define NID_id_pkix1_explicit_88 269
949#define OBJ_id_pkix1_explicit_88 OBJ_id_pkix_mod,1L
950
951#define SN_id_pkix1_implicit_88 "id-pkix1-implicit-88"
952#define NID_id_pkix1_implicit_88 270
953#define OBJ_id_pkix1_implicit_88 OBJ_id_pkix_mod,2L
954
955#define SN_id_pkix1_explicit_93 "id-pkix1-explicit-93"
956#define NID_id_pkix1_explicit_93 271
957#define OBJ_id_pkix1_explicit_93 OBJ_id_pkix_mod,3L
958
959#define SN_id_pkix1_implicit_93 "id-pkix1-implicit-93"
960#define NID_id_pkix1_implicit_93 272
961#define OBJ_id_pkix1_implicit_93 OBJ_id_pkix_mod,4L
962
963#define SN_id_mod_crmf "id-mod-crmf"
964#define NID_id_mod_crmf 273
965#define OBJ_id_mod_crmf OBJ_id_pkix_mod,5L
966
967#define SN_id_mod_cmc "id-mod-cmc"
968#define NID_id_mod_cmc 274
969#define OBJ_id_mod_cmc OBJ_id_pkix_mod,6L
970
971#define SN_id_mod_kea_profile_88 "id-mod-kea-profile-88"
972#define NID_id_mod_kea_profile_88 275
973#define OBJ_id_mod_kea_profile_88 OBJ_id_pkix_mod,7L
974
975#define SN_id_mod_kea_profile_93 "id-mod-kea-profile-93"
976#define NID_id_mod_kea_profile_93 276
977#define OBJ_id_mod_kea_profile_93 OBJ_id_pkix_mod,8L
978
979#define SN_id_mod_cmp "id-mod-cmp"
980#define NID_id_mod_cmp 277
981#define OBJ_id_mod_cmp OBJ_id_pkix_mod,9L
982
983#define SN_id_mod_qualified_cert_88 "id-mod-qualified-cert-88"
984#define NID_id_mod_qualified_cert_88 278
985#define OBJ_id_mod_qualified_cert_88 OBJ_id_pkix_mod,10L
986
987#define SN_id_mod_qualified_cert_93 "id-mod-qualified-cert-93"
988#define NID_id_mod_qualified_cert_93 279
989#define OBJ_id_mod_qualified_cert_93 OBJ_id_pkix_mod,11L
990
991#define SN_id_mod_attribute_cert "id-mod-attribute-cert"
992#define NID_id_mod_attribute_cert 280
993#define OBJ_id_mod_attribute_cert OBJ_id_pkix_mod,12L
994
995#define SN_id_mod_timestamp_protocol "id-mod-timestamp-protocol"
996#define NID_id_mod_timestamp_protocol 281
997#define OBJ_id_mod_timestamp_protocol OBJ_id_pkix_mod,13L
998
999#define SN_id_mod_ocsp "id-mod-ocsp"
1000#define NID_id_mod_ocsp 282
1001#define OBJ_id_mod_ocsp OBJ_id_pkix_mod,14L
1002
1003#define SN_id_mod_dvcs "id-mod-dvcs"
1004#define NID_id_mod_dvcs 283
1005#define OBJ_id_mod_dvcs OBJ_id_pkix_mod,15L
1006
1007#define SN_id_mod_cmp2000 "id-mod-cmp2000"
1008#define NID_id_mod_cmp2000 284
1009#define OBJ_id_mod_cmp2000 OBJ_id_pkix_mod,16L
1010
1011#define SN_info_access "authorityInfoAccess"
1012#define LN_info_access "Authority Information Access"
1013#define NID_info_access 177
1014#define OBJ_info_access OBJ_id_pe,1L
1015
1016#define SN_biometricInfo "biometricInfo"
1017#define LN_biometricInfo "Biometric Info"
1018#define NID_biometricInfo 285
1019#define OBJ_biometricInfo OBJ_id_pe,2L
1020
1021#define SN_qcStatements "qcStatements"
1022#define NID_qcStatements 286
1023#define OBJ_qcStatements OBJ_id_pe,3L
1024
1025#define SN_ac_auditEntity "ac-auditEntity"
1026#define NID_ac_auditEntity 287
1027#define OBJ_ac_auditEntity OBJ_id_pe,4L
1028
1029#define SN_ac_targeting "ac-targeting"
1030#define NID_ac_targeting 288
1031#define OBJ_ac_targeting OBJ_id_pe,5L
1032
1033#define SN_aaControls "aaControls"
1034#define NID_aaControls 289
1035#define OBJ_aaControls OBJ_id_pe,6L
1036
1037#define SN_sbqp_ipAddrBlock "sbqp-ipAddrBlock"
1038#define NID_sbqp_ipAddrBlock 290
1039#define OBJ_sbqp_ipAddrBlock OBJ_id_pe,7L
1040
1041#define SN_sbqp_autonomousSysNum "sbqp-autonomousSysNum"
1042#define NID_sbqp_autonomousSysNum 291
1043#define OBJ_sbqp_autonomousSysNum OBJ_id_pe,8L
1044
1045#define SN_sbqp_routerIdentifier "sbqp-routerIdentifier"
1046#define NID_sbqp_routerIdentifier 292
1047#define OBJ_sbqp_routerIdentifier OBJ_id_pe,9L
1048
1049#define SN_ac_proxying "ac-proxying"
1050#define NID_ac_proxying 397
1051#define OBJ_ac_proxying OBJ_id_pe,10L
1052
1053#define SN_sinfo_access "subjectInfoAccess"
1054#define LN_sinfo_access "Subject Information Access"
1055#define NID_sinfo_access 398
1056#define OBJ_sinfo_access OBJ_id_pe,11L
1057
1058#define SN_id_qt_cps "id-qt-cps"
1059#define LN_id_qt_cps "Policy Qualifier CPS"
1060#define NID_id_qt_cps 164
1061#define OBJ_id_qt_cps OBJ_id_qt,1L
1062
1063#define SN_id_qt_unotice "id-qt-unotice"
1064#define LN_id_qt_unotice "Policy Qualifier User Notice"
1065#define NID_id_qt_unotice 165
1066#define OBJ_id_qt_unotice OBJ_id_qt,2L
1067
1068#define SN_textNotice "textNotice"
1069#define NID_textNotice 293
1070#define OBJ_textNotice OBJ_id_qt,3L
1071
1072#define SN_server_auth "serverAuth"
1073#define LN_server_auth "TLS Web Server Authentication"
1074#define NID_server_auth 129
1075#define OBJ_server_auth OBJ_id_kp,1L
1076
1077#define SN_client_auth "clientAuth"
1078#define LN_client_auth "TLS Web Client Authentication"
1079#define NID_client_auth 130
1080#define OBJ_client_auth OBJ_id_kp,2L
1081
1082#define SN_code_sign "codeSigning"
1083#define LN_code_sign "Code Signing"
1084#define NID_code_sign 131
1085#define OBJ_code_sign OBJ_id_kp,3L
1086
1087#define SN_email_protect "emailProtection"
1088#define LN_email_protect "E-mail Protection"
1089#define NID_email_protect 132
1090#define OBJ_email_protect OBJ_id_kp,4L
1091
1092#define SN_ipsecEndSystem "ipsecEndSystem"
1093#define LN_ipsecEndSystem "IPSec End System"
1094#define NID_ipsecEndSystem 294
1095#define OBJ_ipsecEndSystem OBJ_id_kp,5L
1096
1097#define SN_ipsecTunnel "ipsecTunnel"
1098#define LN_ipsecTunnel "IPSec Tunnel"
1099#define NID_ipsecTunnel 295
1100#define OBJ_ipsecTunnel OBJ_id_kp,6L
1101
1102#define SN_ipsecUser "ipsecUser"
1103#define LN_ipsecUser "IPSec User"
1104#define NID_ipsecUser 296
1105#define OBJ_ipsecUser OBJ_id_kp,7L
1106
1107#define SN_time_stamp "timeStamping"
1108#define LN_time_stamp "Time Stamping"
1109#define NID_time_stamp 133
1110#define OBJ_time_stamp OBJ_id_kp,8L
1111
1112#define SN_OCSP_sign "OCSPSigning"
1113#define LN_OCSP_sign "OCSP Signing"
1114#define NID_OCSP_sign 180
1115#define OBJ_OCSP_sign OBJ_id_kp,9L
1116
1117#define SN_dvcs "DVCS"
1118#define LN_dvcs "dvcs"
1119#define NID_dvcs 297
1120#define OBJ_dvcs OBJ_id_kp,10L
1121
1122#define SN_id_it_caProtEncCert "id-it-caProtEncCert"
1123#define NID_id_it_caProtEncCert 298
1124#define OBJ_id_it_caProtEncCert OBJ_id_it,1L
1125
1126#define SN_id_it_signKeyPairTypes "id-it-signKeyPairTypes"
1127#define NID_id_it_signKeyPairTypes 299
1128#define OBJ_id_it_signKeyPairTypes OBJ_id_it,2L
1129
1130#define SN_id_it_encKeyPairTypes "id-it-encKeyPairTypes"
1131#define NID_id_it_encKeyPairTypes 300
1132#define OBJ_id_it_encKeyPairTypes OBJ_id_it,3L
1133
1134#define SN_id_it_preferredSymmAlg "id-it-preferredSymmAlg"
1135#define NID_id_it_preferredSymmAlg 301
1136#define OBJ_id_it_preferredSymmAlg OBJ_id_it,4L
1137
1138#define SN_id_it_caKeyUpdateInfo "id-it-caKeyUpdateInfo"
1139#define NID_id_it_caKeyUpdateInfo 302
1140#define OBJ_id_it_caKeyUpdateInfo OBJ_id_it,5L
1141
1142#define SN_id_it_currentCRL "id-it-currentCRL"
1143#define NID_id_it_currentCRL 303
1144#define OBJ_id_it_currentCRL OBJ_id_it,6L
1145
1146#define SN_id_it_unsupportedOIDs "id-it-unsupportedOIDs"
1147#define NID_id_it_unsupportedOIDs 304
1148#define OBJ_id_it_unsupportedOIDs OBJ_id_it,7L
1149
1150#define SN_id_it_subscriptionRequest "id-it-subscriptionRequest"
1151#define NID_id_it_subscriptionRequest 305
1152#define OBJ_id_it_subscriptionRequest OBJ_id_it,8L
1153
1154#define SN_id_it_subscriptionResponse "id-it-subscriptionResponse"
1155#define NID_id_it_subscriptionResponse 306
1156#define OBJ_id_it_subscriptionResponse OBJ_id_it,9L
1157
1158#define SN_id_it_keyPairParamReq "id-it-keyPairParamReq"
1159#define NID_id_it_keyPairParamReq 307
1160#define OBJ_id_it_keyPairParamReq OBJ_id_it,10L
1161
1162#define SN_id_it_keyPairParamRep "id-it-keyPairParamRep"
1163#define NID_id_it_keyPairParamRep 308
1164#define OBJ_id_it_keyPairParamRep OBJ_id_it,11L
1165
1166#define SN_id_it_revPassphrase "id-it-revPassphrase"
1167#define NID_id_it_revPassphrase 309
1168#define OBJ_id_it_revPassphrase OBJ_id_it,12L
1169
1170#define SN_id_it_implicitConfirm "id-it-implicitConfirm"
1171#define NID_id_it_implicitConfirm 310
1172#define OBJ_id_it_implicitConfirm OBJ_id_it,13L
1173
1174#define SN_id_it_confirmWaitTime "id-it-confirmWaitTime"
1175#define NID_id_it_confirmWaitTime 311
1176#define OBJ_id_it_confirmWaitTime OBJ_id_it,14L
1177
1178#define SN_id_it_origPKIMessage "id-it-origPKIMessage"
1179#define NID_id_it_origPKIMessage 312
1180#define OBJ_id_it_origPKIMessage OBJ_id_it,15L
1181
1182#define SN_id_regCtrl "id-regCtrl"
1183#define NID_id_regCtrl 313
1184#define OBJ_id_regCtrl OBJ_id_pkip,1L
1185
1186#define SN_id_regInfo "id-regInfo"
1187#define NID_id_regInfo 314
1188#define OBJ_id_regInfo OBJ_id_pkip,2L
1189
1190#define SN_id_regCtrl_regToken "id-regCtrl-regToken"
1191#define NID_id_regCtrl_regToken 315
1192#define OBJ_id_regCtrl_regToken OBJ_id_regCtrl,1L
1193
1194#define SN_id_regCtrl_authenticator "id-regCtrl-authenticator"
1195#define NID_id_regCtrl_authenticator 316
1196#define OBJ_id_regCtrl_authenticator OBJ_id_regCtrl,2L
1197
1198#define SN_id_regCtrl_pkiPublicationInfo "id-regCtrl-pkiPublicationInfo"
1199#define NID_id_regCtrl_pkiPublicationInfo 317
1200#define OBJ_id_regCtrl_pkiPublicationInfo OBJ_id_regCtrl,3L
1201
1202#define SN_id_regCtrl_pkiArchiveOptions "id-regCtrl-pkiArchiveOptions"
1203#define NID_id_regCtrl_pkiArchiveOptions 318
1204#define OBJ_id_regCtrl_pkiArchiveOptions OBJ_id_regCtrl,4L
1205
1206#define SN_id_regCtrl_oldCertID "id-regCtrl-oldCertID"
1207#define NID_id_regCtrl_oldCertID 319
1208#define OBJ_id_regCtrl_oldCertID OBJ_id_regCtrl,5L
1209
1210#define SN_id_regCtrl_protocolEncrKey "id-regCtrl-protocolEncrKey"
1211#define NID_id_regCtrl_protocolEncrKey 320
1212#define OBJ_id_regCtrl_protocolEncrKey OBJ_id_regCtrl,6L
1213
1214#define SN_id_regInfo_utf8Pairs "id-regInfo-utf8Pairs"
1215#define NID_id_regInfo_utf8Pairs 321
1216#define OBJ_id_regInfo_utf8Pairs OBJ_id_regInfo,1L
1217
1218#define SN_id_regInfo_certReq "id-regInfo-certReq"
1219#define NID_id_regInfo_certReq 322
1220#define OBJ_id_regInfo_certReq OBJ_id_regInfo,2L
1221
1222#define SN_id_alg_des40 "id-alg-des40"
1223#define NID_id_alg_des40 323
1224#define OBJ_id_alg_des40 OBJ_id_alg,1L
1225
1226#define SN_id_alg_noSignature "id-alg-noSignature"
1227#define NID_id_alg_noSignature 324
1228#define OBJ_id_alg_noSignature OBJ_id_alg,2L
1229
1230#define SN_id_alg_dh_sig_hmac_sha1 "id-alg-dh-sig-hmac-sha1"
1231#define NID_id_alg_dh_sig_hmac_sha1 325
1232#define OBJ_id_alg_dh_sig_hmac_sha1 OBJ_id_alg,3L
1233
1234#define SN_id_alg_dh_pop "id-alg-dh-pop"
1235#define NID_id_alg_dh_pop 326
1236#define OBJ_id_alg_dh_pop OBJ_id_alg,4L
1237
1238#define SN_id_cmc_statusInfo "id-cmc-statusInfo"
1239#define NID_id_cmc_statusInfo 327
1240#define OBJ_id_cmc_statusInfo OBJ_id_cmc,1L
1241
1242#define SN_id_cmc_identification "id-cmc-identification"
1243#define NID_id_cmc_identification 328
1244#define OBJ_id_cmc_identification OBJ_id_cmc,2L
1245
1246#define SN_id_cmc_identityProof "id-cmc-identityProof"
1247#define NID_id_cmc_identityProof 329
1248#define OBJ_id_cmc_identityProof OBJ_id_cmc,3L
1249
1250#define SN_id_cmc_dataReturn "id-cmc-dataReturn"
1251#define NID_id_cmc_dataReturn 330
1252#define OBJ_id_cmc_dataReturn OBJ_id_cmc,4L
1253
1254#define SN_id_cmc_transactionId "id-cmc-transactionId"
1255#define NID_id_cmc_transactionId 331
1256#define OBJ_id_cmc_transactionId OBJ_id_cmc,5L
1257
1258#define SN_id_cmc_senderNonce "id-cmc-senderNonce"
1259#define NID_id_cmc_senderNonce 332
1260#define OBJ_id_cmc_senderNonce OBJ_id_cmc,6L
1261
1262#define SN_id_cmc_recipientNonce "id-cmc-recipientNonce"
1263#define NID_id_cmc_recipientNonce 333
1264#define OBJ_id_cmc_recipientNonce OBJ_id_cmc,7L
1265
1266#define SN_id_cmc_addExtensions "id-cmc-addExtensions"
1267#define NID_id_cmc_addExtensions 334
1268#define OBJ_id_cmc_addExtensions OBJ_id_cmc,8L
1269
1270#define SN_id_cmc_encryptedPOP "id-cmc-encryptedPOP"
1271#define NID_id_cmc_encryptedPOP 335
1272#define OBJ_id_cmc_encryptedPOP OBJ_id_cmc,9L
1273
1274#define SN_id_cmc_decryptedPOP "id-cmc-decryptedPOP"
1275#define NID_id_cmc_decryptedPOP 336
1276#define OBJ_id_cmc_decryptedPOP OBJ_id_cmc,10L
1277
1278#define SN_id_cmc_lraPOPWitness "id-cmc-lraPOPWitness"
1279#define NID_id_cmc_lraPOPWitness 337
1280#define OBJ_id_cmc_lraPOPWitness OBJ_id_cmc,11L
1281
1282#define SN_id_cmc_getCert "id-cmc-getCert"
1283#define NID_id_cmc_getCert 338
1284#define OBJ_id_cmc_getCert OBJ_id_cmc,15L
1285
1286#define SN_id_cmc_getCRL "id-cmc-getCRL"
1287#define NID_id_cmc_getCRL 339
1288#define OBJ_id_cmc_getCRL OBJ_id_cmc,16L
1289
1290#define SN_id_cmc_revokeRequest "id-cmc-revokeRequest"
1291#define NID_id_cmc_revokeRequest 340
1292#define OBJ_id_cmc_revokeRequest OBJ_id_cmc,17L
1293
1294#define SN_id_cmc_regInfo "id-cmc-regInfo"
1295#define NID_id_cmc_regInfo 341
1296#define OBJ_id_cmc_regInfo OBJ_id_cmc,18L
1297
1298#define SN_id_cmc_responseInfo "id-cmc-responseInfo"
1299#define NID_id_cmc_responseInfo 342
1300#define OBJ_id_cmc_responseInfo OBJ_id_cmc,19L
1301
1302#define SN_id_cmc_queryPending "id-cmc-queryPending"
1303#define NID_id_cmc_queryPending 343
1304#define OBJ_id_cmc_queryPending OBJ_id_cmc,21L
1305
1306#define SN_id_cmc_popLinkRandom "id-cmc-popLinkRandom"
1307#define NID_id_cmc_popLinkRandom 344
1308#define OBJ_id_cmc_popLinkRandom OBJ_id_cmc,22L
1309
1310#define SN_id_cmc_popLinkWitness "id-cmc-popLinkWitness"
1311#define NID_id_cmc_popLinkWitness 345
1312#define OBJ_id_cmc_popLinkWitness OBJ_id_cmc,23L
1313
1314#define SN_id_cmc_confirmCertAcceptance "id-cmc-confirmCertAcceptance"
1315#define NID_id_cmc_confirmCertAcceptance 346
1316#define OBJ_id_cmc_confirmCertAcceptance OBJ_id_cmc,24L
1317
1318#define SN_id_on_personalData "id-on-personalData"
1319#define NID_id_on_personalData 347
1320#define OBJ_id_on_personalData OBJ_id_on,1L
1321
1322#define SN_id_pda_dateOfBirth "id-pda-dateOfBirth"
1323#define NID_id_pda_dateOfBirth 348
1324#define OBJ_id_pda_dateOfBirth OBJ_id_pda,1L
1325
1326#define SN_id_pda_placeOfBirth "id-pda-placeOfBirth"
1327#define NID_id_pda_placeOfBirth 349
1328#define OBJ_id_pda_placeOfBirth OBJ_id_pda,2L
1329
1330#define SN_id_pda_gender "id-pda-gender"
1331#define NID_id_pda_gender 351
1332#define OBJ_id_pda_gender OBJ_id_pda,3L
1333
1334#define SN_id_pda_countryOfCitizenship "id-pda-countryOfCitizenship"
1335#define NID_id_pda_countryOfCitizenship 352
1336#define OBJ_id_pda_countryOfCitizenship OBJ_id_pda,4L
1337
1338#define SN_id_pda_countryOfResidence "id-pda-countryOfResidence"
1339#define NID_id_pda_countryOfResidence 353
1340#define OBJ_id_pda_countryOfResidence OBJ_id_pda,5L
1341
1342#define SN_id_aca_authenticationInfo "id-aca-authenticationInfo"
1343#define NID_id_aca_authenticationInfo 354
1344#define OBJ_id_aca_authenticationInfo OBJ_id_aca,1L
1345
1346#define SN_id_aca_accessIdentity "id-aca-accessIdentity"
1347#define NID_id_aca_accessIdentity 355
1348#define OBJ_id_aca_accessIdentity OBJ_id_aca,2L
1349
1350#define SN_id_aca_chargingIdentity "id-aca-chargingIdentity"
1351#define NID_id_aca_chargingIdentity 356
1352#define OBJ_id_aca_chargingIdentity OBJ_id_aca,3L
1353
1354#define SN_id_aca_group "id-aca-group"
1355#define NID_id_aca_group 357
1356#define OBJ_id_aca_group OBJ_id_aca,4L
1357
1358#define SN_id_aca_role "id-aca-role"
1359#define NID_id_aca_role 358
1360#define OBJ_id_aca_role OBJ_id_aca,5L
1361
1362#define SN_id_aca_encAttrs "id-aca-encAttrs"
1363#define NID_id_aca_encAttrs 399
1364#define OBJ_id_aca_encAttrs OBJ_id_aca,6L
1365
1366#define SN_id_qcs_pkixQCSyntax_v1 "id-qcs-pkixQCSyntax-v1"
1367#define NID_id_qcs_pkixQCSyntax_v1 359
1368#define OBJ_id_qcs_pkixQCSyntax_v1 OBJ_id_qcs,1L
1369
1370#define SN_id_cct_crs "id-cct-crs"
1371#define NID_id_cct_crs 360
1372#define OBJ_id_cct_crs OBJ_id_cct,1L
1373
1374#define SN_id_cct_PKIData "id-cct-PKIData"
1375#define NID_id_cct_PKIData 361
1376#define OBJ_id_cct_PKIData OBJ_id_cct,2L
1377
1378#define SN_id_cct_PKIResponse "id-cct-PKIResponse"
1379#define NID_id_cct_PKIResponse 362
1380#define OBJ_id_cct_PKIResponse OBJ_id_cct,3L
1381
1382#define SN_ad_OCSP "OCSP"
1383#define LN_ad_OCSP "OCSP"
1384#define NID_ad_OCSP 178
1385#define OBJ_ad_OCSP OBJ_id_ad,1L
1386
1387#define SN_ad_ca_issuers "caIssuers"
1388#define LN_ad_ca_issuers "CA Issuers"
1389#define NID_ad_ca_issuers 179
1390#define OBJ_ad_ca_issuers OBJ_id_ad,2L
1391
1392#define SN_ad_timeStamping "ad_timestamping"
1393#define LN_ad_timeStamping "AD Time Stamping"
1394#define NID_ad_timeStamping 363
1395#define OBJ_ad_timeStamping OBJ_id_ad,3L
1396
1397#define SN_ad_dvcs "AD_DVCS"
1398#define LN_ad_dvcs "ad dvcs"
1399#define NID_ad_dvcs 364
1400#define OBJ_ad_dvcs OBJ_id_ad,4L
1401
1402#define OBJ_id_pkix_OCSP OBJ_ad_OCSP
1403
1404#define SN_id_pkix_OCSP_basic "basicOCSPResponse"
1405#define LN_id_pkix_OCSP_basic "Basic OCSP Response"
1406#define NID_id_pkix_OCSP_basic 365
1407#define OBJ_id_pkix_OCSP_basic OBJ_id_pkix_OCSP,1L
1408
1409#define SN_id_pkix_OCSP_Nonce "Nonce"
1410#define LN_id_pkix_OCSP_Nonce "OCSP Nonce"
1411#define NID_id_pkix_OCSP_Nonce 366
1412#define OBJ_id_pkix_OCSP_Nonce OBJ_id_pkix_OCSP,2L
1413
1414#define SN_id_pkix_OCSP_CrlID "CrlID"
1415#define LN_id_pkix_OCSP_CrlID "OCSP CRL ID"
1416#define NID_id_pkix_OCSP_CrlID 367
1417#define OBJ_id_pkix_OCSP_CrlID OBJ_id_pkix_OCSP,3L
1418
1419#define SN_id_pkix_OCSP_acceptableResponses "acceptableResponses"
1420#define LN_id_pkix_OCSP_acceptableResponses "Acceptable OCSP Responses"
1421#define NID_id_pkix_OCSP_acceptableResponses 368
1422#define OBJ_id_pkix_OCSP_acceptableResponses OBJ_id_pkix_OCSP,4L
1423
1424#define SN_id_pkix_OCSP_noCheck "noCheck"
1425#define LN_id_pkix_OCSP_noCheck "OCSP No Check"
1426#define NID_id_pkix_OCSP_noCheck 369
1427#define OBJ_id_pkix_OCSP_noCheck OBJ_id_pkix_OCSP,5L
1428
1429#define SN_id_pkix_OCSP_archiveCutoff "archiveCutoff"
1430#define LN_id_pkix_OCSP_archiveCutoff "OCSP Archive Cutoff"
1431#define NID_id_pkix_OCSP_archiveCutoff 370
1432#define OBJ_id_pkix_OCSP_archiveCutoff OBJ_id_pkix_OCSP,6L
1433
1434#define SN_id_pkix_OCSP_serviceLocator "serviceLocator"
1435#define LN_id_pkix_OCSP_serviceLocator "OCSP Service Locator"
1436#define NID_id_pkix_OCSP_serviceLocator 371
1437#define OBJ_id_pkix_OCSP_serviceLocator OBJ_id_pkix_OCSP,7L
1438
1439#define SN_id_pkix_OCSP_extendedStatus "extendedStatus"
1440#define LN_id_pkix_OCSP_extendedStatus "Extended OCSP Status"
1441#define NID_id_pkix_OCSP_extendedStatus 372
1442#define OBJ_id_pkix_OCSP_extendedStatus OBJ_id_pkix_OCSP,8L
1443
1444#define SN_id_pkix_OCSP_valid "valid"
1445#define NID_id_pkix_OCSP_valid 373
1446#define OBJ_id_pkix_OCSP_valid OBJ_id_pkix_OCSP,9L
1447
1448#define SN_id_pkix_OCSP_path "path"
1449#define NID_id_pkix_OCSP_path 374
1450#define OBJ_id_pkix_OCSP_path OBJ_id_pkix_OCSP,10L
1451
1452#define SN_id_pkix_OCSP_trustRoot "trustRoot"
1453#define LN_id_pkix_OCSP_trustRoot "Trust Root"
1454#define NID_id_pkix_OCSP_trustRoot 375
1455#define OBJ_id_pkix_OCSP_trustRoot OBJ_id_pkix_OCSP,11L
1456
1457#define SN_algorithm "algorithm"
1458#define LN_algorithm "algorithm"
1459#define NID_algorithm 376
1460#define OBJ_algorithm 1L,3L,14L,3L,2L
1461
1462#define SN_md5WithRSA "RSA-NP-MD5"
1463#define LN_md5WithRSA "md5WithRSA"
1464#define NID_md5WithRSA 104
1465#define OBJ_md5WithRSA OBJ_algorithm,3L
1466
1467#define SN_des_ecb "DES-ECB"
1468#define LN_des_ecb "des-ecb"
1469#define NID_des_ecb 29
1470#define OBJ_des_ecb OBJ_algorithm,6L
1471
1472#define SN_des_cbc "DES-CBC"
1473#define LN_des_cbc "des-cbc"
1474#define NID_des_cbc 31
1475#define OBJ_des_cbc OBJ_algorithm,7L
1476
1477#define SN_des_ofb64 "DES-OFB"
1478#define LN_des_ofb64 "des-ofb"
1479#define NID_des_ofb64 45
1480#define OBJ_des_ofb64 OBJ_algorithm,8L
1481
1482#define SN_des_cfb64 "DES-CFB"
1483#define LN_des_cfb64 "des-cfb"
1484#define NID_des_cfb64 30
1485#define OBJ_des_cfb64 OBJ_algorithm,9L
1486
1487#define SN_rsaSignature "rsaSignature"
1488#define NID_rsaSignature 377
1489#define OBJ_rsaSignature OBJ_algorithm,11L
1490
1491#define SN_dsa_2 "DSA-old"
1492#define LN_dsa_2 "dsaEncryption-old"
1493#define NID_dsa_2 67
1494#define OBJ_dsa_2 OBJ_algorithm,12L
1495
1496#define SN_dsaWithSHA "DSA-SHA"
1497#define LN_dsaWithSHA "dsaWithSHA"
1498#define NID_dsaWithSHA 66
1499#define OBJ_dsaWithSHA OBJ_algorithm,13L
1500
1501#define SN_shaWithRSAEncryption "RSA-SHA"
1502#define LN_shaWithRSAEncryption "shaWithRSAEncryption"
1503#define NID_shaWithRSAEncryption 42
1504#define OBJ_shaWithRSAEncryption OBJ_algorithm,15L
1505
1506#define SN_des_ede_ecb "DES-EDE"
1507#define LN_des_ede_ecb "des-ede"
1508#define NID_des_ede_ecb 32
1509#define OBJ_des_ede_ecb OBJ_algorithm,17L
1510
1511#define SN_des_ede3_ecb "DES-EDE3"
1512#define LN_des_ede3_ecb "des-ede3"
1513#define NID_des_ede3_ecb 33
1514
1515#define SN_des_ede_cbc "DES-EDE-CBC"
1516#define LN_des_ede_cbc "des-ede-cbc"
1517#define NID_des_ede_cbc 43
1518
1519#define SN_des_ede_cfb64 "DES-EDE-CFB"
1520#define LN_des_ede_cfb64 "des-ede-cfb"
1521#define NID_des_ede_cfb64 60
1522
1523#define SN_des_ede3_cfb64 "DES-EDE3-CFB"
1524#define LN_des_ede3_cfb64 "des-ede3-cfb"
1525#define NID_des_ede3_cfb64 61
1526
1527#define SN_des_ede_ofb64 "DES-EDE-OFB"
1528#define LN_des_ede_ofb64 "des-ede-ofb"
1529#define NID_des_ede_ofb64 62
1530
1531#define SN_des_ede3_ofb64 "DES-EDE3-OFB"
1532#define LN_des_ede3_ofb64 "des-ede3-ofb"
1533#define NID_des_ede3_ofb64 63
1534
1535#define SN_desx_cbc "DESX-CBC"
1536#define LN_desx_cbc "desx-cbc"
1537#define NID_desx_cbc 80
1538
1539#define SN_sha "SHA"
1540#define LN_sha "sha"
1541#define NID_sha 41
1542#define OBJ_sha OBJ_algorithm,18L
1543
1544#define SN_sha1 "SHA1"
1545#define LN_sha1 "sha1"
1546#define NID_sha1 64
1547#define OBJ_sha1 OBJ_algorithm,26L
1548
1549#define SN_dsaWithSHA1_2 "DSA-SHA1-old"
1550#define LN_dsaWithSHA1_2 "dsaWithSHA1-old"
1551#define NID_dsaWithSHA1_2 70
1552#define OBJ_dsaWithSHA1_2 OBJ_algorithm,27L
1553
1554#define SN_sha1WithRSA "RSA-SHA1-2"
1555#define LN_sha1WithRSA "sha1WithRSA"
1556#define NID_sha1WithRSA 115
1557#define OBJ_sha1WithRSA OBJ_algorithm,29L
1558
1559#define SN_ripemd160 "RIPEMD160"
1560#define LN_ripemd160 "ripemd160"
1561#define NID_ripemd160 117
1562#define OBJ_ripemd160 1L,3L,36L,3L,2L,1L
1563
1564#define SN_ripemd160WithRSA "RSA-RIPEMD160"
1565#define LN_ripemd160WithRSA "ripemd160WithRSA"
1566#define NID_ripemd160WithRSA 119
1567#define OBJ_ripemd160WithRSA 1L,3L,36L,3L,3L,1L,2L
1568
1569#define SN_sxnet "SXNetID"
1570#define LN_sxnet "Strong Extranet ID"
1571#define NID_sxnet 143
1572#define OBJ_sxnet 1L,3L,101L,1L,4L,1L
1573
1574#define SN_X500 "X500"
1575#define LN_X500 "directory services (X.500)"
1576#define NID_X500 11
1577#define OBJ_X500 2L,5L
1578
1579#define SN_X509 "X509"
1580#define NID_X509 12
1581#define OBJ_X509 OBJ_X500,4L
1582
1583#define SN_commonName "CN"
1584#define LN_commonName "commonName"
1585#define NID_commonName 13
1586#define OBJ_commonName OBJ_X509,3L
1587
1588#define SN_surname "SN"
1589#define LN_surname "surname"
1590#define NID_surname 100
1591#define OBJ_surname OBJ_X509,4L
1592
1593#define LN_serialNumber "serialNumber"
1594#define NID_serialNumber 105
1595#define OBJ_serialNumber OBJ_X509,5L
1596
1597#define SN_countryName "C"
1598#define LN_countryName "countryName"
1599#define NID_countryName 14
1600#define OBJ_countryName OBJ_X509,6L
1601
1602#define SN_localityName "L"
1603#define LN_localityName "localityName"
1604#define NID_localityName 15
1605#define OBJ_localityName OBJ_X509,7L
1606
1607#define SN_stateOrProvinceName "ST"
1608#define LN_stateOrProvinceName "stateOrProvinceName"
1609#define NID_stateOrProvinceName 16
1610#define OBJ_stateOrProvinceName OBJ_X509,8L
1611
1612#define SN_organizationName "O"
1613#define LN_organizationName "organizationName"
1614#define NID_organizationName 17
1615#define OBJ_organizationName OBJ_X509,10L
1616
1617#define SN_organizationalUnitName "OU"
1618#define LN_organizationalUnitName "organizationalUnitName"
1619#define NID_organizationalUnitName 18
1620#define OBJ_organizationalUnitName OBJ_X509,11L
1621
1622#define LN_title "title"
1623#define NID_title 106
1624#define OBJ_title OBJ_X509,12L
1625
1626#define LN_description "description"
1627#define NID_description 107
1628#define OBJ_description OBJ_X509,13L
1629
1630#define SN_name "name"
1631#define LN_name "name"
1632#define NID_name 173
1633#define OBJ_name OBJ_X509,41L
1634
1635#define SN_givenName "gn"
1636#define LN_givenName "givenName"
1637#define NID_givenName 99
1638#define OBJ_givenName OBJ_X509,42L
1639
1640#define LN_initials "initials"
1641#define NID_initials 101
1642#define OBJ_initials OBJ_X509,43L
1643
1644#define LN_generationQualifier "generationQualifier"
1645#define NID_generationQualifier 509
1646#define OBJ_generationQualifier OBJ_X509,44L
1647
1648#define LN_x500UniqueIdentifier "x500UniqueIdentifier"
1649#define NID_x500UniqueIdentifier 503
1650#define OBJ_x500UniqueIdentifier OBJ_X509,45L
1651
1652#define SN_dnQualifier "dnQualifier"
1653#define LN_dnQualifier "dnQualifier"
1654#define NID_dnQualifier 174
1655#define OBJ_dnQualifier OBJ_X509,46L
1656
1657#define SN_role "role"
1658#define LN_role "role"
1659#define NID_role 400
1660#define OBJ_role OBJ_X509,72L
1661
1662#define SN_X500algorithms "X500algorithms"
1663#define LN_X500algorithms "directory services - algorithms"
1664#define NID_X500algorithms 378
1665#define OBJ_X500algorithms OBJ_X500,8L
1666
1667#define SN_rsa "RSA"
1668#define LN_rsa "rsa"
1669#define NID_rsa 19
1670#define OBJ_rsa OBJ_X500algorithms,1L,1L
1671
1672#define SN_mdc2WithRSA "RSA-MDC2"
1673#define LN_mdc2WithRSA "mdc2WithRSA"
1674#define NID_mdc2WithRSA 96
1675#define OBJ_mdc2WithRSA OBJ_X500algorithms,3L,100L
1676
1677#define SN_mdc2 "MDC2"
1678#define LN_mdc2 "mdc2"
1679#define NID_mdc2 95
1680#define OBJ_mdc2 OBJ_X500algorithms,3L,101L
1681
1682#define SN_id_ce "id-ce"
1683#define NID_id_ce 81
1684#define OBJ_id_ce OBJ_X500,29L
1685
1686#define SN_subject_key_identifier "subjectKeyIdentifier"
1687#define LN_subject_key_identifier "X509v3 Subject Key Identifier"
1688#define NID_subject_key_identifier 82
1689#define OBJ_subject_key_identifier OBJ_id_ce,14L
1690
1691#define SN_key_usage "keyUsage"
1692#define LN_key_usage "X509v3 Key Usage"
1693#define NID_key_usage 83
1694#define OBJ_key_usage OBJ_id_ce,15L
1695
1696#define SN_private_key_usage_period "privateKeyUsagePeriod"
1697#define LN_private_key_usage_period "X509v3 Private Key Usage Period"
1698#define NID_private_key_usage_period 84
1699#define OBJ_private_key_usage_period OBJ_id_ce,16L
1700
1701#define SN_subject_alt_name "subjectAltName"
1702#define LN_subject_alt_name "X509v3 Subject Alternative Name"
1703#define NID_subject_alt_name 85
1704#define OBJ_subject_alt_name OBJ_id_ce,17L
1705
1706#define SN_issuer_alt_name "issuerAltName"
1707#define LN_issuer_alt_name "X509v3 Issuer Alternative Name"
1708#define NID_issuer_alt_name 86
1709#define OBJ_issuer_alt_name OBJ_id_ce,18L
1710
1711#define SN_basic_constraints "basicConstraints"
1712#define LN_basic_constraints "X509v3 Basic Constraints"
1713#define NID_basic_constraints 87
1714#define OBJ_basic_constraints OBJ_id_ce,19L
1715
1716#define SN_crl_number "crlNumber"
1717#define LN_crl_number "X509v3 CRL Number"
1718#define NID_crl_number 88
1719#define OBJ_crl_number OBJ_id_ce,20L
1720
1721#define SN_crl_reason "CRLReason"
1722#define LN_crl_reason "X509v3 CRL Reason Code"
1723#define NID_crl_reason 141
1724#define OBJ_crl_reason OBJ_id_ce,21L
1725
1726#define SN_invalidity_date "invalidityDate"
1727#define LN_invalidity_date "Invalidity Date"
1728#define NID_invalidity_date 142
1729#define OBJ_invalidity_date OBJ_id_ce,24L
1730
1731#define SN_delta_crl "deltaCRL"
1732#define LN_delta_crl "X509v3 Delta CRL Indicator"
1733#define NID_delta_crl 140
1734#define OBJ_delta_crl OBJ_id_ce,27L
1735
1736#define SN_crl_distribution_points "crlDistributionPoints"
1737#define LN_crl_distribution_points "X509v3 CRL Distribution Points"
1738#define NID_crl_distribution_points 103
1739#define OBJ_crl_distribution_points OBJ_id_ce,31L
1740
1741#define SN_certificate_policies "certificatePolicies"
1742#define LN_certificate_policies "X509v3 Certificate Policies"
1743#define NID_certificate_policies 89
1744#define OBJ_certificate_policies OBJ_id_ce,32L
1745
1746#define SN_authority_key_identifier "authorityKeyIdentifier"
1747#define LN_authority_key_identifier "X509v3 Authority Key Identifier"
1748#define NID_authority_key_identifier 90
1749#define OBJ_authority_key_identifier OBJ_id_ce,35L
1750
1751#define SN_policy_constraints "policyConstraints"
1752#define LN_policy_constraints "X509v3 Policy Constraints"
1753#define NID_policy_constraints 401
1754#define OBJ_policy_constraints OBJ_id_ce,36L
1755
1756#define SN_ext_key_usage "extendedKeyUsage"
1757#define LN_ext_key_usage "X509v3 Extended Key Usage"
1758#define NID_ext_key_usage 126
1759#define OBJ_ext_key_usage OBJ_id_ce,37L
1760
1761#define SN_target_information "targetInformation"
1762#define LN_target_information "X509v3 AC Targeting"
1763#define NID_target_information 402
1764#define OBJ_target_information OBJ_id_ce,55L
1765
1766#define SN_no_rev_avail "noRevAvail"
1767#define LN_no_rev_avail "X509v3 No Revocation Available"
1768#define NID_no_rev_avail 403
1769#define OBJ_no_rev_avail OBJ_id_ce,56L
1770
1771#define SN_netscape "Netscape"
1772#define LN_netscape "Netscape Communications Corp."
1773#define NID_netscape 57
1774#define OBJ_netscape 2L,16L,840L,1L,113730L
1775
1776#define SN_netscape_cert_extension "nsCertExt"
1777#define LN_netscape_cert_extension "Netscape Certificate Extension"
1778#define NID_netscape_cert_extension 58
1779#define OBJ_netscape_cert_extension OBJ_netscape,1L
1780
1781#define SN_netscape_data_type "nsDataType"
1782#define LN_netscape_data_type "Netscape Data Type"
1783#define NID_netscape_data_type 59
1784#define OBJ_netscape_data_type OBJ_netscape,2L
1785
1786#define SN_netscape_cert_type "nsCertType"
1787#define LN_netscape_cert_type "Netscape Cert Type"
1788#define NID_netscape_cert_type 71
1789#define OBJ_netscape_cert_type OBJ_netscape_cert_extension,1L
1790
1791#define SN_netscape_base_url "nsBaseUrl"
1792#define LN_netscape_base_url "Netscape Base Url"
1793#define NID_netscape_base_url 72
1794#define OBJ_netscape_base_url OBJ_netscape_cert_extension,2L
1795
1796#define SN_netscape_revocation_url "nsRevocationUrl"
1797#define LN_netscape_revocation_url "Netscape Revocation Url"
1798#define NID_netscape_revocation_url 73
1799#define OBJ_netscape_revocation_url OBJ_netscape_cert_extension,3L
1800
1801#define SN_netscape_ca_revocation_url "nsCaRevocationUrl"
1802#define LN_netscape_ca_revocation_url "Netscape CA Revocation Url"
1803#define NID_netscape_ca_revocation_url 74
1804#define OBJ_netscape_ca_revocation_url OBJ_netscape_cert_extension,4L
1805
1806#define SN_netscape_renewal_url "nsRenewalUrl"
1807#define LN_netscape_renewal_url "Netscape Renewal Url"
1808#define NID_netscape_renewal_url 75
1809#define OBJ_netscape_renewal_url OBJ_netscape_cert_extension,7L
1810
1811#define SN_netscape_ca_policy_url "nsCaPolicyUrl"
1812#define LN_netscape_ca_policy_url "Netscape CA Policy Url"
1813#define NID_netscape_ca_policy_url 76
1814#define OBJ_netscape_ca_policy_url OBJ_netscape_cert_extension,8L
1815
1816#define SN_netscape_ssl_server_name "nsSslServerName"
1817#define LN_netscape_ssl_server_name "Netscape SSL Server Name"
1818#define NID_netscape_ssl_server_name 77
1819#define OBJ_netscape_ssl_server_name OBJ_netscape_cert_extension,12L
1820
1821#define SN_netscape_comment "nsComment"
1822#define LN_netscape_comment "Netscape Comment"
1823#define NID_netscape_comment 78
1824#define OBJ_netscape_comment OBJ_netscape_cert_extension,13L
1825
1826#define SN_netscape_cert_sequence "nsCertSequence"
1827#define LN_netscape_cert_sequence "Netscape Certificate Sequence"
1828#define NID_netscape_cert_sequence 79
1829#define OBJ_netscape_cert_sequence OBJ_netscape_data_type,5L
1830
1831#define SN_ns_sgc "nsSGC"
1832#define LN_ns_sgc "Netscape Server Gated Crypto"
1833#define NID_ns_sgc 139
1834#define OBJ_ns_sgc OBJ_netscape,4L,1L
1835
1836#define SN_org "ORG"
1837#define LN_org "org"
1838#define NID_org 379
1839#define OBJ_org OBJ_iso,3L
1840
1841#define SN_dod "DOD"
1842#define LN_dod "dod"
1843#define NID_dod 380
1844#define OBJ_dod OBJ_org,6L
1845
1846#define SN_iana "IANA"
1847#define LN_iana "iana"
1848#define NID_iana 381
1849#define OBJ_iana OBJ_dod,1L
1850
1851#define OBJ_internet OBJ_iana
1852
1853#define SN_Directory "directory"
1854#define LN_Directory "Directory"
1855#define NID_Directory 382
1856#define OBJ_Directory OBJ_internet,1L
1857
1858#define SN_Management "mgmt"
1859#define LN_Management "Management"
1860#define NID_Management 383
1861#define OBJ_Management OBJ_internet,2L
1862
1863#define SN_Experimental "experimental"
1864#define LN_Experimental "Experimental"
1865#define NID_Experimental 384
1866#define OBJ_Experimental OBJ_internet,3L
1867
1868#define SN_Private "private"
1869#define LN_Private "Private"
1870#define NID_Private 385
1871#define OBJ_Private OBJ_internet,4L
1872
1873#define SN_Security "security"
1874#define LN_Security "Security"
1875#define NID_Security 386
1876#define OBJ_Security OBJ_internet,5L
1877
1878#define SN_SNMPv2 "snmpv2"
1879#define LN_SNMPv2 "SNMPv2"
1880#define NID_SNMPv2 387
1881#define OBJ_SNMPv2 OBJ_internet,6L
1882
1883#define LN_Mail "Mail"
1884#define NID_Mail 388
1885#define OBJ_Mail OBJ_internet,7L
1886
1887#define SN_Enterprises "enterprises"
1888#define LN_Enterprises "Enterprises"
1889#define NID_Enterprises 389
1890#define OBJ_Enterprises OBJ_Private,1L
1891
1892#define SN_dcObject "dcobject"
1893#define LN_dcObject "dcObject"
1894#define NID_dcObject 390
1895#define OBJ_dcObject OBJ_Enterprises,1466L,344L
1896
1897#define SN_mime_mhs "mime-mhs"
1898#define LN_mime_mhs "MIME MHS"
1899#define NID_mime_mhs 504
1900#define OBJ_mime_mhs OBJ_Mail,1L
1901
1902#define SN_mime_mhs_headings "mime-mhs-headings"
1903#define LN_mime_mhs_headings "mime-mhs-headings"
1904#define NID_mime_mhs_headings 505
1905#define OBJ_mime_mhs_headings OBJ_mime_mhs,1L
1906
1907#define SN_mime_mhs_bodies "mime-mhs-bodies"
1908#define LN_mime_mhs_bodies "mime-mhs-bodies"
1909#define NID_mime_mhs_bodies 506
1910#define OBJ_mime_mhs_bodies OBJ_mime_mhs,2L
1911
1912#define SN_id_hex_partial_message "id-hex-partial-message"
1913#define LN_id_hex_partial_message "id-hex-partial-message"
1914#define NID_id_hex_partial_message 507
1915#define OBJ_id_hex_partial_message OBJ_mime_mhs_headings,1L
1916
1917#define SN_id_hex_multipart_message "id-hex-multipart-message"
1918#define LN_id_hex_multipart_message "id-hex-multipart-message"
1919#define NID_id_hex_multipart_message 508
1920#define OBJ_id_hex_multipart_message OBJ_mime_mhs_headings,2L
1921
1922#define SN_rle_compression "RLE"
1923#define LN_rle_compression "run length compression"
1924#define NID_rle_compression 124
1925#define OBJ_rle_compression 1L,1L,1L,1L,666L,1L
1926
1927#define SN_zlib_compression "ZLIB"
1928#define LN_zlib_compression "zlib compression"
1929#define NID_zlib_compression 125
1930#define OBJ_zlib_compression 1L,1L,1L,1L,666L,2L
1931
1932#define OBJ_csor 2L,16L,840L,1L,101L,3L
1933
1934#define OBJ_nistAlgorithms OBJ_csor,4L
1935
1936#define OBJ_aes OBJ_nistAlgorithms,1L
1937
1938#define SN_aes_128_ecb "AES-128-ECB"
1939#define LN_aes_128_ecb "aes-128-ecb"
1940#define NID_aes_128_ecb 418
1941#define OBJ_aes_128_ecb OBJ_aes,1L
1942
1943#define SN_aes_128_cbc "AES-128-CBC"
1944#define LN_aes_128_cbc "aes-128-cbc"
1945#define NID_aes_128_cbc 419
1946#define OBJ_aes_128_cbc OBJ_aes,2L
1947
1948#define SN_aes_128_ofb128 "AES-128-OFB"
1949#define LN_aes_128_ofb128 "aes-128-ofb"
1950#define NID_aes_128_ofb128 420
1951#define OBJ_aes_128_ofb128 OBJ_aes,3L
1952
1953#define SN_aes_128_cfb128 "AES-128-CFB"
1954#define LN_aes_128_cfb128 "aes-128-cfb"
1955#define NID_aes_128_cfb128 421
1956#define OBJ_aes_128_cfb128 OBJ_aes,4L
1957
1958#define SN_aes_192_ecb "AES-192-ECB"
1959#define LN_aes_192_ecb "aes-192-ecb"
1960#define NID_aes_192_ecb 422
1961#define OBJ_aes_192_ecb OBJ_aes,21L
1962
1963#define SN_aes_192_cbc "AES-192-CBC"
1964#define LN_aes_192_cbc "aes-192-cbc"
1965#define NID_aes_192_cbc 423
1966#define OBJ_aes_192_cbc OBJ_aes,22L
1967
1968#define SN_aes_192_ofb128 "AES-192-OFB"
1969#define LN_aes_192_ofb128 "aes-192-ofb"
1970#define NID_aes_192_ofb128 424
1971#define OBJ_aes_192_ofb128 OBJ_aes,23L
1972
1973#define SN_aes_192_cfb128 "AES-192-CFB"
1974#define LN_aes_192_cfb128 "aes-192-cfb"
1975#define NID_aes_192_cfb128 425
1976#define OBJ_aes_192_cfb128 OBJ_aes,24L
1977
1978#define SN_aes_256_ecb "AES-256-ECB"
1979#define LN_aes_256_ecb "aes-256-ecb"
1980#define NID_aes_256_ecb 426
1981#define OBJ_aes_256_ecb OBJ_aes,41L
1982
1983#define SN_aes_256_cbc "AES-256-CBC"
1984#define LN_aes_256_cbc "aes-256-cbc"
1985#define NID_aes_256_cbc 427
1986#define OBJ_aes_256_cbc OBJ_aes,42L
1987
1988#define SN_aes_256_ofb128 "AES-256-OFB"
1989#define LN_aes_256_ofb128 "aes-256-ofb"
1990#define NID_aes_256_ofb128 428
1991#define OBJ_aes_256_ofb128 OBJ_aes,43L
1992
1993#define SN_aes_256_cfb128 "AES-256-CFB"
1994#define LN_aes_256_cfb128 "aes-256-cfb"
1995#define NID_aes_256_cfb128 429
1996#define OBJ_aes_256_cfb128 OBJ_aes,44L
1997
1998#define SN_hold_instruction_code "holdInstructionCode"
1999#define LN_hold_instruction_code "Hold Instruction Code"
2000#define NID_hold_instruction_code 430
2001#define OBJ_hold_instruction_code OBJ_id_ce,23L
2002
2003#define OBJ_holdInstruction OBJ_X9_57,2L
2004
2005#define SN_hold_instruction_none "holdInstructionNone"
2006#define LN_hold_instruction_none "Hold Instruction None"
2007#define NID_hold_instruction_none 431
2008#define OBJ_hold_instruction_none OBJ_holdInstruction,1L
2009
2010#define SN_hold_instruction_call_issuer "holdInstructionCallIssuer"
2011#define LN_hold_instruction_call_issuer "Hold Instruction Call Issuer"
2012#define NID_hold_instruction_call_issuer 432
2013#define OBJ_hold_instruction_call_issuer OBJ_holdInstruction,2L
2014
2015#define SN_hold_instruction_reject "holdInstructionReject"
2016#define LN_hold_instruction_reject "Hold Instruction Reject"
2017#define NID_hold_instruction_reject 433
2018#define OBJ_hold_instruction_reject OBJ_holdInstruction,3L
2019
2020#define SN_data "data"
2021#define NID_data 434
2022#define OBJ_data OBJ_ccitt,9L
2023
2024#define SN_pss "pss"
2025#define NID_pss 435
2026#define OBJ_pss OBJ_data,2342L
2027
2028#define SN_ucl "ucl"
2029#define NID_ucl 436
2030#define OBJ_ucl OBJ_pss,19200300L
2031
2032#define SN_pilot "pilot"
2033#define NID_pilot 437
2034#define OBJ_pilot OBJ_ucl,100L
2035
2036#define LN_pilotAttributeType "pilotAttributeType"
2037#define NID_pilotAttributeType 438
2038#define OBJ_pilotAttributeType OBJ_pilot,1L
2039
2040#define LN_pilotAttributeSyntax "pilotAttributeSyntax"
2041#define NID_pilotAttributeSyntax 439
2042#define OBJ_pilotAttributeSyntax OBJ_pilot,3L
2043
2044#define LN_pilotObjectClass "pilotObjectClass"
2045#define NID_pilotObjectClass 440
2046#define OBJ_pilotObjectClass OBJ_pilot,4L
2047
2048#define LN_pilotGroups "pilotGroups"
2049#define NID_pilotGroups 441
2050#define OBJ_pilotGroups OBJ_pilot,10L
2051
2052#define LN_iA5StringSyntax "iA5StringSyntax"
2053#define NID_iA5StringSyntax 442
2054#define OBJ_iA5StringSyntax OBJ_pilotAttributeSyntax,4L
2055
2056#define LN_caseIgnoreIA5StringSyntax "caseIgnoreIA5StringSyntax"
2057#define NID_caseIgnoreIA5StringSyntax 443
2058#define OBJ_caseIgnoreIA5StringSyntax OBJ_pilotAttributeSyntax,5L
2059
2060#define LN_pilotObject "pilotObject"
2061#define NID_pilotObject 444
2062#define OBJ_pilotObject OBJ_pilotObjectClass,3L
2063
2064#define LN_pilotPerson "pilotPerson"
2065#define NID_pilotPerson 445
2066#define OBJ_pilotPerson OBJ_pilotObjectClass,4L
2067
2068#define SN_account "account"
2069#define NID_account 446
2070#define OBJ_account OBJ_pilotObjectClass,5L
2071
2072#define SN_document "document"
2073#define NID_document 447
2074#define OBJ_document OBJ_pilotObjectClass,6L
2075
2076#define SN_room "room"
2077#define NID_room 448
2078#define OBJ_room OBJ_pilotObjectClass,7L
2079
2080#define LN_documentSeries "documentSeries"
2081#define NID_documentSeries 449
2082#define OBJ_documentSeries OBJ_pilotObjectClass,9L
2083
2084#define SN_Domain "domain"
2085#define LN_Domain "Domain"
2086#define NID_Domain 392
2087#define OBJ_Domain OBJ_pilotObjectClass,13L
2088
2089#define LN_rFC822localPart "rFC822localPart"
2090#define NID_rFC822localPart 450
2091#define OBJ_rFC822localPart OBJ_pilotObjectClass,14L
2092
2093#define LN_dNSDomain "dNSDomain"
2094#define NID_dNSDomain 451
2095#define OBJ_dNSDomain OBJ_pilotObjectClass,15L
2096
2097#define LN_domainRelatedObject "domainRelatedObject"
2098#define NID_domainRelatedObject 452
2099#define OBJ_domainRelatedObject OBJ_pilotObjectClass,17L
2100
2101#define LN_friendlyCountry "friendlyCountry"
2102#define NID_friendlyCountry 453
2103#define OBJ_friendlyCountry OBJ_pilotObjectClass,18L
2104
2105#define LN_simpleSecurityObject "simpleSecurityObject"
2106#define NID_simpleSecurityObject 454
2107#define OBJ_simpleSecurityObject OBJ_pilotObjectClass,19L
2108
2109#define LN_pilotOrganization "pilotOrganization"
2110#define NID_pilotOrganization 455
2111#define OBJ_pilotOrganization OBJ_pilotObjectClass,20L
2112
2113#define LN_pilotDSA "pilotDSA"
2114#define NID_pilotDSA 456
2115#define OBJ_pilotDSA OBJ_pilotObjectClass,21L
2116
2117#define LN_qualityLabelledData "qualityLabelledData"
2118#define NID_qualityLabelledData 457
2119#define OBJ_qualityLabelledData OBJ_pilotObjectClass,22L
2120
2121#define SN_userId "UID"
2122#define LN_userId "userId"
2123#define NID_userId 458
2124#define OBJ_userId OBJ_pilotAttributeType,1L
2125
2126#define LN_textEncodedORAddress "textEncodedORAddress"
2127#define NID_textEncodedORAddress 459
2128#define OBJ_textEncodedORAddress OBJ_pilotAttributeType,2L
2129
2130#define SN_rfc822Mailbox "mail"
2131#define LN_rfc822Mailbox "rfc822Mailbox"
2132#define NID_rfc822Mailbox 460
2133#define OBJ_rfc822Mailbox OBJ_pilotAttributeType,3L
2134
2135#define SN_info "info"
2136#define NID_info 461
2137#define OBJ_info OBJ_pilotAttributeType,4L
2138
2139#define LN_favouriteDrink "favouriteDrink"
2140#define NID_favouriteDrink 462
2141#define OBJ_favouriteDrink OBJ_pilotAttributeType,5L
2142
2143#define LN_roomNumber "roomNumber"
2144#define NID_roomNumber 463
2145#define OBJ_roomNumber OBJ_pilotAttributeType,6L
2146
2147#define SN_photo "photo"
2148#define NID_photo 464
2149#define OBJ_photo OBJ_pilotAttributeType,7L
2150
2151#define LN_userClass "userClass"
2152#define NID_userClass 465
2153#define OBJ_userClass OBJ_pilotAttributeType,8L
2154
2155#define SN_host "host"
2156#define NID_host 466
2157#define OBJ_host OBJ_pilotAttributeType,9L
2158
2159#define SN_manager "manager"
2160#define NID_manager 467
2161#define OBJ_manager OBJ_pilotAttributeType,10L
2162
2163#define LN_documentIdentifier "documentIdentifier"
2164#define NID_documentIdentifier 468
2165#define OBJ_documentIdentifier OBJ_pilotAttributeType,11L
2166
2167#define LN_documentTitle "documentTitle"
2168#define NID_documentTitle 469
2169#define OBJ_documentTitle OBJ_pilotAttributeType,12L
2170
2171#define LN_documentVersion "documentVersion"
2172#define NID_documentVersion 470
2173#define OBJ_documentVersion OBJ_pilotAttributeType,13L
2174
2175#define LN_documentAuthor "documentAuthor"
2176#define NID_documentAuthor 471
2177#define OBJ_documentAuthor OBJ_pilotAttributeType,14L
2178
2179#define LN_documentLocation "documentLocation"
2180#define NID_documentLocation 472
2181#define OBJ_documentLocation OBJ_pilotAttributeType,15L
2182
2183#define LN_homeTelephoneNumber "homeTelephoneNumber"
2184#define NID_homeTelephoneNumber 473
2185#define OBJ_homeTelephoneNumber OBJ_pilotAttributeType,20L
2186
2187#define SN_secretary "secretary"
2188#define NID_secretary 474
2189#define OBJ_secretary OBJ_pilotAttributeType,21L
2190
2191#define LN_otherMailbox "otherMailbox"
2192#define NID_otherMailbox 475
2193#define OBJ_otherMailbox OBJ_pilotAttributeType,22L
2194
2195#define LN_lastModifiedTime "lastModifiedTime"
2196#define NID_lastModifiedTime 476
2197#define OBJ_lastModifiedTime OBJ_pilotAttributeType,23L
2198
2199#define LN_lastModifiedBy "lastModifiedBy"
2200#define NID_lastModifiedBy 477
2201#define OBJ_lastModifiedBy OBJ_pilotAttributeType,24L
2202
2203#define SN_domainComponent "DC"
2204#define LN_domainComponent "domainComponent"
2205#define NID_domainComponent 391
2206#define OBJ_domainComponent OBJ_pilotAttributeType,25L
2207
2208#define LN_aRecord "aRecord"
2209#define NID_aRecord 478
2210#define OBJ_aRecord OBJ_pilotAttributeType,26L
2211
2212#define LN_pilotAttributeType27 "pilotAttributeType27"
2213#define NID_pilotAttributeType27 479
2214#define OBJ_pilotAttributeType27 OBJ_pilotAttributeType,27L
2215
2216#define LN_mXRecord "mXRecord"
2217#define NID_mXRecord 480
2218#define OBJ_mXRecord OBJ_pilotAttributeType,28L
2219
2220#define LN_nSRecord "nSRecord"
2221#define NID_nSRecord 481
2222#define OBJ_nSRecord OBJ_pilotAttributeType,29L
2223
2224#define LN_sOARecord "sOARecord"
2225#define NID_sOARecord 482
2226#define OBJ_sOARecord OBJ_pilotAttributeType,30L
2227
2228#define LN_cNAMERecord "cNAMERecord"
2229#define NID_cNAMERecord 483
2230#define OBJ_cNAMERecord OBJ_pilotAttributeType,31L
2231
2232#define LN_associatedDomain "associatedDomain"
2233#define NID_associatedDomain 484
2234#define OBJ_associatedDomain OBJ_pilotAttributeType,37L
2235
2236#define LN_associatedName "associatedName"
2237#define NID_associatedName 485
2238#define OBJ_associatedName OBJ_pilotAttributeType,38L
2239
2240#define LN_homePostalAddress "homePostalAddress"
2241#define NID_homePostalAddress 486
2242#define OBJ_homePostalAddress OBJ_pilotAttributeType,39L
2243
2244#define LN_personalTitle "personalTitle"
2245#define NID_personalTitle 487
2246#define OBJ_personalTitle OBJ_pilotAttributeType,40L
2247
2248#define LN_mobileTelephoneNumber "mobileTelephoneNumber"
2249#define NID_mobileTelephoneNumber 488
2250#define OBJ_mobileTelephoneNumber OBJ_pilotAttributeType,41L
2251
2252#define LN_pagerTelephoneNumber "pagerTelephoneNumber"
2253#define NID_pagerTelephoneNumber 489
2254#define OBJ_pagerTelephoneNumber OBJ_pilotAttributeType,42L
2255
2256#define LN_friendlyCountryName "friendlyCountryName"
2257#define NID_friendlyCountryName 490
2258#define OBJ_friendlyCountryName OBJ_pilotAttributeType,43L
2259
2260#define LN_organizationalStatus "organizationalStatus"
2261#define NID_organizationalStatus 491
2262#define OBJ_organizationalStatus OBJ_pilotAttributeType,45L
2263
2264#define LN_janetMailbox "janetMailbox"
2265#define NID_janetMailbox 492
2266#define OBJ_janetMailbox OBJ_pilotAttributeType,46L
2267
2268#define LN_mailPreferenceOption "mailPreferenceOption"
2269#define NID_mailPreferenceOption 493
2270#define OBJ_mailPreferenceOption OBJ_pilotAttributeType,47L
2271
2272#define LN_buildingName "buildingName"
2273#define NID_buildingName 494
2274#define OBJ_buildingName OBJ_pilotAttributeType,48L
2275
2276#define LN_dSAQuality "dSAQuality"
2277#define NID_dSAQuality 495
2278#define OBJ_dSAQuality OBJ_pilotAttributeType,49L
2279
2280#define LN_singleLevelQuality "singleLevelQuality"
2281#define NID_singleLevelQuality 496
2282#define OBJ_singleLevelQuality OBJ_pilotAttributeType,50L
2283
2284#define LN_subtreeMinimumQuality "subtreeMinimumQuality"
2285#define NID_subtreeMinimumQuality 497
2286#define OBJ_subtreeMinimumQuality OBJ_pilotAttributeType,51L
2287
2288#define LN_subtreeMaximumQuality "subtreeMaximumQuality"
2289#define NID_subtreeMaximumQuality 498
2290#define OBJ_subtreeMaximumQuality OBJ_pilotAttributeType,52L
2291
2292#define LN_personalSignature "personalSignature"
2293#define NID_personalSignature 499
2294#define OBJ_personalSignature OBJ_pilotAttributeType,53L
2295
2296#define LN_dITRedirect "dITRedirect"
2297#define NID_dITRedirect 500
2298#define OBJ_dITRedirect OBJ_pilotAttributeType,54L
2299
2300#define SN_audio "audio"
2301#define NID_audio 501
2302#define OBJ_audio OBJ_pilotAttributeType,55L
2303
2304#define LN_documentPublisher "documentPublisher"
2305#define NID_documentPublisher 502
2306#define OBJ_documentPublisher OBJ_pilotAttributeType,56L
2307
diff --git a/src/lib/libcrypto/opensslv.h b/src/lib/libcrypto/opensslv.h
index f45afe09f3..0d23a02fb2 100644
--- a/src/lib/libcrypto/opensslv.h
+++ b/src/lib/libcrypto/opensslv.h
@@ -25,8 +25,8 @@
25 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for 25 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
26 * major minor fix final patch/beta) 26 * major minor fix final patch/beta)
27 */ 27 */
28#define OPENSSL_VERSION_NUMBER 0x00907000L 28#define OPENSSL_VERSION_NUMBER 0x00907001L
29#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.7-dev XX xxx XXXX" 29#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.7-beta1 01 Jun 2002"
30#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT 30#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
31 31
32 32
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c
index 270892d72b..d96ecf6940 100644
--- a/src/lib/libcrypto/pem/pem_pkey.c
+++ b/src/lib/libcrypto/pem/pem_pkey.c
@@ -85,6 +85,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo
85 else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) { 85 else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) {
86 PKCS8_PRIV_KEY_INFO *p8inf; 86 PKCS8_PRIV_KEY_INFO *p8inf;
87 p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len); 87 p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);
88 if(!p8inf) goto p8err;
88 ret = EVP_PKCS82PKEY(p8inf); 89 ret = EVP_PKCS82PKEY(p8inf);
89 PKCS8_PRIV_KEY_INFO_free(p8inf); 90 PKCS8_PRIV_KEY_INFO_free(p8inf);
90 } else if (strcmp(nm,PEM_STRING_PKCS8) == 0) { 91 } else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {
diff --git a/src/lib/libcrypto/rand/rand_egd.c b/src/lib/libcrypto/rand/rand_egd.c
index dd490c8254..97ed12cf67 100644
--- a/src/lib/libcrypto/rand/rand_egd.c
+++ b/src/lib/libcrypto/rand/rand_egd.c
@@ -94,7 +94,7 @@
94 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. 94 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255.
95 */ 95 */
96 96
97#if defined(OPENSSL_SYS_WIN32) || defined(VMS) || defined(__VMS) 97#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
98int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) 98int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
99 { 99 {
100 return(-1); 100 return(-1);
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index d82dd15493..0eda816081 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -479,10 +479,10 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
479 int ret=0; 479 int ret=0;
480 BN_CTX *ctx; 480 BN_CTX *ctx;
481 481
482 if ((ctx=BN_CTX_new()) == NULL) goto err;
483 BN_init(&m1); 482 BN_init(&m1);
484 BN_init(&r1); 483 BN_init(&r1);
485 BN_init(&vrfy); 484 BN_init(&vrfy);
485 if ((ctx=BN_CTX_new()) == NULL) goto err;
486 486
487 if (rsa->flags & RSA_FLAG_CACHE_PRIVATE) 487 if (rsa->flags & RSA_FLAG_CACHE_PRIVATE)
488 { 488 {
diff --git a/src/lib/libcrypto/txt_db/txt_db.c b/src/lib/libcrypto/txt_db/txt_db.c
index e6334d6add..9b186f2da5 100644
--- a/src/lib/libcrypto/txt_db/txt_db.c
+++ b/src/lib/libcrypto/txt_db/txt_db.c
@@ -122,7 +122,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
122 else 122 else
123 { 123 {
124 buf->data[offset-1]='\0'; /* blat the '\n' */ 124 buf->data[offset-1]='\0'; /* blat the '\n' */
125 p=(char *)OPENSSL_malloc(add+offset); 125 if (!(p=(char *)OPENSSL_malloc(add+offset))) goto err;
126 offset=0; 126 offset=0;
127 } 127 }
128 pp=(char **)p; 128 pp=(char **)p;
diff --git a/src/lib/libcrypto/util/domd b/src/lib/libcrypto/util/domd
index aa99cb0523..8cbe383c16 100644
--- a/src/lib/libcrypto/util/domd
+++ b/src/lib/libcrypto/util/domd
@@ -18,11 +18,11 @@ if [ "$MAKEDEPEND" = "gcc" ]; then
18 sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp 18 sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
19 echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp 19 echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
20 gcc -D OPENSSL_DOING_MAKEDEPEND -M $@ >> Makefile.tmp 20 gcc -D OPENSSL_DOING_MAKEDEPEND -M $@ >> Makefile.tmp
21 perl $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new 21 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
22 rm -f Makefile.tmp 22 rm -f Makefile.tmp
23else 23else
24 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@ 24 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@
25 perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new 25 ${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
26fi 26fi
27mv Makefile.new Makefile.ssl 27mv Makefile.new Makefile.ssl
28# unfake the presence of Kerberos 28# unfake the presence of Kerberos
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index b74749e5de..4845158158 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -2774,3 +2774,9 @@ AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES
2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES 2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES
2775ENGINE_load_4758cca 3218 EXIST::FUNCTION: 2775ENGINE_load_4758cca 3218 EXIST::FUNCTION:
2776_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES 2776_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES
2777EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES
2778EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES
2779EVP_aes_128_cfb 3222 EXIST::FUNCTION:AES
2780EVP_aes_256_cfb 3223 EXIST::FUNCTION:AES
2781EVP_aes_128_ofb 3224 EXIST::FUNCTION:AES
2782EVP_aes_192_cfb 3225 EXIST::FUNCTION:AES
diff --git a/src/lib/libcrypto/util/mkerr.pl b/src/lib/libcrypto/util/mkerr.pl
index 6c2237d142..4105047b21 100644
--- a/src/lib/libcrypto/util/mkerr.pl
+++ b/src/lib/libcrypto/util/mkerr.pl
@@ -262,7 +262,7 @@ foreach $lib (keys %csrc)
262 } else { 262 } else {
263 push @out, 263 push @out,
264"/* ====================================================================\n", 264"/* ====================================================================\n",
265" * Copyright (c) 2001 The OpenSSL Project. All rights reserved.\n", 265" * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved.\n",
266" *\n", 266" *\n",
267" * Redistribution and use in source and binary forms, with or without\n", 267" * Redistribution and use in source and binary forms, with or without\n",
268" * modification, are permitted provided that the following conditions\n", 268" * modification, are permitted provided that the following conditions\n",
@@ -404,7 +404,7 @@ EOF
404 print OUT <<"EOF"; 404 print OUT <<"EOF";
405/* $cfile */ 405/* $cfile */
406/* ==================================================================== 406/* ====================================================================
407 * Copyright (c) 1999 The OpenSSL Project. All rights reserved. 407 * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved.
408 * 408 *
409 * Redistribution and use in source and binary forms, with or without 409 * Redistribution and use in source and binary forms, with or without
410 * modification, are permitted provided that the following conditions 410 * modification, are permitted provided that the following conditions
diff --git a/src/lib/libcrypto/util/pod2man.pl b/src/lib/libcrypto/util/pod2man.pl
index c6b64add60..657e4e264e 100644
--- a/src/lib/libcrypto/util/pod2man.pl
+++ b/src/lib/libcrypto/util/pod2man.pl
@@ -416,8 +416,8 @@ if ($name ne 'something') {
416 warn "$0: Improper man page - malformed NAME header in paragraph $. of $ARGV[0]\n" 416 warn "$0: Improper man page - malformed NAME header in paragraph $. of $ARGV[0]\n"
417 } 417 }
418 else { 418 else {
419 $n[0] =~ s/\n/ /; 419 $n[0] =~ s/\n/ /g;
420 $n[1] =~ s/\n/ /; 420 $n[1] =~ s/\n/ /g;
421 %namedesc = @n; 421 %namedesc = @n;
422 } 422 }
423 } 423 }
diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
index f3bba38269..f9414456de 100644
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ b/src/lib/libcrypto/x509v3/v3_ia5.c
@@ -82,7 +82,7 @@ static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
82{ 82{
83 char *tmp; 83 char *tmp;
84 if(!ia5 || !ia5->length) return NULL; 84 if(!ia5 || !ia5->length) return NULL;
85 tmp = OPENSSL_malloc(ia5->length + 1); 85 if (!(tmp = OPENSSL_malloc(ia5->length + 1))) return NULL;
86 memcpy(tmp, ia5->data, ia5->length); 86 memcpy(tmp, ia5->data, ia5->length);
87 tmp[ia5->length] = 0; 87 tmp[ia5->length] = 0;
88 return tmp; 88 return tmp;
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index 52ad91dbc8..ad4c18cdbd 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,5 +1,5 @@
1# Build wrapper for OpenSSL 1# Build wrapper for OpenSSL
2# $OpenBSD: Makefile,v 1.8 2002/06/01 01:35:36 deraadt Exp $ 2# $OpenBSD: Makefile,v 1.9 2002/06/07 03:45:32 beck Exp $
3 3
4# Our lndir is hacked; specify a full path to avoid potential conflicts 4# Our lndir is hacked; specify a full path to avoid potential conflicts
5# with the one installed with X11. 5# with the one installed with X11.
@@ -15,6 +15,7 @@ SSLCONF= --openssldir="${OPENSSLDIR}" OpenBSD-${MACHINE_ARCH}
15MUNGEDFILES= \ 15MUNGEDFILES= \
16 ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h \ 16 ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h \
17 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h \ 17 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h \
18 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h \
18 ${.OBJDIR}/${SSL_SRC}/Makefile.ssl \ 19 ${.OBJDIR}/${SSL_SRC}/Makefile.ssl \
19 ${.OBJDIR}/${SSL_SRC}/Makefile \ 20 ${.OBJDIR}/${SSL_SRC}/Makefile \
20 ${.OBJDIR}/${SSL_SRC}/apps/der_chop \ 21 ${.OBJDIR}/${SSL_SRC}/apps/der_chop \
@@ -924,19 +925,17 @@ includes: prereq
924 @cd ${.OBJDIR}/crypto && ${MAKE} includes 925 @cd ${.OBJDIR}/crypto && ${MAKE} includes
925 @cd ${.OBJDIR}/ssl && ${MAKE} includes 926 @cd ${.OBJDIR}/ssl && ${MAKE} includes
926 927
927prereq: ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h 928prereq: ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h
928 929
929install: maninstall 930install: maninstall
930 @cd ${.OBJDIR}/crypto && ${MAKE} install 931 @cd ${.OBJDIR}/crypto && ${MAKE} install
931 @cd ${.OBJDIR}/ssl && ${MAKE} install 932 @cd ${.OBJDIR}/ssl && ${MAKE} installq
932 933
933${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h 934${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h
934 /usr/bin/perl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.pl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h 935 /usr/bin/perl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.pl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
935# Stupid ssl 0.9.6 fucks this up completely, won't even build if you 936
936# try to regenerate obj_dat.h - even with a stock distrib. 937${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h
937#${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h.src 938 /usr/bin/perl ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.pl ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.txt ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.num ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h
938# @cp ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h.src \
939# ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
940 939
941${.OBJDIR}/${SSL_SRC}/Makefile.ssl : ${.OBJDIR}/${SSL_SRC}/Makefile.org 940${.OBJDIR}/${SSL_SRC}/Makefile.ssl : ${.OBJDIR}/${SSL_SRC}/Makefile.org
942 @cd ${.OBJDIR}/${SSL_SRC} && /usr/bin/perl Configure ${SSLCONF} 941 @cd ${.OBJDIR}/${SSL_SRC} && /usr/bin/perl Configure ${SSLCONF}
diff --git a/src/lib/libssl/src/CHANGES b/src/lib/libssl/src/CHANGES
index 500d3d481a..d63996c70d 100644
--- a/src/lib/libssl/src/CHANGES
+++ b/src/lib/libssl/src/CHANGES
@@ -4,6 +4,10 @@
4 4
5 Changes between 0.9.6d and 0.9.7 [XX xxx 2002] 5 Changes between 0.9.6d and 0.9.7 [XX xxx 2002]
6 6
7 *) Add AES modes CFB and OFB to the object database. Correct an
8 error in AES-CFB decryption.
9 [Richard Levitte]
10
7 *) Remove most calls to EVP_CIPHER_CTX_cleanup() in evp_enc.c, this 11 *) Remove most calls to EVP_CIPHER_CTX_cleanup() in evp_enc.c, this
8 allows existing EVP_CIPHER_CTX structures to be reused after 12 allows existing EVP_CIPHER_CTX structures to be reused after
9 calling EVP_*Final(). This behaviour is used by encryption 13 calling EVP_*Final(). This behaviour is used by encryption
diff --git a/src/lib/libssl/src/Configure b/src/lib/libssl/src/Configure
index f6d8a919be..0976f41f8d 100644
--- a/src/lib/libssl/src/Configure
+++ b/src/lib/libssl/src/Configure
@@ -145,8 +145,8 @@ my %table=(
145"debug-ulf", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", 145"debug-ulf", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
146"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", 146"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
147"debug-steve-linux-pseudo64", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT::dlfcn", 147"debug-steve-linux-pseudo64", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT::dlfcn",
148"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 148"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wtraditional -Wundef -Wshadow -Wid-clash-31 -Wcast-align -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
149"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 149"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wtraditional -Wundef -Wshadow -Wid-clash-31 -Wcast-align -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
150"dist", "cc:-O::(unknown)::::::", 150"dist", "cc:-O::(unknown)::::::",
151 151
152# Basic configs that should work on any (32 and less bit) box 152# Basic configs that should work on any (32 and less bit) box
@@ -169,6 +169,7 @@ my %table=(
169"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 169"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
170# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc 170# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
171"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 171"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
172"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
172# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8 173# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8
173# but keep the assembler modules. 174# but keep the assembler modules.
174"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 175"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -196,10 +197,10 @@ my %table=(
196"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", 197"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
197# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently 198# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
198# assisted with debugging of following two configs. 199# assisted with debugging of following two configs.
199"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::", 200"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
200# it's a real mess with -mcpu=ultrasparc option under Linux, but 201# it's a real mess with -mcpu=ultrasparc option under Linux, but
201# -Wa,-Av8plus should do the trick no matter what. 202# -Wa,-Av8plus should do the trick no matter what.
202"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 203"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
203# !!!Folowing can't be even tested yet!!! 204# !!!Folowing can't be even tested yet!!!
204# We have to wait till 64-bit glibc for SPARC is operational!!! 205# We have to wait till 64-bit glibc for SPARC is operational!!!
205#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:ULTRASPARC::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:", 206#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:ULTRASPARC::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
@@ -373,7 +374,7 @@ my %table=(
373"linux-k6", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k6 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 374"linux-k6", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k6 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
374"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", 375"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
375"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", 376"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
376"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 377"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
377"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", 378"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
378"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", 379"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
379"linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG:::", 380"linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG:::",
@@ -474,7 +475,7 @@ my %table=(
474 475
475# Sinix/ReliantUNIX RM400 476# Sinix/ReliantUNIX RM400
476# NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g */ 477# NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g */
477"ReliantUNIX","cc:-KPIC -g -DTERMIOS -DB_ENDIAN::-Kthread:SNI:-lsocket -lnsl -lc -L/usr/ucblib -lucb:BN_LLONG DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:reliantunix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 478"ReliantUNIX","cc:-KPIC -g -DTERMIOS -DB_ENDIAN::-Kthread:SNI:-lsocket -lnsl -lc -L/usr/ucblib -lucb:BN_LLONG DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:reliantunix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
478"SINIX","cc:-O::(unknown):SNI:-lsocket -lnsl -lc -L/usr/ucblib -lucb:RC4_INDEX RC4_CHAR:::", 479"SINIX","cc:-O::(unknown):SNI:-lsocket -lnsl -lc -L/usr/ucblib -lucb:RC4_INDEX RC4_CHAR:::",
479"SINIX-N","/usr/ucb/cc:-O2 -misaligned::(unknown)::-lucb:RC4_INDEX RC4_CHAR:::", 480"SINIX-N","/usr/ucb/cc:-O2 -misaligned::(unknown)::-lucb:RC4_INDEX RC4_CHAR:::",
480 481
@@ -507,7 +508,7 @@ my %table=(
507 508
508# Cygwin 509# Cygwin
509"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", 510"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
510"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll", 511"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll",
511 512
512# Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at> 513# Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
513"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown):::::::", 514"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown):::::::",
@@ -526,12 +527,12 @@ my %table=(
526"OpenBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 527"OpenBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
527"OpenBSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 528"OpenBSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
528"OpenBSD-vax", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 529"OpenBSD-vax", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
529"OpenBSD-hppa", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 530"OpenBSD-hppa", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
530 531
531##### MacOS X (a.k.a. Rhapsody or Darwin) setup 532##### MacOS X (a.k.a. Rhapsody or Darwin) setup
532"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", 533"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
533"darwin-ppc-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::-fPIC", 534"darwin-ppc-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
534"darwin-i386-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::-fPIC", 535"darwin-i386-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
535 536
536##### Sony NEWS-OS 4.x 537##### Sony NEWS-OS 4.x
537"newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", 538"newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
@@ -1112,6 +1113,10 @@ if ($rmd160_obj =~ /\.o$/)
1112 $cflags.=" -DRMD160_ASM"; 1113 $cflags.=" -DRMD160_ASM";
1113 } 1114 }
1114 1115
1116# "Stringify" the C flags string. This permits it to be made part of a string
1117# and works as well on command lines.
1118$cflags =~ s/([\\\"])/\\\1/g;
1119
1115my $version = "unknown"; 1120my $version = "unknown";
1116my $major = "unknown"; 1121my $major = "unknown";
1117my $minor = "unknown"; 1122my $minor = "unknown";
@@ -1197,13 +1202,21 @@ while (<IN>)
1197 if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/) 1202 if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/)
1198 { 1203 {
1199 my $sotmp = $1; 1204 my $sotmp = $1;
1200 s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/ 1205 s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
1206 }
1207 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.dylib$/)
1208 {
1209 s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/;
1201 } 1210 }
1202 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) 1211 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
1203 { 1212 {
1204 my $sotmp = $1; 1213 my $sotmp = $1;
1205 s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; 1214 s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
1206 } 1215 }
1216 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
1217 {
1218 s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
1219 }
1207 s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/; 1220 s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
1208 print OUT $_."\n"; 1221 print OUT $_."\n";
1209 } 1222 }
diff --git a/src/lib/libssl/src/Makefile.org b/src/lib/libssl/src/Makefile.org
index 50120ff207..799c370cb6 100644
--- a/src/lib/libssl/src/Makefile.org
+++ b/src/lib/libssl/src/Makefile.org
@@ -734,18 +734,20 @@ install_docs:
734 fn=`basename $$i .pod`; \ 734 fn=`basename $$i .pod`; \
735 if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ 735 if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
736 echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ 736 echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
737 (cd `dirname $$i`; \ 737 (cd `$(PERL) util/dirname.pl $$i`; \
738 $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ 738 sh -c "`cd ../../util; ./pod2mantest ignore` \
739 --release=$(VERSION) `basename $$i` \ 739 --section=$$sec --center=OpenSSL \
740 --release=$(VERSION) `basename $$i`") \
740 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \ 741 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
741 done 742 done
742 @for i in doc/crypto/*.pod doc/ssl/*.pod; do \ 743 @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
743 fn=`basename $$i .pod`; \ 744 fn=`basename $$i .pod`; \
744 if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ 745 if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
745 echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ 746 echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
746 (cd `dirname $$i`; \ 747 (cd `$(PERL) util/dirname.pl $$i`; \
747 $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ 748 sh -c "`cd ../../util; ./pod2mantest ignore` \
748 --release=$(VERSION) `basename $$i` \ 749 --section=$$sec --center=OpenSSL \
750 --release=$(VERSION) `basename $$i`") \
749 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \ 751 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
750 done 752 done
751 753
diff --git a/src/lib/libssl/src/README b/src/lib/libssl/src/README
index cd96ae2d40..8933063c1d 100644
--- a/src/lib/libssl/src/README
+++ b/src/lib/libssl/src/README
@@ -1,5 +1,5 @@
1 1
2 OpenSSL 0.9.7-dev XX xxx XXXX 2 OpenSSL 0.9.7-beta1 01 Jun 2002
3 3
4 Copyright (c) 1998-2002 The OpenSSL Project 4 Copyright (c) 1998-2002 The OpenSSL Project
5 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson 5 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/src/lib/libssl/src/STATUS b/src/lib/libssl/src/STATUS
index 2b285d1db5..0b752ecc08 100644
--- a/src/lib/libssl/src/STATUS
+++ b/src/lib/libssl/src/STATUS
@@ -1,10 +1,11 @@
1 1
2 OpenSSL STATUS Last modified at 2 OpenSSL STATUS Last modified at
3 ______________ $Date: 2002/05/21 01:49:11 $ 3 ______________ $Date: 2002/06/07 03:45:33 $
4 4
5 DEVELOPMENT STATE 5 DEVELOPMENT STATE
6 6
7 o OpenSSL 0.9.7: Under development... 7 o OpenSSL 0.9.8: Under development...
8 o OpenSSL 0.9.7-beta1: Released on June 1st, 2002
8 o OpenSSL 0.9.6d: Released on May 9th, 2002 9 o OpenSSL 0.9.6d: Released on May 9th, 2002
9 o OpenSSL 0.9.6c: Released on December 21st, 2001 10 o OpenSSL 0.9.6c: Released on December 21st, 2001
10 o OpenSSL 0.9.6b: Released on July 9th, 2001 11 o OpenSSL 0.9.6b: Released on July 9th, 2001
@@ -58,9 +59,6 @@
58 59
59 OPEN ISSUES 60 OPEN ISSUES
60 61
61 o Do we want the EVP API changes in 0.9.7?
62 Can compatibility be improved?
63
64 o The Makefile hierarchy and build mechanism is still not a round thing: 62 o The Makefile hierarchy and build mechanism is still not a round thing:
65 63
66 1. The config vs. Configure scripts 64 1. The config vs. Configure scripts
diff --git a/src/lib/libssl/src/TABLE b/src/lib/libssl/src/TABLE
index 8ca5309e4d..954c0fc553 100644
--- a/src/lib/libssl/src/TABLE
+++ b/src/lib/libssl/src/TABLE
@@ -1,3 +1,4 @@
1Output of `Configure TABLE':
1 2
2*** BC-16 3*** BC-16
3$cc = bcc 4$cc = bcc
@@ -79,15 +80,15 @@ $thread_cflag =
79$sys_id = CYGWIN32 80$sys_id = CYGWIN32
80$lflags = 81$lflags =
81$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 82$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
82$bn_obj = 83$bn_obj = asm/bn86-out.o asm/co86-out.o
83$des_obj = 84$des_obj = asm/dx86-out.o asm/yx86-out.o
84$bf_obj = 85$bf_obj = asm/bx86-out.o
85$md5_obj = 86$md5_obj = asm/mx86-out.o
86$sha1_obj = 87$sha1_obj = asm/sx86-out.o
87$cast_obj = 88$cast_obj = asm/cx86-out.o
88$rc4_obj = 89$rc4_obj = asm/rx86-out.o
89$rmd160_obj = 90$rmd160_obj = asm/rm86-out.o
90$rc5_obj = 91$rc5_obj = asm/r586-out.o
91$dso_scheme = win32 92$dso_scheme = win32
92$shared_target= cygwin-shared 93$shared_target= cygwin-shared
93$shared_cflag = 94$shared_cflag =
@@ -427,8 +428,8 @@ $rc5_obj =
427$dso_scheme = dlfcn 428$dso_scheme = dlfcn
428$shared_target= bsd-gcc-shared 429$shared_target= bsd-gcc-shared
429$shared_cflag = -fPIC 430$shared_cflag = -fPIC
430$shared_ldflag = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 431$shared_ldflag =
431$shared_extension = 432$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
432$ranlib = 433$ranlib =
433 434
434*** OpenBSD-i386 435*** OpenBSD-i386
@@ -739,8 +740,8 @@ $rc5_obj =
739$dso_scheme = dlfcn 740$dso_scheme = dlfcn
740$shared_target= reliantunix-shared 741$shared_target= reliantunix-shared
741$shared_cflag = 742$shared_cflag =
742$shared_ldflag = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 743$shared_ldflag =
743$shared_extension = 744$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
744$ranlib = 745$ranlib =
745 746
746*** SINIX 747*** SINIX
@@ -1289,10 +1290,10 @@ $rc4_obj =
1289$rmd160_obj = 1290$rmd160_obj =
1290$rc5_obj = 1291$rc5_obj =
1291$dso_scheme = 1292$dso_scheme =
1292$shared_target= 1293$shared_target= darwin-shared
1293$shared_cflag = -fPIC 1294$shared_cflag = -fPIC
1294$shared_ldflag = 1295$shared_ldflag =
1295$shared_extension = 1296$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
1296$ranlib = 1297$ranlib =
1297 1298
1298*** darwin-ppc-cc 1299*** darwin-ppc-cc
@@ -1315,8 +1316,8 @@ $rc5_obj =
1315$dso_scheme = 1316$dso_scheme =
1316$shared_target= darwin-shared 1317$shared_target= darwin-shared
1317$shared_cflag = -fPIC 1318$shared_cflag = -fPIC
1318$shared_ldflag = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib 1319$shared_ldflag =
1319$shared_extension = 1320$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
1320$ranlib = 1321$ranlib =
1321 1322
1322*** debug 1323*** debug
@@ -1489,7 +1490,7 @@ $ranlib =
1489 1490
1490*** debug-levitte-linux-elf 1491*** debug-levitte-linux-elf
1491$cc = gcc 1492$cc = gcc
1492$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe 1493$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wtraditional -Wundef -Wshadow -Wid-clash-31 -Wcast-align -Wconversion -Wno-long-long -pipe
1493$unistd = 1494$unistd =
1494$thread_cflag = -D_REENTRANT 1495$thread_cflag = -D_REENTRANT
1495$sys_id = 1496$sys_id =
@@ -1513,7 +1514,7 @@ $ranlib =
1513 1514
1514*** debug-levitte-linux-noasm 1515*** debug-levitte-linux-noasm
1515$cc = gcc 1516$cc = gcc
1516$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe 1517$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wtraditional -Wundef -Wshadow -Wid-clash-31 -Wcast-align -Wconversion -Wno-long-long -pipe
1517$unistd = 1518$unistd =
1518$thread_cflag = -D_REENTRANT 1519$thread_cflag = -D_REENTRANT
1519$sys_id = 1520$sys_id =
@@ -1555,8 +1556,8 @@ $rc5_obj = asm/r586-elf.o
1555$dso_scheme = dlfcn 1556$dso_scheme = dlfcn
1556$shared_target= linux-shared 1557$shared_target= linux-shared
1557$shared_cflag = -fPIC 1558$shared_cflag = -fPIC
1558$shared_ldflag = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 1559$shared_ldflag =
1559$shared_extension = 1560$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
1560$ranlib = 1561$ranlib =
1561 1562
1562*** debug-linux-elf-noefence 1563*** debug-linux-elf-noefence
@@ -1775,6 +1776,30 @@ $shared_ldflag =
1775$shared_extension = 1776$shared_extension =
1776$ranlib = 1777$ranlib =
1777 1778
1779*** debug-steve-linux-pseudo64
1780$cc = gcc
1781$cflags = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe
1782$unistd =
1783$thread_cflag = -D_REENTRANT
1784$sys_id =
1785$lflags = -rdynamic -ldl
1786$bn_ops = SIXTY_FOUR_BIT
1787$bn_obj =
1788$des_obj = dlfcn
1789$bf_obj =
1790$md5_obj =
1791$sha1_obj =
1792$cast_obj =
1793$rc4_obj =
1794$rmd160_obj =
1795$rc5_obj =
1796$dso_scheme =
1797$shared_target=
1798$shared_cflag =
1799$shared_ldflag =
1800$shared_extension =
1801$ranlib =
1802
1778*** debug-ulf 1803*** debug-ulf
1779$cc = gcc 1804$cc = gcc
1780$cflags = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe 1805$cflags = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe
@@ -2981,7 +3006,7 @@ $cflags = -mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV
2981$unistd = 3006$unistd =
2982$thread_cflag = -D_REENTRANT 3007$thread_cflag = -D_REENTRANT
2983$sys_id = 3008$sys_id =
2984$lflags = 3009$lflags = -ldl
2985$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR 3010$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
2986$bn_obj = asm/sparcv8.o 3011$bn_obj = asm/sparcv8.o
2987$des_obj = 3012$des_obj =
@@ -2992,11 +3017,11 @@ $cast_obj =
2992$rc4_obj = 3017$rc4_obj =
2993$rmd160_obj = 3018$rmd160_obj =
2994$rc5_obj = 3019$rc5_obj =
2995$dso_scheme = 3020$dso_scheme = dlfcn
2996$shared_target= 3021$shared_target= linux-shared
2997$shared_cflag = 3022$shared_cflag = -fPIC
2998$shared_ldflag = 3023$shared_ldflag =
2999$shared_extension = 3024$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
3000$ranlib = 3025$ranlib =
3001 3026
3002*** linux-sparcv9 3027*** linux-sparcv9
@@ -3005,7 +3030,7 @@ $cflags = -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -W
3005$unistd = 3030$unistd =
3006$thread_cflag = -D_REENTRANT 3031$thread_cflag = -D_REENTRANT
3007$sys_id = ULTRASPARC 3032$sys_id = ULTRASPARC
3008$lflags = 3033$lflags = -ldl
3009$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR 3034$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
3010$bn_obj = asm/sparcv8plus.o 3035$bn_obj = asm/sparcv8plus.o
3011$des_obj = 3036$des_obj =
@@ -3019,8 +3044,8 @@ $rc5_obj =
3019$dso_scheme = dlfcn 3044$dso_scheme = dlfcn
3020$shared_target= linux-shared 3045$shared_target= linux-shared
3021$shared_cflag = -fPIC 3046$shared_cflag = -fPIC
3022$shared_ldflag = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 3047$shared_ldflag =
3023$shared_extension = 3048$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
3024$ranlib = 3049$ranlib =
3025 3050
3026*** ncr-scde 3051*** ncr-scde
@@ -3599,6 +3624,30 @@ $shared_ldflag =
3599$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 3624$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
3600$ranlib = 3625$ranlib =
3601 3626
3627*** solaris64-sparcv9-gcc31
3628$cc = gcc
3629$cflags = -mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN
3630$unistd =
3631$thread_cflag = -D_REENTRANT
3632$sys_id = ULTRASPARC
3633$lflags = -lsocket -lnsl -ldl
3634$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR
3635$bn_obj =
3636$des_obj =
3637$bf_obj =
3638$md5_obj = asm/md5-sparcv9.o
3639$sha1_obj =
3640$cast_obj =
3641$rc4_obj =
3642$rmd160_obj =
3643$rc5_obj =
3644$dso_scheme = dlfcn
3645$shared_target= solaris-shared
3646$shared_cflag = -fPIC
3647$shared_ldflag =
3648$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
3649$ranlib =
3650
3602*** sunos-gcc 3651*** sunos-gcc
3603$cc = gcc 3652$cc = gcc
3604$cflags = -O3 -mv8 -Dssize_t=int 3653$cflags = -O3 -mv8 -Dssize_t=int
diff --git a/src/lib/libssl/src/apps/Makefile.ssl b/src/lib/libssl/src/apps/Makefile.ssl
index 1d658d4e39..7e471cf992 100644
--- a/src/lib/libssl/src/apps/Makefile.ssl
+++ b/src/lib/libssl/src/apps/Makefile.ssl
@@ -14,7 +14,6 @@ MAKE= make -f Makefile.ssl
14MAKEDEPPROG= makedepend 14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) 15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile.ssl 16MAKEFILE= Makefile.ssl
17PERL= perl
18RM= rm -f 17RM= rm -f
19# KRB5 stuff 18# KRB5 stuff
20KRB5_INCLUDES= 19KRB5_INCLUDES=
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c
index e797796e30..aca750b1f0 100644
--- a/src/lib/libssl/src/apps/apps.c
+++ b/src/lib/libssl/src/apps/apps.c
@@ -310,9 +310,16 @@ void program_name(char *in, char *out, int size)
310 310
311 q=strrchr(p,'.'); 311 q=strrchr(p,'.');
312 if (q == NULL) 312 if (q == NULL)
313 q = in+size; 313 q = p + strlen(p);
314 strncpy(out,p,q-p); 314 strncpy(out,p,size-1);
315 out[q-p]='\0'; 315 if (q-p >= size)
316 {
317 out[size-1]='\0';
318 }
319 else
320 {
321 out[q-p]='\0';
322 }
316 } 323 }
317#else 324#else
318void program_name(char *in, char *out, int size) 325void program_name(char *in, char *out, int size)
diff --git a/src/lib/libssl/src/apps/asn1pars.c b/src/lib/libssl/src/apps/asn1pars.c
index 0e6167d2d4..8f178db851 100644
--- a/src/lib/libssl/src/apps/asn1pars.c
+++ b/src/lib/libssl/src/apps/asn1pars.c
@@ -184,7 +184,7 @@ bad:
184 BIO_printf(bio_err,"where options are\n"); 184 BIO_printf(bio_err,"where options are\n");
185 BIO_printf(bio_err," -inform arg input format - one of DER TXT PEM\n"); 185 BIO_printf(bio_err," -inform arg input format - one of DER TXT PEM\n");
186 BIO_printf(bio_err," -in arg input file\n"); 186 BIO_printf(bio_err," -in arg input file\n");
187 BIO_printf(bio_err," -out arg output file\n"); 187 BIO_printf(bio_err," -out arg output file (output format is always DER\n");
188 BIO_printf(bio_err," -noout arg don't produce any output\n"); 188 BIO_printf(bio_err," -noout arg don't produce any output\n");
189 BIO_printf(bio_err," -offset arg offset into file\n"); 189 BIO_printf(bio_err," -offset arg offset into file\n");
190 BIO_printf(bio_err," -length arg length of section in file\n"); 190 BIO_printf(bio_err," -length arg length of section in file\n");
@@ -195,7 +195,6 @@ bad:
195 BIO_printf(bio_err," -strparse offset\n"); 195 BIO_printf(bio_err," -strparse offset\n");
196 BIO_printf(bio_err," a series of these can be used to 'dig' into multiple\n"); 196 BIO_printf(bio_err," a series of these can be used to 'dig' into multiple\n");
197 BIO_printf(bio_err," ASN1 blob wrappings\n"); 197 BIO_printf(bio_err," ASN1 blob wrappings\n");
198 BIO_printf(bio_err," -out filename output DER encoding to file\n");
199 goto end; 198 goto end;
200 } 199 }
201 200
diff --git a/src/lib/libssl/src/apps/makeapps.com b/src/lib/libssl/src/apps/makeapps.com
index 219f571d57..2e666368b7 100644
--- a/src/lib/libssl/src/apps/makeapps.com
+++ b/src/lib/libssl/src/apps/makeapps.com
@@ -44,6 +44,7 @@ $! keywords:
44$! 44$!
45$! UCX for UCX 45$! UCX for UCX
46$! SOCKETSHR for SOCKETSHR+NETLIB 46$! SOCKETSHR for SOCKETSHR+NETLIB
47$! TCPIP for TCPIP (post UCX)
47$! 48$!
48$! P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up) 49$! P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
49$! 50$!
@@ -963,7 +964,8 @@ $ ENDIF
963$! 964$!
964$! Time to check the contents, and to make sure we get the correct library. 965$! Time to check the contents, and to make sure we get the correct library.
965$! 966$!
966$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" 967$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
968 .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
967$ THEN 969$ THEN
968$! 970$!
969$! Check to see if SOCKETSHR was chosen 971$! Check to see if SOCKETSHR was chosen
@@ -973,7 +975,7 @@ $ THEN
973$! 975$!
974$! Set the library to use SOCKETSHR 976$! Set the library to use SOCKETSHR
975$! 977$!
976$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT" 978$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
977$! 979$!
978$! Done with SOCKETSHR 980$! Done with SOCKETSHR
979$! 981$!
@@ -999,19 +1001,45 @@ $ THEN
999$! 1001$!
1000$! Set the library to use UCX. 1002$! Set the library to use UCX.
1001$! 1003$!
1002$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT" 1004$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
1003$ IF F$TRNLNM("UCX$IPC_SHR") .NES. "" 1005$ IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
1004$ THEN 1006$ THEN
1005$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT" 1007$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
1006$ ELSE 1008$ ELSE
1007$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN - 1009$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
1008 TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT" 1010 TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
1009$ ENDIF 1011$ ENDIF
1010$! 1012$!
1011$! Done with UCX 1013$! Done with UCX
1012$! 1014$!
1013$ ENDIF 1015$ ENDIF
1014$! 1016$!
1017$! Check to see if TCPIP (post UCX) was chosen
1018$!
1019$ IF P4.EQS."TCPIP"
1020$ THEN
1021$!
1022$! Set the library to use TCPIP.
1023$!
1024$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
1025$!
1026$! Done with TCPIP
1027$!
1028$ ENDIF
1029$!
1030$! Check to see if NONE was chosen
1031$!
1032$ IF P4.EQS."NONE"
1033$ THEN
1034$!
1035$! Do not use TCPIP.
1036$!
1037$ TCPIP_LIB = ""
1038$!
1039$! Done with TCPIP
1040$!
1041$ ENDIF
1042$!
1015$! Add TCP/IP type to CC definitions. 1043$! Add TCP/IP type to CC definitions.
1016$! 1044$!
1017$ CCDEFS = CCDEFS + ",TCPIP_TYPE_''P4'" 1045$ CCDEFS = CCDEFS + ",TCPIP_TYPE_''P4'"
@@ -1031,6 +1059,7 @@ $ WRITE SYS$OUTPUT "The Option ",P4," Is Invalid. The Valid Options Are:"
1031$ WRITE SYS$OUTPUT "" 1059$ WRITE SYS$OUTPUT ""
1032$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 1060$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
1033$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 1061$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1062$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
1034$ WRITE SYS$OUTPUT "" 1063$ WRITE SYS$OUTPUT ""
1035$! 1064$!
1036$! Time To EXIT. 1065$! Time To EXIT.
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c
index 78bf686b1b..3f55e26bdd 100644
--- a/src/lib/libssl/src/apps/speed.c
+++ b/src/lib/libssl/src/apps/speed.c
@@ -372,8 +372,11 @@ int MAIN(int argc, char **argv)
372 ENGINE *e = NULL; 372 ENGINE *e = NULL;
373 unsigned char *buf=NULL,*buf2=NULL; 373 unsigned char *buf=NULL,*buf2=NULL;
374 int mret=1; 374 int mret=1;
375 long count=0,save_count=0, rsa_count; 375 long count=0,save_count=0;
376 int i,j,k; 376 int i,j,k;
377#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA)
378 long rsa_count;
379#endif
377#ifndef OPENSSL_NO_RSA 380#ifndef OPENSSL_NO_RSA
378 unsigned rsa_num; 381 unsigned rsa_num;
379#endif 382#endif
diff --git a/src/lib/libssl/src/apps/x509.c b/src/lib/libssl/src/apps/x509.c
index 88386d6136..dce5f32630 100644
--- a/src/lib/libssl/src/apps/x509.c
+++ b/src/lib/libssl/src/apps/x509.c
@@ -245,7 +245,7 @@ int MAIN(int argc, char **argv)
245 else if (strcmp(*argv,"-CAkeyform") == 0) 245 else if (strcmp(*argv,"-CAkeyform") == 0)
246 { 246 {
247 if (--argc < 1) goto bad; 247 if (--argc < 1) goto bad;
248 CAformat=str2fmt(*(++argv)); 248 CAkeyformat=str2fmt(*(++argv));
249 } 249 }
250 else if (strcmp(*argv,"-days") == 0) 250 else if (strcmp(*argv,"-days") == 0)
251 { 251 {
diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index 132fb7a0ce..ece3248393 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -390,11 +390,13 @@ exit 0
390 390
391# figure out if gcc is available and if so we use it otherwise 391# figure out if gcc is available and if so we use it otherwise
392# we fallback to whatever cc does on the system 392# we fallback to whatever cc does on the system
393GCCVER=`(gcc --version) 2>/dev/null` 393GCCVER=`(gcc --version) 2>/dev/null | head -1`
394if [ "$GCCVER" != "" ]; then 394if [ "$GCCVER" != "" ]; then
395 CC=gcc 395 CC=gcc
396 # then strip off whatever prefix Cygnus prepends the number with... 396 # then strip off whatever prefix Cygnus as well as GCC 3.1 prepends
397 GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'` 397 # the number with... Hopefully, this will work for any future prefixes
398 # as well.
399 GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z ()]*\-//'`
398 # peak single digit before and after first dot, e.g. 2.95.1 gives 29 400 # peak single digit before and after first dot, e.g. 2.95.1 gives 29
399 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` 401 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
400else 402else
diff --git a/src/lib/libssl/src/crypto/Makefile.ssl b/src/lib/libssl/src/crypto/Makefile.ssl
index 9d1a180571..6a52e04218 100644
--- a/src/lib/libssl/src/crypto/Makefile.ssl
+++ b/src/lib/libssl/src/crypto/Makefile.ssl
@@ -54,11 +54,11 @@ all: buildinf.h lib subdirs shared
54 54
55buildinf.h: ../Makefile.ssl 55buildinf.h: ../Makefile.ssl
56 ( echo "#ifndef MK1MF_BUILD"; \ 56 ( echo "#ifndef MK1MF_BUILD"; \
57 echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \ 57 echo ' /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */'; \
58 echo " #define CFLAGS \"$(CC) $(CFLAG)\""; \ 58 echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \
59 echo " #define PLATFORM \"$(PLATFORM)\""; \ 59 echo ' #define PLATFORM "$(PLATFORM)"'; \
60 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ 60 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
61 echo "#endif" ) >buildinf.h 61 echo '#endif' ) >buildinf.h
62 62
63testapps: 63testapps:
64 if echo ${SDIRS} | fgrep ' des '; \ 64 if echo ${SDIRS} | fgrep ' des '; \
diff --git a/src/lib/libssl/src/crypto/aes/aes_cfb.c b/src/lib/libssl/src/crypto/aes/aes_cfb.c
index 9b2917298a..41c2a5ec3d 100644
--- a/src/lib/libssl/src/crypto/aes/aes_cfb.c
+++ b/src/lib/libssl/src/crypto/aes/aes_cfb.c
@@ -137,7 +137,7 @@ void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
137 } else { 137 } else {
138 while (l--) { 138 while (l--) {
139 if (n == 0) { 139 if (n == 0) {
140 AES_decrypt(ivec, ivec, key); 140 AES_encrypt(ivec, ivec, key);
141 } 141 }
142 c = *(in); 142 c = *(in);
143 *(out++) = *(in++) ^ ivec[n]; 143 *(out++) = *(in++) ^ ivec[n];
diff --git a/src/lib/libssl/src/crypto/aes/aes_ctr.c b/src/lib/libssl/src/crypto/aes/aes_ctr.c
index 8e800481de..aea3db2092 100644
--- a/src/lib/libssl/src/crypto/aes/aes_ctr.c
+++ b/src/lib/libssl/src/crypto/aes/aes_ctr.c
@@ -106,8 +106,8 @@ void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
106 106
107 while (l--) { 107 while (l--) {
108 if (n == 0) { 108 if (n == 0) {
109 AES_ctr128_inc(counter);
110 AES_encrypt(counter, tmp, key); 109 AES_encrypt(counter, tmp, key);
110 AES_ctr128_inc(counter);
111 } 111 }
112 *(out++) = *(in++) ^ tmp[n]; 112 *(out++) = *(in++) ^ tmp[n];
113 n = (n+1) % AES_BLOCK_SIZE; 113 n = (n+1) % AES_BLOCK_SIZE;
diff --git a/src/lib/libssl/src/crypto/asn1/a_bitstr.c b/src/lib/libssl/src/crypto/asn1/a_bitstr.c
index c36817c1ee..ed0bdfbde1 100644
--- a/src/lib/libssl/src/crypto/asn1/a_bitstr.c
+++ b/src/lib/libssl/src/crypto/asn1/a_bitstr.c
@@ -71,8 +71,6 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
71 if (a == NULL) return(0); 71 if (a == NULL) return(0);
72 72
73 len=a->length; 73 len=a->length;
74 ret=1+len;
75 if (pp == NULL) return(ret);
76 74
77 if (len > 0) 75 if (len > 0)
78 { 76 {
@@ -100,6 +98,10 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
100 } 98 }
101 else 99 else
102 bits=0; 100 bits=0;
101
102 ret=1+len;
103 if (pp == NULL) return(ret);
104
103 p= *pp; 105 p= *pp;
104 106
105 *(p++)=(unsigned char)bits; 107 *(p++)=(unsigned char)bits;
diff --git a/src/lib/libssl/src/crypto/asn1/a_enum.c b/src/lib/libssl/src/crypto/asn1/a_enum.c
index 8a315fa371..ad8f0ffd1a 100644
--- a/src/lib/libssl/src/crypto/asn1/a_enum.c
+++ b/src/lib/libssl/src/crypto/asn1/a_enum.c
@@ -151,7 +151,17 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
151 else ret->type=V_ASN1_ENUMERATED; 151 else ret->type=V_ASN1_ENUMERATED;
152 j=BN_num_bits(bn); 152 j=BN_num_bits(bn);
153 len=((j == 0)?0:((j/8)+1)); 153 len=((j == 0)?0:((j/8)+1));
154 ret->data=(unsigned char *)OPENSSL_malloc(len+4); 154 if (ret->length < len+4)
155 {
156 unsigned char *new_data=OPENSSL_realloc(ret->data, len+4);
157 if (!new_data)
158 {
159 ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_MALLOC_FAILURE);
160 goto err;
161 }
162 ret->data=new_data;
163 }
164
155 ret->length=BN_bn2bin(bn,ret->data); 165 ret->length=BN_bn2bin(bn,ret->data);
156 return(ret); 166 return(ret);
157err: 167err:
diff --git a/src/lib/libssl/src/crypto/asn1/a_int.c b/src/lib/libssl/src/crypto/asn1/a_int.c
index 496704b9a5..edb243c021 100644
--- a/src/lib/libssl/src/crypto/asn1/a_int.c
+++ b/src/lib/libssl/src/crypto/asn1/a_int.c
@@ -397,7 +397,16 @@ ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai)
397 else ret->type=V_ASN1_INTEGER; 397 else ret->type=V_ASN1_INTEGER;
398 j=BN_num_bits(bn); 398 j=BN_num_bits(bn);
399 len=((j == 0)?0:((j/8)+1)); 399 len=((j == 0)?0:((j/8)+1));
400 ret->data=(unsigned char *)OPENSSL_malloc(len+4); 400 if (ret->length < len+4)
401 {
402 unsigned char *new_data=OPENSSL_realloc(ret->data, len+4);
403 if (!new_data)
404 {
405 ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_MALLOC_FAILURE);
406 goto err;
407 }
408 ret->data=new_data;
409 }
401 ret->length=BN_bn2bin(bn,ret->data); 410 ret->length=BN_bn2bin(bn,ret->data);
402 /* Correct zero case */ 411 /* Correct zero case */
403 if(!ret->length) 412 if(!ret->length)
diff --git a/src/lib/libssl/src/crypto/asn1/a_set.c b/src/lib/libssl/src/crypto/asn1/a_set.c
index 19bb60fca8..0f839822ff 100644
--- a/src/lib/libssl/src/crypto/asn1/a_set.c
+++ b/src/lib/libssl/src/crypto/asn1/a_set.c
@@ -118,7 +118,7 @@ int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(), int ex_tag,
118 } 118 }
119 119
120 pStart = p; /* Catch the beg of Setblobs*/ 120 pStart = p; /* Catch the beg of Setblobs*/
121 rgSetBlob = (MYBLOB *)OPENSSL_malloc( sk_num(a) * sizeof(MYBLOB)); /* In this array 121 if (!(rgSetBlob = (MYBLOB *)OPENSSL_malloc( sk_num(a) * sizeof(MYBLOB)))) return 0; /* In this array
122we will store the SET blobs */ 122we will store the SET blobs */
123 123
124 for (i=0; i<sk_num(a); i++) 124 for (i=0; i<sk_num(a); i++)
@@ -135,7 +135,7 @@ SetBlob
135 /* Now we have to sort the blobs. I am using a simple algo. 135 /* Now we have to sort the blobs. I am using a simple algo.
136 *Sort ptrs *Copy to temp-mem *Copy from temp-mem to user-mem*/ 136 *Sort ptrs *Copy to temp-mem *Copy from temp-mem to user-mem*/
137 qsort( rgSetBlob, sk_num(a), sizeof(MYBLOB), SetBlobCmp); 137 qsort( rgSetBlob, sk_num(a), sizeof(MYBLOB), SetBlobCmp);
138 pTempMem = OPENSSL_malloc(totSize); 138 if (!(pTempMem = OPENSSL_malloc(totSize))) return 0;
139 139
140/* Copy to temp mem */ 140/* Copy to temp mem */
141 p = pTempMem; 141 p = pTempMem;
diff --git a/src/lib/libssl/src/crypto/asn1/a_utctm.c b/src/lib/libssl/src/crypto/asn1/a_utctm.c
index ed2d827db2..dbb4a42c9d 100644
--- a/src/lib/libssl/src/crypto/asn1/a_utctm.c
+++ b/src/lib/libssl/src/crypto/asn1/a_utctm.c
@@ -222,6 +222,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
222int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t) 222int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
223 { 223 {
224 struct tm *tm; 224 struct tm *tm;
225 struct tm data;
225 int offset; 226 int offset;
226 int year; 227 int year;
227 228
@@ -238,7 +239,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
238 239
239 t -= offset*60; /* FIXME: may overflow in extreme cases */ 240 t -= offset*60; /* FIXME: may overflow in extreme cases */
240 241
241 { struct tm data; tm = OPENSSL_gmtime(&t, &data); } 242 tm = OPENSSL_gmtime(&t, &data);
242 243
243#define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1 244#define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1
244 year = g2(s->data); 245 year = g2(s->data);
diff --git a/src/lib/libssl/src/crypto/asn1/x_pubkey.c b/src/lib/libssl/src/crypto/asn1/x_pubkey.c
index 55630294b6..d958540120 100644
--- a/src/lib/libssl/src/crypto/asn1/x_pubkey.c
+++ b/src/lib/libssl/src/crypto/asn1/x_pubkey.c
@@ -84,7 +84,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
84 X509_PUBKEY *pk; 84 X509_PUBKEY *pk;
85 X509_ALGOR *a; 85 X509_ALGOR *a;
86 ASN1_OBJECT *o; 86 ASN1_OBJECT *o;
87 unsigned char *s,*p; 87 unsigned char *s,*p = NULL;
88 int i; 88 int i;
89 89
90 if (x == NULL) return(0); 90 if (x == NULL) return(0);
@@ -119,7 +119,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
119 dsa->write_params=0; 119 dsa->write_params=0;
120 ASN1_TYPE_free(a->parameter); 120 ASN1_TYPE_free(a->parameter);
121 i=i2d_DSAparams(dsa,NULL); 121 i=i2d_DSAparams(dsa,NULL);
122 p=(unsigned char *)OPENSSL_malloc(i); 122 if ((p=(unsigned char *)OPENSSL_malloc(i)) == NULL) goto err;
123 pp=p; 123 pp=p;
124 i2d_DSAparams(dsa,&pp); 124 i2d_DSAparams(dsa,&pp);
125 a->parameter=ASN1_TYPE_new(); 125 a->parameter=ASN1_TYPE_new();
@@ -136,7 +136,11 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
136 } 136 }
137 137
138 if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err; 138 if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err;
139 if ((s=(unsigned char *)OPENSSL_malloc(i+1)) == NULL) goto err; 139 if ((s=(unsigned char *)OPENSSL_malloc(i+1)) == NULL)
140 {
141 X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE);
142 goto err;
143 }
140 p=s; 144 p=s;
141 i2d_PublicKey(pkey,&p); 145 i2d_PublicKey(pkey,&p);
142 if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err; 146 if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err;
diff --git a/src/lib/libssl/src/crypto/bio/bf_nbio.c b/src/lib/libssl/src/crypto/bio/bf_nbio.c
index c193e9debf..1ce2bfacc0 100644
--- a/src/lib/libssl/src/crypto/bio/bf_nbio.c
+++ b/src/lib/libssl/src/crypto/bio/bf_nbio.c
@@ -103,7 +103,7 @@ static int nbiof_new(BIO *bi)
103 { 103 {
104 NBIO_TEST *nt; 104 NBIO_TEST *nt;
105 105
106 nt=(NBIO_TEST *)OPENSSL_malloc(sizeof(NBIO_TEST)); 106 if (!(nt=(NBIO_TEST *)OPENSSL_malloc(sizeof(NBIO_TEST)))) return(0);
107 nt->lrn= -1; 107 nt->lrn= -1;
108 nt->lwn= -1; 108 nt->lwn= -1;
109 bi->ptr=(char *)nt; 109 bi->ptr=(char *)nt;
diff --git a/src/lib/libssl/src/crypto/bn/bn_div.c b/src/lib/libssl/src/crypto/bn/bn_div.c
index ac1a09615a..f9a095e3b3 100644
--- a/src/lib/libssl/src/crypto/bn/bn_div.c
+++ b/src/lib/libssl/src/crypto/bn/bn_div.c
@@ -200,10 +200,10 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
200 200
201 /* First we normalise the numbers */ 201 /* First we normalise the numbers */
202 norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2); 202 norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2);
203 BN_lshift(sdiv,divisor,norm_shift); 203 if (!(BN_lshift(sdiv,divisor,norm_shift))) goto err;
204 sdiv->neg=0; 204 sdiv->neg=0;
205 norm_shift+=BN_BITS2; 205 norm_shift+=BN_BITS2;
206 BN_lshift(snum,num,norm_shift); 206 if (!(BN_lshift(snum,num,norm_shift))) goto err;
207 snum->neg=0; 207 snum->neg=0;
208 div_n=sdiv->top; 208 div_n=sdiv->top;
209 num_n=snum->top; 209 num_n=snum->top;
@@ -327,7 +327,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
327 tmp->top=j; 327 tmp->top=j;
328 328
329 j=wnum.top; 329 j=wnum.top;
330 BN_sub(&wnum,&wnum,tmp); 330 if (!BN_sub(&wnum,&wnum,tmp)) goto err;
331 331
332 snum->top=snum->top+wnum.top-j; 332 snum->top=snum->top+wnum.top-j;
333 333
@@ -335,7 +335,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
335 { 335 {
336 q--; 336 q--;
337 j=wnum.top; 337 j=wnum.top;
338 BN_add(&wnum,&wnum,sdiv); 338 if (!BN_add(&wnum,&wnum,sdiv)) goto err;
339 snum->top+=wnum.top-j; 339 snum->top+=wnum.top-j;
340 } 340 }
341 *(resp--)=q; 341 *(resp--)=q;
diff --git a/src/lib/libssl/src/crypto/bn/bn_mont.c b/src/lib/libssl/src/crypto/bn/bn_mont.c
index 82942a4759..c9ebdbaabe 100644
--- a/src/lib/libssl/src/crypto/bn/bn_mont.c
+++ b/src/lib/libssl/src/crypto/bn/bn_mont.c
@@ -221,7 +221,7 @@ int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
221 221
222 if (!BN_mul(t1,t2,&mont->N,ctx)) goto err; 222 if (!BN_mul(t1,t2,&mont->N,ctx)) goto err;
223 if (!BN_add(t2,a,t1)) goto err; 223 if (!BN_add(t2,a,t1)) goto err;
224 BN_rshift(ret,t2,mont->ri); 224 if (!BN_rshift(ret,t2,mont->ri)) goto err;
225#endif /* MONT_WORD */ 225#endif /* MONT_WORD */
226 226
227 if (BN_ucmp(ret, &(mont->N)) >= 0) 227 if (BN_ucmp(ret, &(mont->N)) >= 0)
@@ -282,8 +282,8 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
282 BN_ULONG buf[2]; 282 BN_ULONG buf[2];
283 283
284 mont->ri=(BN_num_bits(mod)+(BN_BITS2-1))/BN_BITS2*BN_BITS2; 284 mont->ri=(BN_num_bits(mod)+(BN_BITS2-1))/BN_BITS2*BN_BITS2;
285 BN_zero(R); 285 if (!(BN_zero(R))) goto err;
286 BN_set_bit(R,BN_BITS2); /* R */ 286 if (!(BN_set_bit(R,BN_BITS2))) goto err; /* R */
287 287
288 buf[0]=mod->d[0]; /* tmod = N mod word size */ 288 buf[0]=mod->d[0]; /* tmod = N mod word size */
289 buf[1]=0; 289 buf[1]=0;
diff --git a/src/lib/libssl/src/crypto/bn/bn_mul.c b/src/lib/libssl/src/crypto/bn/bn_mul.c
index 7bffc9c16a..fd598b8b3d 100644
--- a/src/lib/libssl/src/crypto/bn/bn_mul.c
+++ b/src/lib/libssl/src/crypto/bn/bn_mul.c
@@ -964,7 +964,7 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
964 964
965 if ((al == 0) || (bl == 0)) 965 if ((al == 0) || (bl == 0))
966 { 966 {
967 BN_zero(r); 967 if (!BN_zero(r)) goto err;
968 return(1); 968 return(1);
969 } 969 }
970 top=al+bl; 970 top=al+bl;
@@ -1044,7 +1044,7 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
1044 if (i == 1 && !BN_get_flags(b,BN_FLG_STATIC_DATA)) 1044 if (i == 1 && !BN_get_flags(b,BN_FLG_STATIC_DATA))
1045 { 1045 {
1046 BIGNUM *tmp_bn = (BIGNUM *)b; 1046 BIGNUM *tmp_bn = (BIGNUM *)b;
1047 bn_wexpand(tmp_bn,al); 1047 if (bn_wexpand(tmp_bn,al) == NULL) goto err;
1048 tmp_bn->d[bl]=0; 1048 tmp_bn->d[bl]=0;
1049 bl++; 1049 bl++;
1050 i--; 1050 i--;
@@ -1052,7 +1052,7 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
1052 else if (i == -1 && !BN_get_flags(a,BN_FLG_STATIC_DATA)) 1052 else if (i == -1 && !BN_get_flags(a,BN_FLG_STATIC_DATA))
1053 { 1053 {
1054 BIGNUM *tmp_bn = (BIGNUM *)a; 1054 BIGNUM *tmp_bn = (BIGNUM *)a;
1055 bn_wexpand(tmp_bn,bl); 1055 if (bn_wexpand(tmp_bn,bl) == NULL) goto err;
1056 tmp_bn->d[al]=0; 1056 tmp_bn->d[al]=0;
1057 al++; 1057 al++;
1058 i++; 1058 i++;
@@ -1067,14 +1067,14 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
1067 t = BN_CTX_get(ctx); 1067 t = BN_CTX_get(ctx);
1068 if (al == j) /* exact multiple */ 1068 if (al == j) /* exact multiple */
1069 { 1069 {
1070 bn_wexpand(t,k*2); 1070 if (bn_wexpand(t,k*2) == NULL) goto err;
1071 bn_wexpand(rr,k*2); 1071 if (bn_wexpand(rr,k*2) == NULL) goto err;
1072 bn_mul_recursive(rr->d,a->d,b->d,al,t->d); 1072 bn_mul_recursive(rr->d,a->d,b->d,al,t->d);
1073 } 1073 }
1074 else 1074 else
1075 { 1075 {
1076 bn_wexpand(t,k*4); 1076 if (bn_wexpand(t,k*4) == NULL) goto err;
1077 bn_wexpand(rr,k*4); 1077 if (bn_wexpand(rr,k*4) == NULL) goto err;
1078 bn_mul_part_recursive(rr->d,a->d,b->d,al-j,j,t->d); 1078 bn_mul_part_recursive(rr->d,a->d,b->d,al-j,j,t->d);
1079 } 1079 }
1080 rr->top=top; 1080 rr->top=top;
diff --git a/src/lib/libssl/src/crypto/crypto-lib.com b/src/lib/libssl/src/crypto/crypto-lib.com
index ca0247be00..4847a69a71 100644
--- a/src/lib/libssl/src/crypto/crypto-lib.com
+++ b/src/lib/libssl/src/crypto/crypto-lib.com
@@ -49,6 +49,7 @@ $! P5, if defined, sets a TCP/IP library to use, through one of the following
49$! keywords: 49$! keywords:
50$! 50$!
51$! UCX for UCX 51$! UCX for UCX
52$! TCPIP for TCPIP (post UCX)
52$! SOCKETSHR for SOCKETSHR+NETLIB 53$! SOCKETSHR for SOCKETSHR+NETLIB
53$! 54$!
54$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up) 55$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
@@ -640,6 +641,7 @@ $ WRITE SYS$OUTPUT " ",APPLICATION,".exe"
640$! 641$!
641$! Link The Program, Check To See If We Need To Link With RSAREF Or Not. 642$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
642$! 643$!
644$ ON ERROR THEN GOTO NEXT_APPLICATION
643$ IF (RSAREF.EQS."TRUE") 645$ IF (RSAREF.EQS."TRUE")
644$ THEN 646$ THEN
645$! 647$!
@@ -1358,7 +1360,8 @@ $ WRITE SYS$OUTPUT "Main MACRO Compiling Command: ",MACRO
1358$! 1360$!
1359$! Time to check the contents, and to make sure we get the correct library. 1361$! Time to check the contents, and to make sure we get the correct library.
1360$! 1362$!
1361$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" 1363$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
1364 .OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
1362$ THEN 1365$ THEN
1363$! 1366$!
1364$! Check to see if SOCKETSHR was chosen 1367$! Check to see if SOCKETSHR was chosen
@@ -1368,7 +1371,7 @@ $ THEN
1368$! 1371$!
1369$! Set the library to use SOCKETSHR 1372$! Set the library to use SOCKETSHR
1370$! 1373$!
1371$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT" 1374$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
1372$! 1375$!
1373$! Done with SOCKETSHR 1376$! Done with SOCKETSHR
1374$! 1377$!
@@ -1394,19 +1397,45 @@ $ THEN
1394$! 1397$!
1395$! Set the library to use UCX. 1398$! Set the library to use UCX.
1396$! 1399$!
1397$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT" 1400$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
1398$ IF F$TRNLNM("UCX$IPC_SHR") .NES. "" 1401$ IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
1399$ THEN 1402$ THEN
1400$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT" 1403$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
1401$ ELSE 1404$ ELSE
1402$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN - 1405$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
1403 TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT" 1406 TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
1404$ ENDIF 1407$ ENDIF
1405$! 1408$!
1406$! Done with UCX 1409$! Done with UCX
1407$! 1410$!
1408$ ENDIF 1411$ ENDIF
1409$! 1412$!
1413$! Check to see if TCPIP was chosen
1414$!
1415$ IF P5.EQS."TCPIP"
1416$ THEN
1417$!
1418$! Set the library to use TCPIP (post UCX).
1419$!
1420$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
1421$!
1422$! Done with TCPIP
1423$!
1424$ ENDIF
1425$!
1426$! Check to see if NONE was chosen
1427$!
1428$ IF P5.EQS."NONE"
1429$ THEN
1430$!
1431$! Do not use a TCPIP library.
1432$!
1433$ TCPIP_LIB = ""
1434$!
1435$! Done with TCPIP
1436$!
1437$ ENDIF
1438$!
1410$! Print info 1439$! Print info
1411$! 1440$!
1412$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB 1441$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -1422,6 +1451,7 @@ $ WRITE SYS$OUTPUT "The Option ",P5," Is Invalid. The Valid Options Are:"
1422$ WRITE SYS$OUTPUT "" 1451$ WRITE SYS$OUTPUT ""
1423$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 1452$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
1424$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 1453$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1454$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
1425$ WRITE SYS$OUTPUT "" 1455$ WRITE SYS$OUTPUT ""
1426$! 1456$!
1427$! Time To EXIT. 1457$! Time To EXIT.
diff --git a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
index 1a19164d3b..906b4703de 100644
--- a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
+++ b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
@@ -114,7 +114,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
114 * as we don't have autoconf yet, I'm implementing a hack that could 114 * as we don't have autoconf yet, I'm implementing a hack that could
115 * be hacked further relatively easily to deal with cases as we find 115 * be hacked further relatively easily to deal with cases as we find
116 * them. Initially this is to cope with OpenBSD. */ 116 * them. Initially this is to cope with OpenBSD. */
117#ifdef __OpenBSD__ 117#if defined(__OpenBSD__) || defined(__NetBSD__)
118# ifdef DL_LAZY 118# ifdef DL_LAZY
119# define DLOPEN_FLAG DL_LAZY 119# define DLOPEN_FLAG DL_LAZY
120# else 120# else
diff --git a/src/lib/libssl/src/crypto/ec/ec_lib.c b/src/lib/libssl/src/crypto/ec/ec_lib.c
index e0d78d67fb..0cf485de60 100644
--- a/src/lib/libssl/src/crypto/ec/ec_lib.c
+++ b/src/lib/libssl/src/crypto/ec/ec_lib.c
@@ -106,6 +106,8 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
106 106
107void EC_GROUP_free(EC_GROUP *group) 107void EC_GROUP_free(EC_GROUP *group)
108 { 108 {
109 if (!group) return;
110
109 if (group->meth->group_finish != 0) 111 if (group->meth->group_finish != 0)
110 group->meth->group_finish(group); 112 group->meth->group_finish(group);
111 113
@@ -117,6 +119,8 @@ void EC_GROUP_free(EC_GROUP *group)
117 119
118void EC_GROUP_clear_free(EC_GROUP *group) 120void EC_GROUP_clear_free(EC_GROUP *group)
119 { 121 {
122 if (!group) return;
123
120 if (group->meth->group_clear_finish != 0) 124 if (group->meth->group_clear_finish != 0)
121 group->meth->group_clear_finish(group); 125 group->meth->group_clear_finish(group);
122 else if (group->meth != NULL && group->meth->group_finish != 0) 126 else if (group->meth != NULL && group->meth->group_finish != 0)
@@ -337,6 +341,8 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group)
337 341
338void EC_POINT_free(EC_POINT *point) 342void EC_POINT_free(EC_POINT *point)
339 { 343 {
344 if (!point) return;
345
340 if (point->meth->point_finish != 0) 346 if (point->meth->point_finish != 0)
341 point->meth->point_finish(point); 347 point->meth->point_finish(point);
342 OPENSSL_free(point); 348 OPENSSL_free(point);
@@ -345,6 +351,8 @@ void EC_POINT_free(EC_POINT *point)
345 351
346void EC_POINT_clear_free(EC_POINT *point) 352void EC_POINT_clear_free(EC_POINT *point)
347 { 353 {
354 if (!point) return;
355
348 if (point->meth->point_clear_finish != 0) 356 if (point->meth->point_clear_finish != 0)
349 point->meth->point_clear_finish(point); 357 point->meth->point_clear_finish(point);
350 else if (point->meth != NULL && point->meth->point_finish != 0) 358 else if (point->meth != NULL && point->meth->point_finish != 0)
diff --git a/src/lib/libssl/src/crypto/engine/Makefile.ssl b/src/lib/libssl/src/crypto/engine/Makefile.ssl
index 5172028f93..8ee3b7d2dd 100644
--- a/src/lib/libssl/src/crypto/engine/Makefile.ssl
+++ b/src/lib/libssl/src/crypto/engine/Makefile.ssl
@@ -74,7 +74,7 @@ tags:
74 74
75errors: 75errors:
76 $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \ 76 $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \
77 -nostatic -staticloader -write hw_*.c; \ 77 -nostatic -staticloader -write hw_*.c
78 78
79tests: 79tests:
80 80
diff --git a/src/lib/libssl/src/crypto/engine/hw_4758_cca.c b/src/lib/libssl/src/crypto/engine/hw_4758_cca.c
index 959d8f1a61..77d3d2ffdf 100644
--- a/src/lib/libssl/src/crypto/engine/hw_4758_cca.c
+++ b/src/lib/libssl/src/crypto/engine/hw_4758_cca.c
@@ -287,13 +287,13 @@ err:
287 DSO_free(dso); 287 DSO_free(dso);
288 dso = NULL; 288 dso = NULL;
289 289
290 keyRecordRead = (F_KEYRECORDREAD)NULL; 290 keyRecordRead = (F_KEYRECORDREAD)0;
291 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL; 291 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
292 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL; 292 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
293 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL; 293 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
294 publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL; 294 publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
295 pkaEncrypt = (F_PKAENCRYPT)NULL; 295 pkaEncrypt = (F_PKAENCRYPT)0;
296 pkaDecrypt = (F_PKADECRYPT)NULL; 296 pkaDecrypt = (F_PKADECRYPT)0;
297 return 0; 297 return 0;
298 } 298 }
299 299
@@ -312,13 +312,13 @@ static int ibm_4758_cca_finish(ENGINE *e)
312 return 0; 312 return 0;
313 } 313 }
314 dso = NULL; 314 dso = NULL;
315 keyRecordRead = (F_KEYRECORDREAD)NULL; 315 keyRecordRead = (F_KEYRECORDREAD)0;
316 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL; 316 randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
317 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL; 317 digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
318 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL; 318 digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
319 publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL; 319 publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
320 pkaEncrypt = (F_PKAENCRYPT)NULL; 320 pkaEncrypt = (F_PKAENCRYPT)0;
321 pkaDecrypt = (F_PKADECRYPT)NULL; 321 pkaDecrypt = (F_PKADECRYPT)0;
322 return 1; 322 return 1;
323 } 323 }
324 324
diff --git a/src/lib/libssl/src/crypto/evp/bio_enc.c b/src/lib/libssl/src/crypto/evp/bio_enc.c
index 05f4249458..64fb2353af 100644
--- a/src/lib/libssl/src/crypto/evp/bio_enc.c
+++ b/src/lib/libssl/src/crypto/evp/bio_enc.c
@@ -110,8 +110,8 @@ static int enc_new(BIO *bi)
110 BIO_ENC_CTX *ctx; 110 BIO_ENC_CTX *ctx;
111 111
112 ctx=(BIO_ENC_CTX *)OPENSSL_malloc(sizeof(BIO_ENC_CTX)); 112 ctx=(BIO_ENC_CTX *)OPENSSL_malloc(sizeof(BIO_ENC_CTX));
113 EVP_CIPHER_CTX_init(&ctx->cipher);
114 if (ctx == NULL) return(0); 113 if (ctx == NULL) return(0);
114 EVP_CIPHER_CTX_init(&ctx->cipher);
115 115
116 ctx->buf_len=0; 116 ctx->buf_len=0;
117 ctx->buf_off=0; 117 ctx->buf_off=0;
diff --git a/src/lib/libssl/src/crypto/evp/c_allc.c b/src/lib/libssl/src/crypto/evp/c_allc.c
index 37e6ab83a5..341a958fd4 100644
--- a/src/lib/libssl/src/crypto/evp/c_allc.c
+++ b/src/lib/libssl/src/crypto/evp/c_allc.c
@@ -149,14 +149,29 @@ void OpenSSL_add_all_ciphers(void)
149#ifndef OPENSSL_NO_AES 149#ifndef OPENSSL_NO_AES
150 EVP_add_cipher(EVP_aes_128_ecb()); 150 EVP_add_cipher(EVP_aes_128_ecb());
151 EVP_add_cipher(EVP_aes_128_cbc()); 151 EVP_add_cipher(EVP_aes_128_cbc());
152 EVP_add_cipher(EVP_aes_128_cfb());
153 EVP_add_cipher(EVP_aes_128_ofb());
154#if 0
155 EVP_add_cipher(EVP_aes_128_ctr());
156#endif
152 EVP_add_cipher_alias(SN_aes_128_cbc,"AES128"); 157 EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
153 EVP_add_cipher_alias(SN_aes_128_cbc,"aes128"); 158 EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
154 EVP_add_cipher(EVP_aes_192_ecb()); 159 EVP_add_cipher(EVP_aes_192_ecb());
155 EVP_add_cipher(EVP_aes_192_cbc()); 160 EVP_add_cipher(EVP_aes_192_cbc());
161 EVP_add_cipher(EVP_aes_192_cfb());
162 EVP_add_cipher(EVP_aes_192_ofb());
163#if 0
164 EVP_add_cipher(EVP_aes_192_ctr());
165#endif
156 EVP_add_cipher_alias(SN_aes_192_cbc,"AES192"); 166 EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
157 EVP_add_cipher_alias(SN_aes_192_cbc,"aes192"); 167 EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
158 EVP_add_cipher(EVP_aes_256_ecb()); 168 EVP_add_cipher(EVP_aes_256_ecb());
159 EVP_add_cipher(EVP_aes_256_cbc()); 169 EVP_add_cipher(EVP_aes_256_cbc());
170 EVP_add_cipher(EVP_aes_256_cfb());
171 EVP_add_cipher(EVP_aes_256_ofb());
172#if 0
173 EVP_add_cipher(EVP_aes_256_ctr());
174#endif
160 EVP_add_cipher_alias(SN_aes_256_cbc,"AES256"); 175 EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
161 EVP_add_cipher_alias(SN_aes_256_cbc,"aes256"); 176 EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
162#endif 177#endif
diff --git a/src/lib/libssl/src/crypto/evp/e_aes.c b/src/lib/libssl/src/crypto/evp/e_aes.c
index 9d03a9602f..c323fa2892 100644
--- a/src/lib/libssl/src/crypto/evp/e_aes.c
+++ b/src/lib/libssl/src/crypto/evp/e_aes.c
@@ -88,7 +88,9 @@ IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY,
88static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 88static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
89 const unsigned char *iv, int enc) { 89 const unsigned char *iv, int enc) {
90 90
91 if (enc) 91 if ((ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_CFB_MODE
92 || (ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_OFB_MODE
93 || enc)
92 AES_set_encrypt_key(key, ctx->key_len * 8, ctx->cipher_data); 94 AES_set_encrypt_key(key, ctx->key_len * 8, ctx->cipher_data);
93 else 95 else
94 AES_set_decrypt_key(key, ctx->key_len * 8, ctx->cipher_data); 96 AES_set_decrypt_key(key, ctx->key_len * 8, ctx->cipher_data);
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h
index 0d870d60be..fb16de6852 100644
--- a/src/lib/libssl/src/crypto/evp/evp.h
+++ b/src/lib/libssl/src/crypto/evp/evp.h
@@ -641,10 +641,25 @@ const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
641#ifndef OPENSSL_NO_AES 641#ifndef OPENSSL_NO_AES
642const EVP_CIPHER *EVP_aes_128_ecb(void); 642const EVP_CIPHER *EVP_aes_128_ecb(void);
643const EVP_CIPHER *EVP_aes_128_cbc(void); 643const EVP_CIPHER *EVP_aes_128_cbc(void);
644const EVP_CIPHER *EVP_aes_128_cfb(void);
645const EVP_CIPHER *EVP_aes_128_ofb(void);
646#if 0
647const EVP_CIPHER *EVP_aes_128_ctr(void);
648#endif
644const EVP_CIPHER *EVP_aes_192_ecb(void); 649const EVP_CIPHER *EVP_aes_192_ecb(void);
645const EVP_CIPHER *EVP_aes_192_cbc(void); 650const EVP_CIPHER *EVP_aes_192_cbc(void);
651const EVP_CIPHER *EVP_aes_192_cfb(void);
652const EVP_CIPHER *EVP_aes_192_ofb(void);
653#if 0
654const EVP_CIPHER *EVP_aes_192_ctr(void);
655#endif
646const EVP_CIPHER *EVP_aes_256_ecb(void); 656const EVP_CIPHER *EVP_aes_256_ecb(void);
647const EVP_CIPHER *EVP_aes_256_cbc(void); 657const EVP_CIPHER *EVP_aes_256_cbc(void);
658const EVP_CIPHER *EVP_aes_256_cfb(void);
659const EVP_CIPHER *EVP_aes_256_ofb(void);
660#if 0
661const EVP_CIPHER *EVP_aes_256_ctr(void);
662#endif
648#endif 663#endif
649 664
650void OPENSSL_add_all_algorithms_noconf(void); 665void OPENSSL_add_all_algorithms_noconf(void);
diff --git a/src/lib/libssl/src/crypto/evp/evp_test.c b/src/lib/libssl/src/crypto/evp/evp_test.c
index decd0713d6..90294ef686 100644
--- a/src/lib/libssl/src/crypto/evp/evp_test.c
+++ b/src/lib/libssl/src/crypto/evp/evp_test.c
@@ -118,18 +118,20 @@ static char *sstrsep(char **string, const char *delim)
118 } 118 }
119 119
120static unsigned char *ustrsep(char **p,const char *sep) 120static unsigned char *ustrsep(char **p,const char *sep)
121 { return (unsigned char *)sstrsep((char **)p,sep); } 121 { return (unsigned char *)sstrsep(p,sep); }
122 122
123static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn, 123static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
124 const unsigned char *iv,int in, 124 const unsigned char *iv,int in,
125 const unsigned char *plaintext,int pn, 125 const unsigned char *plaintext,int pn,
126 const unsigned char *ciphertext,int cn) 126 const unsigned char *ciphertext,int cn,
127 int encdec)
127 { 128 {
128 EVP_CIPHER_CTX ctx; 129 EVP_CIPHER_CTX ctx;
129 unsigned char out[4096]; 130 unsigned char out[4096];
130 int outl,outl2; 131 int outl,outl2;
131 132
132 printf("Testing cipher %s\n",EVP_CIPHER_name(c)); 133 printf("Testing cipher %s%s\n",EVP_CIPHER_name(c),
134 (encdec == 1 ? "(encrypt)" : (encdec == 0 ? "(decrypt)" : "(encrypt/decrypt)")));
133 hexdump(stdout,"Key",key,kn); 135 hexdump(stdout,"Key",key,kn);
134 if(in) 136 if(in)
135 hexdump(stdout,"IV",iv,in); 137 hexdump(stdout,"IV",iv,in);
@@ -143,70 +145,76 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
143 exit(5); 145 exit(5);
144 } 146 }
145 EVP_CIPHER_CTX_init(&ctx); 147 EVP_CIPHER_CTX_init(&ctx);
146 if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv)) 148 if (encdec != 0)
147 { 149 {
148 fprintf(stderr,"EncryptInit failed\n"); 150 if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
149 exit(10); 151 {
150 } 152 fprintf(stderr,"EncryptInit failed\n");
151 EVP_CIPHER_CTX_set_padding(&ctx,0); 153 exit(10);
154 }
155 EVP_CIPHER_CTX_set_padding(&ctx,0);
152 156
153 if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn)) 157 if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
154 { 158 {
155 fprintf(stderr,"Encrypt failed\n"); 159 fprintf(stderr,"Encrypt failed\n");
156 exit(6); 160 exit(6);
157 } 161 }
158 if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2)) 162 if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2))
159 { 163 {
160 fprintf(stderr,"EncryptFinal failed\n"); 164 fprintf(stderr,"EncryptFinal failed\n");
161 exit(7); 165 exit(7);
162 } 166 }
163 167
164 if(outl+outl2 != cn) 168 if(outl+outl2 != cn)
165 { 169 {
166 fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n", 170 fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
167 outl+outl2,cn); 171 outl+outl2,cn);
168 exit(8); 172 exit(8);
169 } 173 }
170 174
171 if(memcmp(out,ciphertext,cn)) 175 if(memcmp(out,ciphertext,cn))
172 { 176 {
173 fprintf(stderr,"Ciphertext mismatch\n"); 177 fprintf(stderr,"Ciphertext mismatch\n");
174 hexdump(stderr,"Got",out,cn); 178 hexdump(stderr,"Got",out,cn);
175 hexdump(stderr,"Expected",ciphertext,cn); 179 hexdump(stderr,"Expected",ciphertext,cn);
176 exit(9); 180 exit(9);
181 }
177 } 182 }
178 183
179 if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv)) 184 if (encdec <= 0)
180 { 185 {
181 fprintf(stderr,"DecryptInit failed\n"); 186 if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
182 exit(11); 187 {
183 } 188 fprintf(stderr,"DecryptInit failed\n");
184 EVP_CIPHER_CTX_set_padding(&ctx,0); 189 exit(11);
190 }
191 EVP_CIPHER_CTX_set_padding(&ctx,0);
185 192
186 if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,pn)) 193 if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn))
187 { 194 {
188 fprintf(stderr,"Decrypt failed\n"); 195 fprintf(stderr,"Decrypt failed\n");
189 exit(6); 196 exit(6);
190 } 197 }
191 if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2)) 198 if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
192 { 199 {
193 fprintf(stderr,"DecryptFinal failed\n"); 200 fprintf(stderr,"DecryptFinal failed\n");
194 exit(7); 201 exit(7);
195 } 202 }
196 203
197 if(outl+outl2 != cn) 204 if(outl+outl2 != cn)
198 { 205 {
199 fprintf(stderr,"Plaintext length mismatch got %d expected %d\n", 206 fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
200 outl+outl2,cn); 207 outl+outl2,cn);
201 exit(8); 208 exit(8);
202 } 209 }
203 210
204 if(memcmp(out,plaintext,cn)) 211 if(memcmp(out,plaintext,cn))
205 { 212 {
206 fprintf(stderr,"Plaintext mismatch\n"); 213 fprintf(stderr,"Plaintext mismatch\n");
207 hexdump(stderr,"Got",out,cn); 214 hexdump(stderr,"Got",out,cn);
208 hexdump(stderr,"Expected",plaintext,cn); 215 hexdump(stderr,"Expected",plaintext,cn);
209 exit(9); 216 exit(9);
217 }
210 } 218 }
211 219
212 EVP_CIPHER_CTX_cleanup(&ctx); 220 EVP_CIPHER_CTX_cleanup(&ctx);
@@ -217,7 +225,8 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
217static int test_cipher(const char *cipher,const unsigned char *key,int kn, 225static int test_cipher(const char *cipher,const unsigned char *key,int kn,
218 const unsigned char *iv,int in, 226 const unsigned char *iv,int in,
219 const unsigned char *plaintext,int pn, 227 const unsigned char *plaintext,int pn,
220 const unsigned char *ciphertext,int cn) 228 const unsigned char *ciphertext,int cn,
229 int encdec)
221 { 230 {
222 const EVP_CIPHER *c; 231 const EVP_CIPHER *c;
223 232
@@ -225,7 +234,7 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
225 if(!c) 234 if(!c)
226 return 0; 235 return 0;
227 236
228 test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn); 237 test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec);
229 238
230 return 1; 239 return 1;
231 } 240 }
@@ -332,6 +341,7 @@ int main(int argc,char **argv)
332 char *p; 341 char *p;
333 char *cipher; 342 char *cipher;
334 unsigned char *iv,*key,*plaintext,*ciphertext; 343 unsigned char *iv,*key,*plaintext,*ciphertext;
344 int encdec;
335 int kn,in,pn,cn; 345 int kn,in,pn,cn;
336 346
337 if(!fgets((char *)line,sizeof line,f)) 347 if(!fgets((char *)line,sizeof line,f))
@@ -343,14 +353,21 @@ int main(int argc,char **argv)
343 key=ustrsep(&p,":"); 353 key=ustrsep(&p,":");
344 iv=ustrsep(&p,":"); 354 iv=ustrsep(&p,":");
345 plaintext=ustrsep(&p,":"); 355 plaintext=ustrsep(&p,":");
346 ciphertext=ustrsep(&p,"\n"); 356 ciphertext=ustrsep(&p,":");
357 if (p[-1] == '\n') {
358 p[-1] = '\0';
359 encdec = -1;
360 } else {
361 encdec = atoi(sstrsep(&p,"\n"));
362 }
363
347 364
348 kn=convert(key); 365 kn=convert(key);
349 in=convert(iv); 366 in=convert(iv);
350 pn=convert(plaintext); 367 pn=convert(plaintext);
351 cn=convert(ciphertext); 368 cn=convert(ciphertext);
352 369
353 if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn) 370 if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec)
354 && !test_digest(cipher,plaintext,pn,ciphertext,cn)) 371 && !test_digest(cipher,plaintext,pn,ciphertext,cn))
355 { 372 {
356 fprintf(stderr,"Can't find %s\n",cipher); 373 fprintf(stderr,"Can't find %s\n",cipher);
diff --git a/src/lib/libssl/src/crypto/evp/evptests.txt b/src/lib/libssl/src/crypto/evp/evptests.txt
index 6c1529db37..80bd9c7765 100644
--- a/src/lib/libssl/src/crypto/evp/evptests.txt
+++ b/src/lib/libssl/src/crypto/evp/evptests.txt
@@ -1,4 +1,4 @@
1#cipher:key:iv:input:output 1#cipher:key:iv:plaintext:ciphertext:0/1(decrypt/encrypt)
2#digest:::input:output 2#digest:::input:output
3 3
4# SHA(1) tests (from shatest.c) 4# SHA(1) tests (from shatest.c)
@@ -15,47 +15,148 @@ MD5:::31323334353637383930313233343536373839303132333435363738393031323334353637
15 15
16# AES 128 ECB tests (from FIPS-197 test vectors, encrypt) 16# AES 128 ECB tests (from FIPS-197 test vectors, encrypt)
17 17
18AES-128-ECB:000102030405060708090A0B0C0D0E0F::00112233445566778899AABBCCDDEEFF:69C4E0D86A7B0430D8CDB78070B4C55A 18AES-128-ECB:000102030405060708090A0B0C0D0E0F::00112233445566778899AABBCCDDEEFF:69C4E0D86A7B0430D8CDB78070B4C55A:1
19 19
20# AES 192 ECB tests (from FIPS-197 test vectors, encrypt) 20# AES 192 ECB tests (from FIPS-197 test vectors, encrypt)
21 21
22AES-192-ECB:000102030405060708090A0B0C0D0E0F1011121314151617::00112233445566778899AABBCCDDEEFF:DDA97CA4864CDFE06EAF70A0EC0D7191 22AES-192-ECB:000102030405060708090A0B0C0D0E0F1011121314151617::00112233445566778899AABBCCDDEEFF:DDA97CA4864CDFE06EAF70A0EC0D7191:1
23 23
24# AES 256 ECB tests (from FIPS-197 test vectors, encrypt) 24# AES 256 ECB tests (from FIPS-197 test vectors, encrypt)
25 25
26AES-256-ECB:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F::00112233445566778899AABBCCDDEEFF:8EA2B7CA516745BFEAFC49904B496089 26AES-256-ECB:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F::00112233445566778899AABBCCDDEEFF:8EA2B7CA516745BFEAFC49904B496089:1
27 27
28# AES 128 ECB tests (from NIST test vectors, encrypt) 28# AES 128 ECB tests (from NIST test vectors, encrypt)
29 29
30#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F 30#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F:1
31 31
32# AES 128 ECB tests (from NIST test vectors, decrypt) 32# AES 128 ECB tests (from NIST test vectors, decrypt)
33 33
34#AES-128-ECB:00000000000000000000000000000000::44416AC2D1F53C583303917E6BE9EBE0:00000000000000000000000000000000 34#AES-128-ECB:00000000000000000000000000000000::44416AC2D1F53C583303917E6BE9EBE0:00000000000000000000000000000000:0
35 35
36# AES 192 ECB tests (from NIST test vectors, decrypt) 36# AES 192 ECB tests (from NIST test vectors, decrypt)
37 37
38#AES-192-ECB:000000000000000000000000000000000000000000000000::48E31E9E256718F29229319C19F15BA4:00000000000000000000000000000000 38#AES-192-ECB:000000000000000000000000000000000000000000000000::48E31E9E256718F29229319C19F15BA4:00000000000000000000000000000000:0
39 39
40# AES 256 ECB tests (from NIST test vectors, decrypt) 40# AES 256 ECB tests (from NIST test vectors, decrypt)
41 41
42#AES-256-ECB:0000000000000000000000000000000000000000000000000000000000000000::058CCFFDBBCB382D1F6F56585D8A4ADE:00000000000000000000000000000000 42#AES-256-ECB:0000000000000000000000000000000000000000000000000000000000000000::058CCFFDBBCB382D1F6F56585D8A4ADE:00000000000000000000000000000000:0
43 43
44# AES 128 CBC tests (from NIST test vectors, encrypt) 44# AES 128 CBC tests (from NIST test vectors, encrypt)
45 45
46#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:8A05FC5E095AF4848A08D328D3688E3D 46#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:8A05FC5E095AF4848A08D328D3688E3D:1
47 47
48# AES 192 CBC tests (from NIST test vectors, encrypt) 48# AES 192 CBC tests (from NIST test vectors, encrypt)
49 49
50#AES-192-CBC:000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:7BD966D53AD8C1BB85D2ADFAE87BB104 50#AES-192-CBC:000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:7BD966D53AD8C1BB85D2ADFAE87BB104:1
51 51
52# AES 256 CBC tests (from NIST test vectors, encrypt) 52# AES 256 CBC tests (from NIST test vectors, encrypt)
53 53
54#AES-256-CBC:0000000000000000000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:FE3C53653E2F45B56FCD88B2CC898FF0 54#AES-256-CBC:0000000000000000000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:FE3C53653E2F45B56FCD88B2CC898FF0:1
55 55
56# AES 128 CBC tests (from NIST test vectors, decrypt) 56# AES 128 CBC tests (from NIST test vectors, decrypt)
57 57
58#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:FACA37E0B0C85373DF706E73F7C9AF86:00000000000000000000000000000000 58#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:FACA37E0B0C85373DF706E73F7C9AF86:00000000000000000000000000000000:0
59
60# AES tests from NIST document SP800-38A
61# For all ECB encrypts and decrypts, the transformed sequence is
62# AES-bits-ECB:key::plaintext:ciphertext:encdec
63# ECB-AES128.Encrypt and ECB-AES128.Decrypt
64AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::6BC1BEE22E409F96E93D7E117393172A:3AD77BB40D7A3660A89ECAF32466EF97
65AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::AE2D8A571E03AC9C9EB76FAC45AF8E51:F5D3D58503B9699DE785895A96FDBAAF
66AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::30C81C46A35CE411E5FBC1191A0A52EF:43B1CD7F598ECE23881B00E3ED030688
67AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::F69F2445DF4F9B17AD2B417BE66C3710:7B0C785E27E8AD3F8223207104725DD4
68# ECB-AES192.Encrypt and ECB-AES192.Decrypt
69AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::6BC1BEE22E409F96E93D7E117393172A:BD334F1D6E45F25FF712A214571FA5CC
70AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::AE2D8A571E03AC9C9EB76FAC45AF8E51:974104846D0AD3AD7734ECB3ECEE4EEF
71AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::30C81C46A35CE411E5FBC1191A0A52EF:EF7AFD2270E2E60ADCE0BA2FACE6444E
72AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::F69F2445DF4F9B17AD2B417BE66C3710:9A4B41BA738D6C72FB16691603C18E0E
73# ECB-AES256.Encrypt and ECB-AES256.Decrypt
74AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::6BC1BEE22E409F96E93D7E117393172A:F3EED1BDB5D2A03C064B5A7E3DB181F8
75AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::AE2D8A571E03AC9C9EB76FAC45AF8E51:591CCB10D410ED26DC5BA74A31362870
76AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::30C81C46A35CE411E5FBC1191A0A52EF:B6ED21B99CA6F4F9F153E7B1BEAFED1D
77AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::F69F2445DF4F9B17AD2B417BE66C3710:23304B7A39F9F3FF067D8D8F9E24ECC7
78# For all CBC encrypts and decrypts, the transformed sequence is
79# AES-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec
80# CBC-AES128.Encrypt and CBC-AES128.Decrypt
81AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:7649ABAC8119B246CEE98E9B12E9197D
82AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:7649ABAC8119B246CEE98E9B12E9197D:AE2D8A571E03AC9C9EB76FAC45AF8E51:5086CB9B507219EE95DB113A917678B2
83AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:5086CB9B507219EE95DB113A917678B2:30C81C46A35CE411E5FBC1191A0A52EF:73BED6B8E3C1743B7116E69E22229516
84AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:73BED6B8E3C1743B7116E69E22229516:F69F2445DF4F9B17AD2B417BE66C3710:3FF1CAA1681FAC09120ECA307586E1A7
85# CBC-AES192.Encrypt and CBC-AES192.Decrypt
86AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:4F021DB243BC633D7178183A9FA071E8
87AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:4F021DB243BC633D7178183A9FA071E8:AE2D8A571E03AC9C9EB76FAC45AF8E51:B4D9ADA9AD7DEDF4E5E738763F69145A
88AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:B4D9ADA9AD7DEDF4E5E738763F69145A:30C81C46A35CE411E5FBC1191A0A52EF:571B242012FB7AE07FA9BAAC3DF102E0
89AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:571B242012FB7AE07FA9BAAC3DF102E0:F69F2445DF4F9B17AD2B417BE66C3710:08B0E27988598881D920A9E64F5615CD
90# CBC-AES256.Encrypt and CBC-AES256.Decrypt
91AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:F58C4C04D6E5F1BA779EABFB5F7BFBD6
92AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:F58C4C04D6E5F1BA779EABFB5F7BFBD6:AE2D8A571E03AC9C9EB76FAC45AF8E51:9CFC4E967EDB808D679F777BC6702C7D
93AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:9CFC4E967EDB808D679F777BC6702C7D:30C81C46A35CE411E5FBC1191A0A52EF:39F23369A9D9BACFA530E26304231461
94AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39F23369A9D9BACFA530E26304231461:F69F2445DF4F9B17AD2B417BE66C3710:B2EB05E2C39BE9FCDA6C19078C6A9D1B
95# We don't support CFB{1,8}-AESxxx.{En,De}crypt
96# For all CFB128 encrypts and decrypts, the transformed sequence is
97# AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec
98# CFB128-AES128.Encrypt
99AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:1
100AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:3B3FD92EB72DAD20333449F8E83CFB4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:C8A64537A0B3A93FCDE3CDAD9F1CE58B:1
101AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:C8A64537A0B3A93FCDE3CDAD9F1CE58B:30C81C46A35CE411E5FBC1191A0A52EF:26751F67A3CBB140B1808CF187A4F4DF:1
102AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:26751F67A3CBB140B1808CF187A4F4DF:F69F2445DF4F9B17AD2B417BE66C3710:C04B05357C5D1C0EEAC4C66F9FF7F2E6:1
103# CFB128-AES128.Decrypt
104AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:0
105AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:3B3FD92EB72DAD20333449F8E83CFB4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:C8A64537A0B3A93FCDE3CDAD9F1CE58B:0
106AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:C8A64537A0B3A93FCDE3CDAD9F1CE58B:30C81C46A35CE411E5FBC1191A0A52EF:26751F67A3CBB140B1808CF187A4F4DF:0
107AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:26751F67A3CBB140B1808CF187A4F4DF:F69F2445DF4F9B17AD2B417BE66C3710:C04B05357C5D1C0EEAC4C66F9FF7F2E6:0
108# CFB128-AES192.Encrypt
109AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:1
110AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:CDC80D6FDDF18CAB34C25909C99A4174:AE2D8A571E03AC9C9EB76FAC45AF8E51:67CE7F7F81173621961A2B70171D3D7A:1
111AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:67CE7F7F81173621961A2B70171D3D7A:30C81C46A35CE411E5FBC1191A0A52EF:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:1
112AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:F69F2445DF4F9B17AD2B417BE66C3710:C05F9F9CA9834FA042AE8FBA584B09FF:1
113# CFB128-AES192.Decrypt
114AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:0
115AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:CDC80D6FDDF18CAB34C25909C99A4174:AE2D8A571E03AC9C9EB76FAC45AF8E51:67CE7F7F81173621961A2B70171D3D7A:0
116AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:67CE7F7F81173621961A2B70171D3D7A:30C81C46A35CE411E5FBC1191A0A52EF:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:0
117AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:F69F2445DF4F9B17AD2B417BE66C3710:C05F9F9CA9834FA042AE8FBA584B09FF:0
118# CFB128-AES256.Encrypt
119AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:1
120AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DC7E84BFDA79164B7ECD8486985D3860:AE2D8A571E03AC9C9EB76FAC45AF8E51:39FFED143B28B1C832113C6331E5407B:1
121AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39FFED143B28B1C832113C6331E5407B:30C81C46A35CE411E5FBC1191A0A52EF:DF10132415E54B92A13ED0A8267AE2F9:1
122AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DF10132415E54B92A13ED0A8267AE2F9:F69F2445DF4F9B17AD2B417BE66C3710:75A385741AB9CEF82031623D55B1E471:1
123# CFB128-AES256.Decrypt
124AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:0
125AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DC7E84BFDA79164B7ECD8486985D3860:AE2D8A571E03AC9C9EB76FAC45AF8E51:39FFED143B28B1C832113C6331E5407B:0
126AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39FFED143B28B1C832113C6331E5407B:30C81C46A35CE411E5FBC1191A0A52EF:DF10132415E54B92A13ED0A8267AE2F9:0
127AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DF10132415E54B92A13ED0A8267AE2F9:F69F2445DF4F9B17AD2B417BE66C3710:75A385741AB9CEF82031623D55B1E471:0
128# For all OFB encrypts and decrypts, the transformed sequence is
129# AES-bits-CFB:key:IV/output':plaintext:ciphertext:encdec
130# OFB-AES128.Encrypt
131AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:1
132AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:7789508D16918F03F53C52DAC54ED825:1
133AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:9740051E9C5FECF64344F7A82260EDCC:1
134AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:304C6528F659C77866A510D9C1D6AE5E:1
135# OFB-AES128.Decrypt
136AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:0
137AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:7789508D16918F03F53C52DAC54ED825:0
138AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:9740051E9C5FECF64344F7A82260EDCC:0
139AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:304C6528F659C77866A510D9C1D6AE5E:0
140# OFB-AES192.Encrypt
141AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:1
142AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:FCC28B8D4C63837C09E81700C1100401:1
143AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:8D9A9AEAC0F6596F559C6D4DAF59A5F2:1
144AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:6D9F200857CA6C3E9CAC524BD9ACC92A:1
145# OFB-AES192.Decrypt
146AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:0
147AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:FCC28B8D4C63837C09E81700C1100401:0
148AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:8D9A9AEAC0F6596F559C6D4DAF59A5F2:0
149AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:6D9F200857CA6C3E9CAC524BD9ACC92A:0
150# OFB-AES256.Encrypt
151AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:1
152AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:4FEBDC6740D20B3AC88F6AD82A4FB08D:1
153AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:1
154AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:1
155# OFB-AES256.Decrypt
156AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:0
157AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:4FEBDC6740D20B3AC88F6AD82A4FB08D:0
158AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:0
159AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:0
59 160
60# DES ECB tests (from destest) 161# DES ECB tests (from destest)
61 162
diff --git a/src/lib/libssl/src/crypto/objects/Makefile.ssl b/src/lib/libssl/src/crypto/objects/Makefile.ssl
index 7962a089db..c8e54facee 100644
--- a/src/lib/libssl/src/crypto/objects/Makefile.ssl
+++ b/src/lib/libssl/src/crypto/objects/Makefile.ssl
@@ -15,7 +15,6 @@ MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) 15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile.ssl 16MAKEFILE= Makefile.ssl
17AR= ar r 17AR= ar r
18PERL= perl
19 18
20CFLAGS= $(INCLUDES) $(CFLAG) 19CFLAGS= $(INCLUDES) $(CFLAG)
21 20
diff --git a/src/lib/libssl/src/crypto/objects/o_names.c b/src/lib/libssl/src/crypto/objects/o_names.c
index 2b80243256..b4453b4a98 100644
--- a/src/lib/libssl/src/crypto/objects/o_names.c
+++ b/src/lib/libssl/src/crypto/objects/o_names.c
@@ -79,6 +79,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
79 { 79 {
80 MemCheck_off(); 80 MemCheck_off();
81 name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS)); 81 name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS));
82 MemCheck_on();
83 if (!name_funcs) return(0);
82 name_funcs->hash_func = lh_strhash; 84 name_funcs->hash_func = lh_strhash;
83 name_funcs->cmp_func = OPENSSL_strcmp; 85 name_funcs->cmp_func = OPENSSL_strcmp;
84 name_funcs->free_func = 0; /* NULL is often declared to 86 name_funcs->free_func = 0; /* NULL is often declared to
@@ -86,6 +88,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
86 * to Compaq C is not really 88 * to Compaq C is not really
87 * compatible with a function 89 * compatible with a function
88 * pointer. -- Richard Levitte*/ 90 * pointer. -- Richard Levitte*/
91 MemCheck_off();
89 sk_NAME_FUNCS_push(name_funcs_stack,name_funcs); 92 sk_NAME_FUNCS_push(name_funcs_stack,name_funcs);
90 MemCheck_on(); 93 MemCheck_on();
91 } 94 }
diff --git a/src/lib/libssl/src/crypto/objects/obj_dat.c b/src/lib/libssl/src/crypto/objects/obj_dat.c
index 8779ba7d1d..3ff64bb8d1 100644
--- a/src/lib/libssl/src/crypto/objects/obj_dat.c
+++ b/src/lib/libssl/src/crypto/objects/obj_dat.c
@@ -236,7 +236,7 @@ int OBJ_add_object(const ASN1_OBJECT *obj)
236 if (added == NULL) 236 if (added == NULL)
237 if (!init_added()) return(0); 237 if (!init_added()) return(0);
238 if ((o=OBJ_dup(obj)) == NULL) goto err; 238 if ((o=OBJ_dup(obj)) == NULL) goto err;
239 ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); 239 if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err;
240 if ((o->length != 0) && (obj->data != NULL)) 240 if ((o->length != 0) && (obj->data != NULL))
241 ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); 241 ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
242 if (o->sn != NULL) 242 if (o->sn != NULL)
diff --git a/src/lib/libssl/src/crypto/objects/obj_mac.h b/src/lib/libssl/src/crypto/objects/obj_mac.h
deleted file mode 100644
index 6d77fcba3f..0000000000
--- a/src/lib/libssl/src/crypto/objects/obj_mac.h
+++ /dev/null
@@ -1,2307 +0,0 @@
1/* crypto/objects/obj_mac.h */
2
3/* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
4 * following command:
5 * perl objects.pl objects.txt obj_mac.num obj_mac.h
6 */
7
8/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
9 * All rights reserved.
10 *
11 * This package is an SSL implementation written
12 * by Eric Young (eay@cryptsoft.com).
13 * The implementation was written so as to conform with Netscapes SSL.
14 *
15 * This library is free for commercial and non-commercial use as long as
16 * the following conditions are aheared to. The following conditions
17 * apply to all code found in this distribution, be it the RC4, RSA,
18 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
19 * included with this distribution is covered by the same copyright terms
20 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
21 *
22 * Copyright remains Eric Young's, and as such any Copyright notices in
23 * the code are not to be removed.
24 * If this package is used in a product, Eric Young should be given attribution
25 * as the author of the parts of the library used.
26 * This can be in the form of a textual message at program startup or
27 * in documentation (online or textual) provided with the package.
28 *
29 * Redistribution and use in source and binary forms, with or without
30 * modification, are permitted provided that the following conditions
31 * are met:
32 * 1. Redistributions of source code must retain the copyright
33 * notice, this list of conditions and the following disclaimer.
34 * 2. Redistributions in binary form must reproduce the above copyright
35 * notice, this list of conditions and the following disclaimer in the
36 * documentation and/or other materials provided with the distribution.
37 * 3. All advertising materials mentioning features or use of this software
38 * must display the following acknowledgement:
39 * "This product includes cryptographic software written by
40 * Eric Young (eay@cryptsoft.com)"
41 * The word 'cryptographic' can be left out if the rouines from the library
42 * being used are not cryptographic related :-).
43 * 4. If you include any Windows specific code (or a derivative thereof) from
44 * the apps directory (application code) you must include an acknowledgement:
45 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
46 *
47 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
48 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
49 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
50 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
51 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
52 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
53 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
54 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
55 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
56 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
57 * SUCH DAMAGE.
58 *
59 * The licence and distribution terms for any publically available version or
60 * derivative of this code cannot be changed. i.e. this code cannot simply be
61 * copied and put under another distribution licence
62 * [including the GNU Public Licence.]
63 */
64
65#define SN_undef "UNDEF"
66#define LN_undef "undefined"
67#define NID_undef 0
68#define OBJ_undef 0L
69
70#define SN_ccitt "CCITT"
71#define LN_ccitt "ccitt"
72#define NID_ccitt 404
73#define OBJ_ccitt 0L
74
75#define SN_iso "ISO"
76#define LN_iso "iso"
77#define NID_iso 181
78#define OBJ_iso 1L
79
80#define SN_joint_iso_ccitt "JOINT-ISO-CCITT"
81#define LN_joint_iso_ccitt "joint-iso-ccitt"
82#define NID_joint_iso_ccitt 393
83#define OBJ_joint_iso_ccitt 2L
84
85#define SN_member_body "member-body"
86#define LN_member_body "ISO Member Body"
87#define NID_member_body 182
88#define OBJ_member_body OBJ_iso,2L
89
90#define SN_selected_attribute_types "selected-attribute-types"
91#define LN_selected_attribute_types "Selected Attribute Types"
92#define NID_selected_attribute_types 394
93#define OBJ_selected_attribute_types OBJ_joint_iso_ccitt,5L,1L,5L
94
95#define SN_clearance "clearance"
96#define NID_clearance 395
97#define OBJ_clearance OBJ_selected_attribute_types,55L
98
99#define SN_ISO_US "ISO-US"
100#define LN_ISO_US "ISO US Member Body"
101#define NID_ISO_US 183
102#define OBJ_ISO_US OBJ_member_body,840L
103
104#define SN_X9_57 "X9-57"
105#define LN_X9_57 "X9.57"
106#define NID_X9_57 184
107#define OBJ_X9_57 OBJ_ISO_US,10040L
108
109#define SN_X9cm "X9cm"
110#define LN_X9cm "X9.57 CM ?"
111#define NID_X9cm 185
112#define OBJ_X9cm OBJ_X9_57,4L
113
114#define SN_dsa "DSA"
115#define LN_dsa "dsaEncryption"
116#define NID_dsa 116
117#define OBJ_dsa OBJ_X9cm,1L
118
119#define SN_dsaWithSHA1 "DSA-SHA1"
120#define LN_dsaWithSHA1 "dsaWithSHA1"
121#define NID_dsaWithSHA1 113
122#define OBJ_dsaWithSHA1 OBJ_X9cm,3L
123
124#define SN_ansi_X9_62 "ansi-X9-62"
125#define LN_ansi_X9_62 "ANSI X9.62"
126#define NID_ansi_X9_62 405
127#define OBJ_ansi_X9_62 OBJ_ISO_US,10045L
128
129#define OBJ_X9_62_id_fieldType OBJ_ansi_X9_62,1L
130
131#define SN_X9_62_prime_field "prime-field"
132#define NID_X9_62_prime_field 406
133#define OBJ_X9_62_prime_field OBJ_X9_62_id_fieldType,1L
134
135#define SN_X9_62_characteristic_two_field "characteristic-two-field"
136#define NID_X9_62_characteristic_two_field 407
137#define OBJ_X9_62_characteristic_two_field OBJ_X9_62_id_fieldType,2L
138
139#define OBJ_X9_62_id_publicKeyType OBJ_ansi_X9_62,2L
140
141#define SN_X9_62_id_ecPublicKey "id-ecPublicKey"
142#define NID_X9_62_id_ecPublicKey 408
143#define OBJ_X9_62_id_ecPublicKey OBJ_X9_62_id_publicKeyType,1L
144
145#define OBJ_X9_62_ellipticCurve OBJ_ansi_X9_62,3L
146
147#define OBJ_X9_62_c_TwoCurve OBJ_X9_62_ellipticCurve,0L
148
149#define OBJ_X9_62_primeCurve OBJ_X9_62_ellipticCurve,1L
150
151#define SN_X9_62_prime192v1 "prime192v1"
152#define NID_X9_62_prime192v1 409
153#define OBJ_X9_62_prime192v1 OBJ_X9_62_primeCurve,1L
154
155#define SN_X9_62_prime192v2 "prime192v2"
156#define NID_X9_62_prime192v2 410
157#define OBJ_X9_62_prime192v2 OBJ_X9_62_primeCurve,2L
158
159#define SN_X9_62_prime192v3 "prime192v3"
160#define NID_X9_62_prime192v3 411
161#define OBJ_X9_62_prime192v3 OBJ_X9_62_primeCurve,3L
162
163#define SN_X9_62_prime239v1 "prime239v1"
164#define NID_X9_62_prime239v1 412
165#define OBJ_X9_62_prime239v1 OBJ_X9_62_primeCurve,4L
166
167#define SN_X9_62_prime239v2 "prime239v2"
168#define NID_X9_62_prime239v2 413
169#define OBJ_X9_62_prime239v2 OBJ_X9_62_primeCurve,5L
170
171#define SN_X9_62_prime239v3 "prime239v3"
172#define NID_X9_62_prime239v3 414
173#define OBJ_X9_62_prime239v3 OBJ_X9_62_primeCurve,6L
174
175#define SN_X9_62_prime256v1 "prime256v1"
176#define NID_X9_62_prime256v1 415
177#define OBJ_X9_62_prime256v1 OBJ_X9_62_primeCurve,7L
178
179#define OBJ_X9_62_id_ecSigType OBJ_ansi_X9_62,4L
180
181#define SN_ecdsa_with_SHA1 "ecdsa-with-SHA1"
182#define NID_ecdsa_with_SHA1 416
183#define OBJ_ecdsa_with_SHA1 OBJ_X9_62_id_ecSigType,1L
184
185#define SN_cast5_cbc "CAST5-CBC"
186#define LN_cast5_cbc "cast5-cbc"
187#define NID_cast5_cbc 108
188#define OBJ_cast5_cbc OBJ_ISO_US,113533L,7L,66L,10L
189
190#define SN_cast5_ecb "CAST5-ECB"
191#define LN_cast5_ecb "cast5-ecb"
192#define NID_cast5_ecb 109
193
194#define SN_cast5_cfb64 "CAST5-CFB"
195#define LN_cast5_cfb64 "cast5-cfb"
196#define NID_cast5_cfb64 110
197
198#define SN_cast5_ofb64 "CAST5-OFB"
199#define LN_cast5_ofb64 "cast5-ofb"
200#define NID_cast5_ofb64 111
201
202#define LN_pbeWithMD5AndCast5_CBC "pbeWithMD5AndCast5CBC"
203#define NID_pbeWithMD5AndCast5_CBC 112
204#define OBJ_pbeWithMD5AndCast5_CBC OBJ_ISO_US,113533L,7L,66L,12L
205
206#define SN_rsadsi "rsadsi"
207#define LN_rsadsi "RSA Data Security, Inc."
208#define NID_rsadsi 1
209#define OBJ_rsadsi OBJ_ISO_US,113549L
210
211#define SN_pkcs "pkcs"
212#define LN_pkcs "RSA Data Security, Inc. PKCS"
213#define NID_pkcs 2
214#define OBJ_pkcs OBJ_rsadsi,1L
215
216#define SN_pkcs1 "pkcs1"
217#define NID_pkcs1 186
218#define OBJ_pkcs1 OBJ_pkcs,1L
219
220#define LN_rsaEncryption "rsaEncryption"
221#define NID_rsaEncryption 6
222#define OBJ_rsaEncryption OBJ_pkcs1,1L
223
224#define SN_md2WithRSAEncryption "RSA-MD2"
225#define LN_md2WithRSAEncryption "md2WithRSAEncryption"
226#define NID_md2WithRSAEncryption 7
227#define OBJ_md2WithRSAEncryption OBJ_pkcs1,2L
228
229#define SN_md4WithRSAEncryption "RSA-MD4"
230#define LN_md4WithRSAEncryption "md4WithRSAEncryption"
231#define NID_md4WithRSAEncryption 396
232#define OBJ_md4WithRSAEncryption OBJ_pkcs1,3L
233
234#define SN_md5WithRSAEncryption "RSA-MD5"
235#define LN_md5WithRSAEncryption "md5WithRSAEncryption"
236#define NID_md5WithRSAEncryption 8
237#define OBJ_md5WithRSAEncryption OBJ_pkcs1,4L
238
239#define SN_sha1WithRSAEncryption "RSA-SHA1"
240#define LN_sha1WithRSAEncryption "sha1WithRSAEncryption"
241#define NID_sha1WithRSAEncryption 65
242#define OBJ_sha1WithRSAEncryption OBJ_pkcs1,5L
243
244#define SN_pkcs3 "pkcs3"
245#define NID_pkcs3 27
246#define OBJ_pkcs3 OBJ_pkcs,3L
247
248#define LN_dhKeyAgreement "dhKeyAgreement"
249#define NID_dhKeyAgreement 28
250#define OBJ_dhKeyAgreement OBJ_pkcs3,1L
251
252#define SN_pkcs5 "pkcs5"
253#define NID_pkcs5 187
254#define OBJ_pkcs5 OBJ_pkcs,5L
255
256#define SN_pbeWithMD2AndDES_CBC "PBE-MD2-DES"
257#define LN_pbeWithMD2AndDES_CBC "pbeWithMD2AndDES-CBC"
258#define NID_pbeWithMD2AndDES_CBC 9
259#define OBJ_pbeWithMD2AndDES_CBC OBJ_pkcs5,1L
260
261#define SN_pbeWithMD5AndDES_CBC "PBE-MD5-DES"
262#define LN_pbeWithMD5AndDES_CBC "pbeWithMD5AndDES-CBC"
263#define NID_pbeWithMD5AndDES_CBC 10
264#define OBJ_pbeWithMD5AndDES_CBC OBJ_pkcs5,3L
265
266#define SN_pbeWithMD2AndRC2_CBC "PBE-MD2-RC2-64"
267#define LN_pbeWithMD2AndRC2_CBC "pbeWithMD2AndRC2-CBC"
268#define NID_pbeWithMD2AndRC2_CBC 168
269#define OBJ_pbeWithMD2AndRC2_CBC OBJ_pkcs5,4L
270
271#define SN_pbeWithMD5AndRC2_CBC "PBE-MD5-RC2-64"
272#define LN_pbeWithMD5AndRC2_CBC "pbeWithMD5AndRC2-CBC"
273#define NID_pbeWithMD5AndRC2_CBC 169
274#define OBJ_pbeWithMD5AndRC2_CBC OBJ_pkcs5,6L
275
276#define SN_pbeWithSHA1AndDES_CBC "PBE-SHA1-DES"
277#define LN_pbeWithSHA1AndDES_CBC "pbeWithSHA1AndDES-CBC"
278#define NID_pbeWithSHA1AndDES_CBC 170
279#define OBJ_pbeWithSHA1AndDES_CBC OBJ_pkcs5,10L
280
281#define SN_pbeWithSHA1AndRC2_CBC "PBE-SHA1-RC2-64"
282#define LN_pbeWithSHA1AndRC2_CBC "pbeWithSHA1AndRC2-CBC"
283#define NID_pbeWithSHA1AndRC2_CBC 68
284#define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs5,11L
285
286#define LN_id_pbkdf2 "PBKDF2"
287#define NID_id_pbkdf2 69
288#define OBJ_id_pbkdf2 OBJ_pkcs5,12L
289
290#define LN_pbes2 "PBES2"
291#define NID_pbes2 161
292#define OBJ_pbes2 OBJ_pkcs5,13L
293
294#define LN_pbmac1 "PBMAC1"
295#define NID_pbmac1 162
296#define OBJ_pbmac1 OBJ_pkcs5,14L
297
298#define SN_pkcs7 "pkcs7"
299#define NID_pkcs7 20
300#define OBJ_pkcs7 OBJ_pkcs,7L
301
302#define LN_pkcs7_data "pkcs7-data"
303#define NID_pkcs7_data 21
304#define OBJ_pkcs7_data OBJ_pkcs7,1L
305
306#define LN_pkcs7_signed "pkcs7-signedData"
307#define NID_pkcs7_signed 22
308#define OBJ_pkcs7_signed OBJ_pkcs7,2L
309
310#define LN_pkcs7_enveloped "pkcs7-envelopedData"
311#define NID_pkcs7_enveloped 23
312#define OBJ_pkcs7_enveloped OBJ_pkcs7,3L
313
314#define LN_pkcs7_signedAndEnveloped "pkcs7-signedAndEnvelopedData"
315#define NID_pkcs7_signedAndEnveloped 24
316#define OBJ_pkcs7_signedAndEnveloped OBJ_pkcs7,4L
317
318#define LN_pkcs7_digest "pkcs7-digestData"
319#define NID_pkcs7_digest 25
320#define OBJ_pkcs7_digest OBJ_pkcs7,5L
321
322#define LN_pkcs7_encrypted "pkcs7-encryptedData"
323#define NID_pkcs7_encrypted 26
324#define OBJ_pkcs7_encrypted OBJ_pkcs7,6L
325
326#define SN_pkcs9 "pkcs9"
327#define NID_pkcs9 47
328#define OBJ_pkcs9 OBJ_pkcs,9L
329
330#define LN_pkcs9_emailAddress "emailAddress"
331#define NID_pkcs9_emailAddress 48
332#define OBJ_pkcs9_emailAddress OBJ_pkcs9,1L
333
334#define LN_pkcs9_unstructuredName "unstructuredName"
335#define NID_pkcs9_unstructuredName 49
336#define OBJ_pkcs9_unstructuredName OBJ_pkcs9,2L
337
338#define LN_pkcs9_contentType "contentType"
339#define NID_pkcs9_contentType 50
340#define OBJ_pkcs9_contentType OBJ_pkcs9,3L
341
342#define LN_pkcs9_messageDigest "messageDigest"
343#define NID_pkcs9_messageDigest 51
344#define OBJ_pkcs9_messageDigest OBJ_pkcs9,4L
345
346#define LN_pkcs9_signingTime "signingTime"
347#define NID_pkcs9_signingTime 52
348#define OBJ_pkcs9_signingTime OBJ_pkcs9,5L
349
350#define LN_pkcs9_countersignature "countersignature"
351#define NID_pkcs9_countersignature 53
352#define OBJ_pkcs9_countersignature OBJ_pkcs9,6L
353
354#define LN_pkcs9_challengePassword "challengePassword"
355#define NID_pkcs9_challengePassword 54
356#define OBJ_pkcs9_challengePassword OBJ_pkcs9,7L
357
358#define LN_pkcs9_unstructuredAddress "unstructuredAddress"
359#define NID_pkcs9_unstructuredAddress 55
360#define OBJ_pkcs9_unstructuredAddress OBJ_pkcs9,8L
361
362#define LN_pkcs9_extCertAttributes "extendedCertificateAttributes"
363#define NID_pkcs9_extCertAttributes 56
364#define OBJ_pkcs9_extCertAttributes OBJ_pkcs9,9L
365
366#define SN_ext_req "extReq"
367#define LN_ext_req "Extension Request"
368#define NID_ext_req 172
369#define OBJ_ext_req OBJ_pkcs9,14L
370
371#define SN_SMIMECapabilities "SMIME-CAPS"
372#define LN_SMIMECapabilities "S/MIME Capabilities"
373#define NID_SMIMECapabilities 167
374#define OBJ_SMIMECapabilities OBJ_pkcs9,15L
375
376#define SN_SMIME "SMIME"
377#define LN_SMIME "S/MIME"
378#define NID_SMIME 188
379#define OBJ_SMIME OBJ_pkcs9,16L
380
381#define SN_id_smime_mod "id-smime-mod"
382#define NID_id_smime_mod 189
383#define OBJ_id_smime_mod OBJ_SMIME,0L
384
385#define SN_id_smime_ct "id-smime-ct"
386#define NID_id_smime_ct 190
387#define OBJ_id_smime_ct OBJ_SMIME,1L
388
389#define SN_id_smime_aa "id-smime-aa"
390#define NID_id_smime_aa 191
391#define OBJ_id_smime_aa OBJ_SMIME,2L
392
393#define SN_id_smime_alg "id-smime-alg"
394#define NID_id_smime_alg 192
395#define OBJ_id_smime_alg OBJ_SMIME,3L
396
397#define SN_id_smime_cd "id-smime-cd"
398#define NID_id_smime_cd 193
399#define OBJ_id_smime_cd OBJ_SMIME,4L
400
401#define SN_id_smime_spq "id-smime-spq"
402#define NID_id_smime_spq 194
403#define OBJ_id_smime_spq OBJ_SMIME,5L
404
405#define SN_id_smime_cti "id-smime-cti"
406#define NID_id_smime_cti 195
407#define OBJ_id_smime_cti OBJ_SMIME,6L
408
409#define SN_id_smime_mod_cms "id-smime-mod-cms"
410#define NID_id_smime_mod_cms 196
411#define OBJ_id_smime_mod_cms OBJ_id_smime_mod,1L
412
413#define SN_id_smime_mod_ess "id-smime-mod-ess"
414#define NID_id_smime_mod_ess 197
415#define OBJ_id_smime_mod_ess OBJ_id_smime_mod,2L
416
417#define SN_id_smime_mod_oid "id-smime-mod-oid"
418#define NID_id_smime_mod_oid 198
419#define OBJ_id_smime_mod_oid OBJ_id_smime_mod,3L
420
421#define SN_id_smime_mod_msg_v3 "id-smime-mod-msg-v3"
422#define NID_id_smime_mod_msg_v3 199
423#define OBJ_id_smime_mod_msg_v3 OBJ_id_smime_mod,4L
424
425#define SN_id_smime_mod_ets_eSignature_88 "id-smime-mod-ets-eSignature-88"
426#define NID_id_smime_mod_ets_eSignature_88 200
427#define OBJ_id_smime_mod_ets_eSignature_88 OBJ_id_smime_mod,5L
428
429#define SN_id_smime_mod_ets_eSignature_97 "id-smime-mod-ets-eSignature-97"
430#define NID_id_smime_mod_ets_eSignature_97 201
431#define OBJ_id_smime_mod_ets_eSignature_97 OBJ_id_smime_mod,6L
432
433#define SN_id_smime_mod_ets_eSigPolicy_88 "id-smime-mod-ets-eSigPolicy-88"
434#define NID_id_smime_mod_ets_eSigPolicy_88 202
435#define OBJ_id_smime_mod_ets_eSigPolicy_88 OBJ_id_smime_mod,7L
436
437#define SN_id_smime_mod_ets_eSigPolicy_97 "id-smime-mod-ets-eSigPolicy-97"
438#define NID_id_smime_mod_ets_eSigPolicy_97 203
439#define OBJ_id_smime_mod_ets_eSigPolicy_97 OBJ_id_smime_mod,8L
440
441#define SN_id_smime_ct_receipt "id-smime-ct-receipt"
442#define NID_id_smime_ct_receipt 204
443#define OBJ_id_smime_ct_receipt OBJ_id_smime_ct,1L
444
445#define SN_id_smime_ct_authData "id-smime-ct-authData"
446#define NID_id_smime_ct_authData 205
447#define OBJ_id_smime_ct_authData OBJ_id_smime_ct,2L
448
449#define SN_id_smime_ct_publishCert "id-smime-ct-publishCert"
450#define NID_id_smime_ct_publishCert 206
451#define OBJ_id_smime_ct_publishCert OBJ_id_smime_ct,3L
452
453#define SN_id_smime_ct_TSTInfo "id-smime-ct-TSTInfo"
454#define NID_id_smime_ct_TSTInfo 207
455#define OBJ_id_smime_ct_TSTInfo OBJ_id_smime_ct,4L
456
457#define SN_id_smime_ct_TDTInfo "id-smime-ct-TDTInfo"
458#define NID_id_smime_ct_TDTInfo 208
459#define OBJ_id_smime_ct_TDTInfo OBJ_id_smime_ct,5L
460
461#define SN_id_smime_ct_contentInfo "id-smime-ct-contentInfo"
462#define NID_id_smime_ct_contentInfo 209
463#define OBJ_id_smime_ct_contentInfo OBJ_id_smime_ct,6L
464
465#define SN_id_smime_ct_DVCSRequestData "id-smime-ct-DVCSRequestData"
466#define NID_id_smime_ct_DVCSRequestData 210
467#define OBJ_id_smime_ct_DVCSRequestData OBJ_id_smime_ct,7L
468
469#define SN_id_smime_ct_DVCSResponseData "id-smime-ct-DVCSResponseData"
470#define NID_id_smime_ct_DVCSResponseData 211
471#define OBJ_id_smime_ct_DVCSResponseData OBJ_id_smime_ct,8L
472
473#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
474#define NID_id_smime_aa_receiptRequest 212
475#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
476
477#define SN_id_smime_aa_securityLabel "id-smime-aa-securityLabel"
478#define NID_id_smime_aa_securityLabel 213
479#define OBJ_id_smime_aa_securityLabel OBJ_id_smime_aa,2L
480
481#define SN_id_smime_aa_mlExpandHistory "id-smime-aa-mlExpandHistory"
482#define NID_id_smime_aa_mlExpandHistory 214
483#define OBJ_id_smime_aa_mlExpandHistory OBJ_id_smime_aa,3L
484
485#define SN_id_smime_aa_contentHint "id-smime-aa-contentHint"
486#define NID_id_smime_aa_contentHint 215
487#define OBJ_id_smime_aa_contentHint OBJ_id_smime_aa,4L
488
489#define SN_id_smime_aa_msgSigDigest "id-smime-aa-msgSigDigest"
490#define NID_id_smime_aa_msgSigDigest 216
491#define OBJ_id_smime_aa_msgSigDigest OBJ_id_smime_aa,5L
492
493#define SN_id_smime_aa_encapContentType "id-smime-aa-encapContentType"
494#define NID_id_smime_aa_encapContentType 217
495#define OBJ_id_smime_aa_encapContentType OBJ_id_smime_aa,6L
496
497#define SN_id_smime_aa_contentIdentifier "id-smime-aa-contentIdentifier"
498#define NID_id_smime_aa_contentIdentifier 218
499#define OBJ_id_smime_aa_contentIdentifier OBJ_id_smime_aa,7L
500
501#define SN_id_smime_aa_macValue "id-smime-aa-macValue"
502#define NID_id_smime_aa_macValue 219
503#define OBJ_id_smime_aa_macValue OBJ_id_smime_aa,8L
504
505#define SN_id_smime_aa_equivalentLabels "id-smime-aa-equivalentLabels"
506#define NID_id_smime_aa_equivalentLabels 220
507#define OBJ_id_smime_aa_equivalentLabels OBJ_id_smime_aa,9L
508
509#define SN_id_smime_aa_contentReference "id-smime-aa-contentReference"
510#define NID_id_smime_aa_contentReference 221
511#define OBJ_id_smime_aa_contentReference OBJ_id_smime_aa,10L
512
513#define SN_id_smime_aa_encrypKeyPref "id-smime-aa-encrypKeyPref"
514#define NID_id_smime_aa_encrypKeyPref 222
515#define OBJ_id_smime_aa_encrypKeyPref OBJ_id_smime_aa,11L
516
517#define SN_id_smime_aa_signingCertificate "id-smime-aa-signingCertificate"
518#define NID_id_smime_aa_signingCertificate 223
519#define OBJ_id_smime_aa_signingCertificate OBJ_id_smime_aa,12L
520
521#define SN_id_smime_aa_smimeEncryptCerts "id-smime-aa-smimeEncryptCerts"
522#define NID_id_smime_aa_smimeEncryptCerts 224
523#define OBJ_id_smime_aa_smimeEncryptCerts OBJ_id_smime_aa,13L
524
525#define SN_id_smime_aa_timeStampToken "id-smime-aa-timeStampToken"
526#define NID_id_smime_aa_timeStampToken 225
527#define OBJ_id_smime_aa_timeStampToken OBJ_id_smime_aa,14L
528
529#define SN_id_smime_aa_ets_sigPolicyId "id-smime-aa-ets-sigPolicyId"
530#define NID_id_smime_aa_ets_sigPolicyId 226
531#define OBJ_id_smime_aa_ets_sigPolicyId OBJ_id_smime_aa,15L
532
533#define SN_id_smime_aa_ets_commitmentType "id-smime-aa-ets-commitmentType"
534#define NID_id_smime_aa_ets_commitmentType 227
535#define OBJ_id_smime_aa_ets_commitmentType OBJ_id_smime_aa,16L
536
537#define SN_id_smime_aa_ets_signerLocation "id-smime-aa-ets-signerLocation"
538#define NID_id_smime_aa_ets_signerLocation 228
539#define OBJ_id_smime_aa_ets_signerLocation OBJ_id_smime_aa,17L
540
541#define SN_id_smime_aa_ets_signerAttr "id-smime-aa-ets-signerAttr"
542#define NID_id_smime_aa_ets_signerAttr 229
543#define OBJ_id_smime_aa_ets_signerAttr OBJ_id_smime_aa,18L
544
545#define SN_id_smime_aa_ets_otherSigCert "id-smime-aa-ets-otherSigCert"
546#define NID_id_smime_aa_ets_otherSigCert 230
547#define OBJ_id_smime_aa_ets_otherSigCert OBJ_id_smime_aa,19L
548
549#define SN_id_smime_aa_ets_contentTimestamp "id-smime-aa-ets-contentTimestamp"
550#define NID_id_smime_aa_ets_contentTimestamp 231
551#define OBJ_id_smime_aa_ets_contentTimestamp OBJ_id_smime_aa,20L
552
553#define SN_id_smime_aa_ets_CertificateRefs "id-smime-aa-ets-CertificateRefs"
554#define NID_id_smime_aa_ets_CertificateRefs 232
555#define OBJ_id_smime_aa_ets_CertificateRefs OBJ_id_smime_aa,21L
556
557#define SN_id_smime_aa_ets_RevocationRefs "id-smime-aa-ets-RevocationRefs"
558#define NID_id_smime_aa_ets_RevocationRefs 233
559#define OBJ_id_smime_aa_ets_RevocationRefs OBJ_id_smime_aa,22L
560
561#define SN_id_smime_aa_ets_certValues "id-smime-aa-ets-certValues"
562#define NID_id_smime_aa_ets_certValues 234
563#define OBJ_id_smime_aa_ets_certValues OBJ_id_smime_aa,23L
564
565#define SN_id_smime_aa_ets_revocationValues "id-smime-aa-ets-revocationValues"
566#define NID_id_smime_aa_ets_revocationValues 235
567#define OBJ_id_smime_aa_ets_revocationValues OBJ_id_smime_aa,24L
568
569#define SN_id_smime_aa_ets_escTimeStamp "id-smime-aa-ets-escTimeStamp"
570#define NID_id_smime_aa_ets_escTimeStamp 236
571#define OBJ_id_smime_aa_ets_escTimeStamp OBJ_id_smime_aa,25L
572
573#define SN_id_smime_aa_ets_certCRLTimestamp "id-smime-aa-ets-certCRLTimestamp"
574#define NID_id_smime_aa_ets_certCRLTimestamp 237
575#define OBJ_id_smime_aa_ets_certCRLTimestamp OBJ_id_smime_aa,26L
576
577#define SN_id_smime_aa_ets_archiveTimeStamp "id-smime-aa-ets-archiveTimeStamp"
578#define NID_id_smime_aa_ets_archiveTimeStamp 238
579#define OBJ_id_smime_aa_ets_archiveTimeStamp OBJ_id_smime_aa,27L
580
581#define SN_id_smime_aa_signatureType "id-smime-aa-signatureType"
582#define NID_id_smime_aa_signatureType 239
583#define OBJ_id_smime_aa_signatureType OBJ_id_smime_aa,28L
584
585#define SN_id_smime_aa_dvcs_dvc "id-smime-aa-dvcs-dvc"
586#define NID_id_smime_aa_dvcs_dvc 240
587#define OBJ_id_smime_aa_dvcs_dvc OBJ_id_smime_aa,29L
588
589#define SN_id_smime_alg_ESDHwith3DES "id-smime-alg-ESDHwith3DES"
590#define NID_id_smime_alg_ESDHwith3DES 241
591#define OBJ_id_smime_alg_ESDHwith3DES OBJ_id_smime_alg,1L
592
593#define SN_id_smime_alg_ESDHwithRC2 "id-smime-alg-ESDHwithRC2"
594#define NID_id_smime_alg_ESDHwithRC2 242
595#define OBJ_id_smime_alg_ESDHwithRC2 OBJ_id_smime_alg,2L
596
597#define SN_id_smime_alg_3DESwrap "id-smime-alg-3DESwrap"
598#define NID_id_smime_alg_3DESwrap 243
599#define OBJ_id_smime_alg_3DESwrap OBJ_id_smime_alg,3L
600
601#define SN_id_smime_alg_RC2wrap "id-smime-alg-RC2wrap"
602#define NID_id_smime_alg_RC2wrap 244
603#define OBJ_id_smime_alg_RC2wrap OBJ_id_smime_alg,4L
604
605#define SN_id_smime_alg_ESDH "id-smime-alg-ESDH"
606#define NID_id_smime_alg_ESDH 245
607#define OBJ_id_smime_alg_ESDH OBJ_id_smime_alg,5L
608
609#define SN_id_smime_alg_CMS3DESwrap "id-smime-alg-CMS3DESwrap"
610#define NID_id_smime_alg_CMS3DESwrap 246
611#define OBJ_id_smime_alg_CMS3DESwrap OBJ_id_smime_alg,6L
612
613#define SN_id_smime_alg_CMSRC2wrap "id-smime-alg-CMSRC2wrap"
614#define NID_id_smime_alg_CMSRC2wrap 247
615#define OBJ_id_smime_alg_CMSRC2wrap OBJ_id_smime_alg,7L
616
617#define SN_id_smime_cd_ldap "id-smime-cd-ldap"
618#define NID_id_smime_cd_ldap 248
619#define OBJ_id_smime_cd_ldap OBJ_id_smime_cd,1L
620
621#define SN_id_smime_spq_ets_sqt_uri "id-smime-spq-ets-sqt-uri"
622#define NID_id_smime_spq_ets_sqt_uri 249
623#define OBJ_id_smime_spq_ets_sqt_uri OBJ_id_smime_spq,1L
624
625#define SN_id_smime_spq_ets_sqt_unotice "id-smime-spq-ets-sqt-unotice"
626#define NID_id_smime_spq_ets_sqt_unotice 250
627#define OBJ_id_smime_spq_ets_sqt_unotice OBJ_id_smime_spq,2L
628
629#define SN_id_smime_cti_ets_proofOfOrigin "id-smime-cti-ets-proofOfOrigin"
630#define NID_id_smime_cti_ets_proofOfOrigin 251
631#define OBJ_id_smime_cti_ets_proofOfOrigin OBJ_id_smime_cti,1L
632
633#define SN_id_smime_cti_ets_proofOfReceipt "id-smime-cti-ets-proofOfReceipt"
634#define NID_id_smime_cti_ets_proofOfReceipt 252
635#define OBJ_id_smime_cti_ets_proofOfReceipt OBJ_id_smime_cti,2L
636
637#define SN_id_smime_cti_ets_proofOfDelivery "id-smime-cti-ets-proofOfDelivery"
638#define NID_id_smime_cti_ets_proofOfDelivery 253
639#define OBJ_id_smime_cti_ets_proofOfDelivery OBJ_id_smime_cti,3L
640
641#define SN_id_smime_cti_ets_proofOfSender "id-smime-cti-ets-proofOfSender"
642#define NID_id_smime_cti_ets_proofOfSender 254
643#define OBJ_id_smime_cti_ets_proofOfSender OBJ_id_smime_cti,4L
644
645#define SN_id_smime_cti_ets_proofOfApproval "id-smime-cti-ets-proofOfApproval"
646#define NID_id_smime_cti_ets_proofOfApproval 255
647#define OBJ_id_smime_cti_ets_proofOfApproval OBJ_id_smime_cti,5L
648
649#define SN_id_smime_cti_ets_proofOfCreation "id-smime-cti-ets-proofOfCreation"
650#define NID_id_smime_cti_ets_proofOfCreation 256
651#define OBJ_id_smime_cti_ets_proofOfCreation OBJ_id_smime_cti,6L
652
653#define LN_friendlyName "friendlyName"
654#define NID_friendlyName 156
655#define OBJ_friendlyName OBJ_pkcs9,20L
656
657#define LN_localKeyID "localKeyID"
658#define NID_localKeyID 157
659#define OBJ_localKeyID OBJ_pkcs9,21L
660
661#define SN_ms_csp_name "CSPName"
662#define LN_ms_csp_name "Microsoft CSP Name"
663#define NID_ms_csp_name 417
664#define OBJ_ms_csp_name 1L,3L,6L,1L,4L,1L,311L,17L,1L
665
666#define OBJ_certTypes OBJ_pkcs9,22L
667
668#define LN_x509Certificate "x509Certificate"
669#define NID_x509Certificate 158
670#define OBJ_x509Certificate OBJ_certTypes,1L
671
672#define LN_sdsiCertificate "sdsiCertificate"
673#define NID_sdsiCertificate 159
674#define OBJ_sdsiCertificate OBJ_certTypes,2L
675
676#define OBJ_crlTypes OBJ_pkcs9,23L
677
678#define LN_x509Crl "x509Crl"
679#define NID_x509Crl 160
680#define OBJ_x509Crl OBJ_crlTypes,1L
681
682#define OBJ_pkcs12 OBJ_pkcs,12L
683
684#define OBJ_pkcs12_pbeids OBJ_pkcs12,1L
685
686#define SN_pbe_WithSHA1And128BitRC4 "PBE-SHA1-RC4-128"
687#define LN_pbe_WithSHA1And128BitRC4 "pbeWithSHA1And128BitRC4"
688#define NID_pbe_WithSHA1And128BitRC4 144
689#define OBJ_pbe_WithSHA1And128BitRC4 OBJ_pkcs12_pbeids,1L
690
691#define SN_pbe_WithSHA1And40BitRC4 "PBE-SHA1-RC4-40"
692#define LN_pbe_WithSHA1And40BitRC4 "pbeWithSHA1And40BitRC4"
693#define NID_pbe_WithSHA1And40BitRC4 145
694#define OBJ_pbe_WithSHA1And40BitRC4 OBJ_pkcs12_pbeids,2L
695
696#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC "PBE-SHA1-3DES"
697#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC "pbeWithSHA1And3-KeyTripleDES-CBC"
698#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC 146
699#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC OBJ_pkcs12_pbeids,3L
700
701#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC "PBE-SHA1-2DES"
702#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC "pbeWithSHA1And2-KeyTripleDES-CBC"
703#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC 147
704#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC OBJ_pkcs12_pbeids,4L
705
706#define SN_pbe_WithSHA1And128BitRC2_CBC "PBE-SHA1-RC2-128"
707#define LN_pbe_WithSHA1And128BitRC2_CBC "pbeWithSHA1And128BitRC2-CBC"
708#define NID_pbe_WithSHA1And128BitRC2_CBC 148
709#define OBJ_pbe_WithSHA1And128BitRC2_CBC OBJ_pkcs12_pbeids,5L
710
711#define SN_pbe_WithSHA1And40BitRC2_CBC "PBE-SHA1-RC2-40"
712#define LN_pbe_WithSHA1And40BitRC2_CBC "pbeWithSHA1And40BitRC2-CBC"
713#define NID_pbe_WithSHA1And40BitRC2_CBC 149
714#define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids,6L
715
716#define OBJ_pkcs12_Version1 OBJ_pkcs12,10L
717
718#define OBJ_pkcs12_BagIds OBJ_pkcs12_Version1,1L
719
720#define LN_keyBag "keyBag"
721#define NID_keyBag 150
722#define OBJ_keyBag OBJ_pkcs12_BagIds,1L
723
724#define LN_pkcs8ShroudedKeyBag "pkcs8ShroudedKeyBag"
725#define NID_pkcs8ShroudedKeyBag 151
726#define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds,2L
727
728#define LN_certBag "certBag"
729#define NID_certBag 152
730#define OBJ_certBag OBJ_pkcs12_BagIds,3L
731
732#define LN_crlBag "crlBag"
733#define NID_crlBag 153
734#define OBJ_crlBag OBJ_pkcs12_BagIds,4L
735
736#define LN_secretBag "secretBag"
737#define NID_secretBag 154
738#define OBJ_secretBag OBJ_pkcs12_BagIds,5L
739
740#define LN_safeContentsBag "safeContentsBag"
741#define NID_safeContentsBag 155
742#define OBJ_safeContentsBag OBJ_pkcs12_BagIds,6L
743
744#define SN_md2 "MD2"
745#define LN_md2 "md2"
746#define NID_md2 3
747#define OBJ_md2 OBJ_rsadsi,2L,2L
748
749#define SN_md4 "MD4"
750#define LN_md4 "md4"
751#define NID_md4 257
752#define OBJ_md4 OBJ_rsadsi,2L,4L
753
754#define SN_md5 "MD5"
755#define LN_md5 "md5"
756#define NID_md5 4
757#define OBJ_md5 OBJ_rsadsi,2L,5L
758
759#define SN_md5_sha1 "MD5-SHA1"
760#define LN_md5_sha1 "md5-sha1"
761#define NID_md5_sha1 114
762
763#define LN_hmacWithSHA1 "hmacWithSHA1"
764#define NID_hmacWithSHA1 163
765#define OBJ_hmacWithSHA1 OBJ_rsadsi,2L,7L
766
767#define SN_rc2_cbc "RC2-CBC"
768#define LN_rc2_cbc "rc2-cbc"
769#define NID_rc2_cbc 37
770#define OBJ_rc2_cbc OBJ_rsadsi,3L,2L
771
772#define SN_rc2_ecb "RC2-ECB"
773#define LN_rc2_ecb "rc2-ecb"
774#define NID_rc2_ecb 38
775
776#define SN_rc2_cfb64 "RC2-CFB"
777#define LN_rc2_cfb64 "rc2-cfb"
778#define NID_rc2_cfb64 39
779
780#define SN_rc2_ofb64 "RC2-OFB"
781#define LN_rc2_ofb64 "rc2-ofb"
782#define NID_rc2_ofb64 40
783
784#define SN_rc2_40_cbc "RC2-40-CBC"
785#define LN_rc2_40_cbc "rc2-40-cbc"
786#define NID_rc2_40_cbc 98
787
788#define SN_rc2_64_cbc "RC2-64-CBC"
789#define LN_rc2_64_cbc "rc2-64-cbc"
790#define NID_rc2_64_cbc 166
791
792#define SN_rc4 "RC4"
793#define LN_rc4 "rc4"
794#define NID_rc4 5
795#define OBJ_rc4 OBJ_rsadsi,3L,4L
796
797#define SN_rc4_40 "RC4-40"
798#define LN_rc4_40 "rc4-40"
799#define NID_rc4_40 97
800
801#define SN_des_ede3_cbc "DES-EDE3-CBC"
802#define LN_des_ede3_cbc "des-ede3-cbc"
803#define NID_des_ede3_cbc 44
804#define OBJ_des_ede3_cbc OBJ_rsadsi,3L,7L
805
806#define SN_rc5_cbc "RC5-CBC"
807#define LN_rc5_cbc "rc5-cbc"
808#define NID_rc5_cbc 120
809#define OBJ_rc5_cbc OBJ_rsadsi,3L,8L
810
811#define SN_rc5_ecb "RC5-ECB"
812#define LN_rc5_ecb "rc5-ecb"
813#define NID_rc5_ecb 121
814
815#define SN_rc5_cfb64 "RC5-CFB"
816#define LN_rc5_cfb64 "rc5-cfb"
817#define NID_rc5_cfb64 122
818
819#define SN_rc5_ofb64 "RC5-OFB"
820#define LN_rc5_ofb64 "rc5-ofb"
821#define NID_rc5_ofb64 123
822
823#define SN_ms_ext_req "msExtReq"
824#define LN_ms_ext_req "Microsoft Extension Request"
825#define NID_ms_ext_req 171
826#define OBJ_ms_ext_req 1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
827
828#define SN_ms_code_ind "msCodeInd"
829#define LN_ms_code_ind "Microsoft Individual Code Signing"
830#define NID_ms_code_ind 134
831#define OBJ_ms_code_ind 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
832
833#define SN_ms_code_com "msCodeCom"
834#define LN_ms_code_com "Microsoft Commercial Code Signing"
835#define NID_ms_code_com 135
836#define OBJ_ms_code_com 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
837
838#define SN_ms_ctl_sign "msCTLSign"
839#define LN_ms_ctl_sign "Microsoft Trust List Signing"
840#define NID_ms_ctl_sign 136
841#define OBJ_ms_ctl_sign 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
842
843#define SN_ms_sgc "msSGC"
844#define LN_ms_sgc "Microsoft Server Gated Crypto"
845#define NID_ms_sgc 137
846#define OBJ_ms_sgc 1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
847
848#define SN_ms_efs "msEFS"
849#define LN_ms_efs "Microsoft Encrypted File System"
850#define NID_ms_efs 138
851#define OBJ_ms_efs 1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
852
853#define SN_idea_cbc "IDEA-CBC"
854#define LN_idea_cbc "idea-cbc"
855#define NID_idea_cbc 34
856#define OBJ_idea_cbc 1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
857
858#define SN_idea_ecb "IDEA-ECB"
859#define LN_idea_ecb "idea-ecb"
860#define NID_idea_ecb 36
861
862#define SN_idea_cfb64 "IDEA-CFB"
863#define LN_idea_cfb64 "idea-cfb"
864#define NID_idea_cfb64 35
865
866#define SN_idea_ofb64 "IDEA-OFB"
867#define LN_idea_ofb64 "idea-ofb"
868#define NID_idea_ofb64 46
869
870#define SN_bf_cbc "BF-CBC"
871#define LN_bf_cbc "bf-cbc"
872#define NID_bf_cbc 91
873#define OBJ_bf_cbc 1L,3L,6L,1L,4L,1L,3029L,1L,2L
874
875#define SN_bf_ecb "BF-ECB"
876#define LN_bf_ecb "bf-ecb"
877#define NID_bf_ecb 92
878
879#define SN_bf_cfb64 "BF-CFB"
880#define LN_bf_cfb64 "bf-cfb"
881#define NID_bf_cfb64 93
882
883#define SN_bf_ofb64 "BF-OFB"
884#define LN_bf_ofb64 "bf-ofb"
885#define NID_bf_ofb64 94
886
887#define SN_id_pkix "PKIX"
888#define NID_id_pkix 127
889#define OBJ_id_pkix 1L,3L,6L,1L,5L,5L,7L
890
891#define SN_id_pkix_mod "id-pkix-mod"
892#define NID_id_pkix_mod 258
893#define OBJ_id_pkix_mod OBJ_id_pkix,0L
894
895#define SN_id_pe "id-pe"
896#define NID_id_pe 175
897#define OBJ_id_pe OBJ_id_pkix,1L
898
899#define SN_id_qt "id-qt"
900#define NID_id_qt 259
901#define OBJ_id_qt OBJ_id_pkix,2L
902
903#define SN_id_kp "id-kp"
904#define NID_id_kp 128
905#define OBJ_id_kp OBJ_id_pkix,3L
906
907#define SN_id_it "id-it"
908#define NID_id_it 260
909#define OBJ_id_it OBJ_id_pkix,4L
910
911#define SN_id_pkip "id-pkip"
912#define NID_id_pkip 261
913#define OBJ_id_pkip OBJ_id_pkix,5L
914
915#define SN_id_alg "id-alg"
916#define NID_id_alg 262
917#define OBJ_id_alg OBJ_id_pkix,6L
918
919#define SN_id_cmc "id-cmc"
920#define NID_id_cmc 263
921#define OBJ_id_cmc OBJ_id_pkix,7L
922
923#define SN_id_on "id-on"
924#define NID_id_on 264
925#define OBJ_id_on OBJ_id_pkix,8L
926
927#define SN_id_pda "id-pda"
928#define NID_id_pda 265
929#define OBJ_id_pda OBJ_id_pkix,9L
930
931#define SN_id_aca "id-aca"
932#define NID_id_aca 266
933#define OBJ_id_aca OBJ_id_pkix,10L
934
935#define SN_id_qcs "id-qcs"
936#define NID_id_qcs 267
937#define OBJ_id_qcs OBJ_id_pkix,11L
938
939#define SN_id_cct "id-cct"
940#define NID_id_cct 268
941#define OBJ_id_cct OBJ_id_pkix,12L
942
943#define SN_id_ad "id-ad"
944#define NID_id_ad 176
945#define OBJ_id_ad OBJ_id_pkix,48L
946
947#define SN_id_pkix1_explicit_88 "id-pkix1-explicit-88"
948#define NID_id_pkix1_explicit_88 269
949#define OBJ_id_pkix1_explicit_88 OBJ_id_pkix_mod,1L
950
951#define SN_id_pkix1_implicit_88 "id-pkix1-implicit-88"
952#define NID_id_pkix1_implicit_88 270
953#define OBJ_id_pkix1_implicit_88 OBJ_id_pkix_mod,2L
954
955#define SN_id_pkix1_explicit_93 "id-pkix1-explicit-93"
956#define NID_id_pkix1_explicit_93 271
957#define OBJ_id_pkix1_explicit_93 OBJ_id_pkix_mod,3L
958
959#define SN_id_pkix1_implicit_93 "id-pkix1-implicit-93"
960#define NID_id_pkix1_implicit_93 272
961#define OBJ_id_pkix1_implicit_93 OBJ_id_pkix_mod,4L
962
963#define SN_id_mod_crmf "id-mod-crmf"
964#define NID_id_mod_crmf 273
965#define OBJ_id_mod_crmf OBJ_id_pkix_mod,5L
966
967#define SN_id_mod_cmc "id-mod-cmc"
968#define NID_id_mod_cmc 274
969#define OBJ_id_mod_cmc OBJ_id_pkix_mod,6L
970
971#define SN_id_mod_kea_profile_88 "id-mod-kea-profile-88"
972#define NID_id_mod_kea_profile_88 275
973#define OBJ_id_mod_kea_profile_88 OBJ_id_pkix_mod,7L
974
975#define SN_id_mod_kea_profile_93 "id-mod-kea-profile-93"
976#define NID_id_mod_kea_profile_93 276
977#define OBJ_id_mod_kea_profile_93 OBJ_id_pkix_mod,8L
978
979#define SN_id_mod_cmp "id-mod-cmp"
980#define NID_id_mod_cmp 277
981#define OBJ_id_mod_cmp OBJ_id_pkix_mod,9L
982
983#define SN_id_mod_qualified_cert_88 "id-mod-qualified-cert-88"
984#define NID_id_mod_qualified_cert_88 278
985#define OBJ_id_mod_qualified_cert_88 OBJ_id_pkix_mod,10L
986
987#define SN_id_mod_qualified_cert_93 "id-mod-qualified-cert-93"
988#define NID_id_mod_qualified_cert_93 279
989#define OBJ_id_mod_qualified_cert_93 OBJ_id_pkix_mod,11L
990
991#define SN_id_mod_attribute_cert "id-mod-attribute-cert"
992#define NID_id_mod_attribute_cert 280
993#define OBJ_id_mod_attribute_cert OBJ_id_pkix_mod,12L
994
995#define SN_id_mod_timestamp_protocol "id-mod-timestamp-protocol"
996#define NID_id_mod_timestamp_protocol 281
997#define OBJ_id_mod_timestamp_protocol OBJ_id_pkix_mod,13L
998
999#define SN_id_mod_ocsp "id-mod-ocsp"
1000#define NID_id_mod_ocsp 282
1001#define OBJ_id_mod_ocsp OBJ_id_pkix_mod,14L
1002
1003#define SN_id_mod_dvcs "id-mod-dvcs"
1004#define NID_id_mod_dvcs 283
1005#define OBJ_id_mod_dvcs OBJ_id_pkix_mod,15L
1006
1007#define SN_id_mod_cmp2000 "id-mod-cmp2000"
1008#define NID_id_mod_cmp2000 284
1009#define OBJ_id_mod_cmp2000 OBJ_id_pkix_mod,16L
1010
1011#define SN_info_access "authorityInfoAccess"
1012#define LN_info_access "Authority Information Access"
1013#define NID_info_access 177
1014#define OBJ_info_access OBJ_id_pe,1L
1015
1016#define SN_biometricInfo "biometricInfo"
1017#define LN_biometricInfo "Biometric Info"
1018#define NID_biometricInfo 285
1019#define OBJ_biometricInfo OBJ_id_pe,2L
1020
1021#define SN_qcStatements "qcStatements"
1022#define NID_qcStatements 286
1023#define OBJ_qcStatements OBJ_id_pe,3L
1024
1025#define SN_ac_auditEntity "ac-auditEntity"
1026#define NID_ac_auditEntity 287
1027#define OBJ_ac_auditEntity OBJ_id_pe,4L
1028
1029#define SN_ac_targeting "ac-targeting"
1030#define NID_ac_targeting 288
1031#define OBJ_ac_targeting OBJ_id_pe,5L
1032
1033#define SN_aaControls "aaControls"
1034#define NID_aaControls 289
1035#define OBJ_aaControls OBJ_id_pe,6L
1036
1037#define SN_sbqp_ipAddrBlock "sbqp-ipAddrBlock"
1038#define NID_sbqp_ipAddrBlock 290
1039#define OBJ_sbqp_ipAddrBlock OBJ_id_pe,7L
1040
1041#define SN_sbqp_autonomousSysNum "sbqp-autonomousSysNum"
1042#define NID_sbqp_autonomousSysNum 291
1043#define OBJ_sbqp_autonomousSysNum OBJ_id_pe,8L
1044
1045#define SN_sbqp_routerIdentifier "sbqp-routerIdentifier"
1046#define NID_sbqp_routerIdentifier 292
1047#define OBJ_sbqp_routerIdentifier OBJ_id_pe,9L
1048
1049#define SN_ac_proxying "ac-proxying"
1050#define NID_ac_proxying 397
1051#define OBJ_ac_proxying OBJ_id_pe,10L
1052
1053#define SN_sinfo_access "subjectInfoAccess"
1054#define LN_sinfo_access "Subject Information Access"
1055#define NID_sinfo_access 398
1056#define OBJ_sinfo_access OBJ_id_pe,11L
1057
1058#define SN_id_qt_cps "id-qt-cps"
1059#define LN_id_qt_cps "Policy Qualifier CPS"
1060#define NID_id_qt_cps 164
1061#define OBJ_id_qt_cps OBJ_id_qt,1L
1062
1063#define SN_id_qt_unotice "id-qt-unotice"
1064#define LN_id_qt_unotice "Policy Qualifier User Notice"
1065#define NID_id_qt_unotice 165
1066#define OBJ_id_qt_unotice OBJ_id_qt,2L
1067
1068#define SN_textNotice "textNotice"
1069#define NID_textNotice 293
1070#define OBJ_textNotice OBJ_id_qt,3L
1071
1072#define SN_server_auth "serverAuth"
1073#define LN_server_auth "TLS Web Server Authentication"
1074#define NID_server_auth 129
1075#define OBJ_server_auth OBJ_id_kp,1L
1076
1077#define SN_client_auth "clientAuth"
1078#define LN_client_auth "TLS Web Client Authentication"
1079#define NID_client_auth 130
1080#define OBJ_client_auth OBJ_id_kp,2L
1081
1082#define SN_code_sign "codeSigning"
1083#define LN_code_sign "Code Signing"
1084#define NID_code_sign 131
1085#define OBJ_code_sign OBJ_id_kp,3L
1086
1087#define SN_email_protect "emailProtection"
1088#define LN_email_protect "E-mail Protection"
1089#define NID_email_protect 132
1090#define OBJ_email_protect OBJ_id_kp,4L
1091
1092#define SN_ipsecEndSystem "ipsecEndSystem"
1093#define LN_ipsecEndSystem "IPSec End System"
1094#define NID_ipsecEndSystem 294
1095#define OBJ_ipsecEndSystem OBJ_id_kp,5L
1096
1097#define SN_ipsecTunnel "ipsecTunnel"
1098#define LN_ipsecTunnel "IPSec Tunnel"
1099#define NID_ipsecTunnel 295
1100#define OBJ_ipsecTunnel OBJ_id_kp,6L
1101
1102#define SN_ipsecUser "ipsecUser"
1103#define LN_ipsecUser "IPSec User"
1104#define NID_ipsecUser 296
1105#define OBJ_ipsecUser OBJ_id_kp,7L
1106
1107#define SN_time_stamp "timeStamping"
1108#define LN_time_stamp "Time Stamping"
1109#define NID_time_stamp 133
1110#define OBJ_time_stamp OBJ_id_kp,8L
1111
1112#define SN_OCSP_sign "OCSPSigning"
1113#define LN_OCSP_sign "OCSP Signing"
1114#define NID_OCSP_sign 180
1115#define OBJ_OCSP_sign OBJ_id_kp,9L
1116
1117#define SN_dvcs "DVCS"
1118#define LN_dvcs "dvcs"
1119#define NID_dvcs 297
1120#define OBJ_dvcs OBJ_id_kp,10L
1121
1122#define SN_id_it_caProtEncCert "id-it-caProtEncCert"
1123#define NID_id_it_caProtEncCert 298
1124#define OBJ_id_it_caProtEncCert OBJ_id_it,1L
1125
1126#define SN_id_it_signKeyPairTypes "id-it-signKeyPairTypes"
1127#define NID_id_it_signKeyPairTypes 299
1128#define OBJ_id_it_signKeyPairTypes OBJ_id_it,2L
1129
1130#define SN_id_it_encKeyPairTypes "id-it-encKeyPairTypes"
1131#define NID_id_it_encKeyPairTypes 300
1132#define OBJ_id_it_encKeyPairTypes OBJ_id_it,3L
1133
1134#define SN_id_it_preferredSymmAlg "id-it-preferredSymmAlg"
1135#define NID_id_it_preferredSymmAlg 301
1136#define OBJ_id_it_preferredSymmAlg OBJ_id_it,4L
1137
1138#define SN_id_it_caKeyUpdateInfo "id-it-caKeyUpdateInfo"
1139#define NID_id_it_caKeyUpdateInfo 302
1140#define OBJ_id_it_caKeyUpdateInfo OBJ_id_it,5L
1141
1142#define SN_id_it_currentCRL "id-it-currentCRL"
1143#define NID_id_it_currentCRL 303
1144#define OBJ_id_it_currentCRL OBJ_id_it,6L
1145
1146#define SN_id_it_unsupportedOIDs "id-it-unsupportedOIDs"
1147#define NID_id_it_unsupportedOIDs 304
1148#define OBJ_id_it_unsupportedOIDs OBJ_id_it,7L
1149
1150#define SN_id_it_subscriptionRequest "id-it-subscriptionRequest"
1151#define NID_id_it_subscriptionRequest 305
1152#define OBJ_id_it_subscriptionRequest OBJ_id_it,8L
1153
1154#define SN_id_it_subscriptionResponse "id-it-subscriptionResponse"
1155#define NID_id_it_subscriptionResponse 306
1156#define OBJ_id_it_subscriptionResponse OBJ_id_it,9L
1157
1158#define SN_id_it_keyPairParamReq "id-it-keyPairParamReq"
1159#define NID_id_it_keyPairParamReq 307
1160#define OBJ_id_it_keyPairParamReq OBJ_id_it,10L
1161
1162#define SN_id_it_keyPairParamRep "id-it-keyPairParamRep"
1163#define NID_id_it_keyPairParamRep 308
1164#define OBJ_id_it_keyPairParamRep OBJ_id_it,11L
1165
1166#define SN_id_it_revPassphrase "id-it-revPassphrase"
1167#define NID_id_it_revPassphrase 309
1168#define OBJ_id_it_revPassphrase OBJ_id_it,12L
1169
1170#define SN_id_it_implicitConfirm "id-it-implicitConfirm"
1171#define NID_id_it_implicitConfirm 310
1172#define OBJ_id_it_implicitConfirm OBJ_id_it,13L
1173
1174#define SN_id_it_confirmWaitTime "id-it-confirmWaitTime"
1175#define NID_id_it_confirmWaitTime 311
1176#define OBJ_id_it_confirmWaitTime OBJ_id_it,14L
1177
1178#define SN_id_it_origPKIMessage "id-it-origPKIMessage"
1179#define NID_id_it_origPKIMessage 312
1180#define OBJ_id_it_origPKIMessage OBJ_id_it,15L
1181
1182#define SN_id_regCtrl "id-regCtrl"
1183#define NID_id_regCtrl 313
1184#define OBJ_id_regCtrl OBJ_id_pkip,1L
1185
1186#define SN_id_regInfo "id-regInfo"
1187#define NID_id_regInfo 314
1188#define OBJ_id_regInfo OBJ_id_pkip,2L
1189
1190#define SN_id_regCtrl_regToken "id-regCtrl-regToken"
1191#define NID_id_regCtrl_regToken 315
1192#define OBJ_id_regCtrl_regToken OBJ_id_regCtrl,1L
1193
1194#define SN_id_regCtrl_authenticator "id-regCtrl-authenticator"
1195#define NID_id_regCtrl_authenticator 316
1196#define OBJ_id_regCtrl_authenticator OBJ_id_regCtrl,2L
1197
1198#define SN_id_regCtrl_pkiPublicationInfo "id-regCtrl-pkiPublicationInfo"
1199#define NID_id_regCtrl_pkiPublicationInfo 317
1200#define OBJ_id_regCtrl_pkiPublicationInfo OBJ_id_regCtrl,3L
1201
1202#define SN_id_regCtrl_pkiArchiveOptions "id-regCtrl-pkiArchiveOptions"
1203#define NID_id_regCtrl_pkiArchiveOptions 318
1204#define OBJ_id_regCtrl_pkiArchiveOptions OBJ_id_regCtrl,4L
1205
1206#define SN_id_regCtrl_oldCertID "id-regCtrl-oldCertID"
1207#define NID_id_regCtrl_oldCertID 319
1208#define OBJ_id_regCtrl_oldCertID OBJ_id_regCtrl,5L
1209
1210#define SN_id_regCtrl_protocolEncrKey "id-regCtrl-protocolEncrKey"
1211#define NID_id_regCtrl_protocolEncrKey 320
1212#define OBJ_id_regCtrl_protocolEncrKey OBJ_id_regCtrl,6L
1213
1214#define SN_id_regInfo_utf8Pairs "id-regInfo-utf8Pairs"
1215#define NID_id_regInfo_utf8Pairs 321
1216#define OBJ_id_regInfo_utf8Pairs OBJ_id_regInfo,1L
1217
1218#define SN_id_regInfo_certReq "id-regInfo-certReq"
1219#define NID_id_regInfo_certReq 322
1220#define OBJ_id_regInfo_certReq OBJ_id_regInfo,2L
1221
1222#define SN_id_alg_des40 "id-alg-des40"
1223#define NID_id_alg_des40 323
1224#define OBJ_id_alg_des40 OBJ_id_alg,1L
1225
1226#define SN_id_alg_noSignature "id-alg-noSignature"
1227#define NID_id_alg_noSignature 324
1228#define OBJ_id_alg_noSignature OBJ_id_alg,2L
1229
1230#define SN_id_alg_dh_sig_hmac_sha1 "id-alg-dh-sig-hmac-sha1"
1231#define NID_id_alg_dh_sig_hmac_sha1 325
1232#define OBJ_id_alg_dh_sig_hmac_sha1 OBJ_id_alg,3L
1233
1234#define SN_id_alg_dh_pop "id-alg-dh-pop"
1235#define NID_id_alg_dh_pop 326
1236#define OBJ_id_alg_dh_pop OBJ_id_alg,4L
1237
1238#define SN_id_cmc_statusInfo "id-cmc-statusInfo"
1239#define NID_id_cmc_statusInfo 327
1240#define OBJ_id_cmc_statusInfo OBJ_id_cmc,1L
1241
1242#define SN_id_cmc_identification "id-cmc-identification"
1243#define NID_id_cmc_identification 328
1244#define OBJ_id_cmc_identification OBJ_id_cmc,2L
1245
1246#define SN_id_cmc_identityProof "id-cmc-identityProof"
1247#define NID_id_cmc_identityProof 329
1248#define OBJ_id_cmc_identityProof OBJ_id_cmc,3L
1249
1250#define SN_id_cmc_dataReturn "id-cmc-dataReturn"
1251#define NID_id_cmc_dataReturn 330
1252#define OBJ_id_cmc_dataReturn OBJ_id_cmc,4L
1253
1254#define SN_id_cmc_transactionId "id-cmc-transactionId"
1255#define NID_id_cmc_transactionId 331
1256#define OBJ_id_cmc_transactionId OBJ_id_cmc,5L
1257
1258#define SN_id_cmc_senderNonce "id-cmc-senderNonce"
1259#define NID_id_cmc_senderNonce 332
1260#define OBJ_id_cmc_senderNonce OBJ_id_cmc,6L
1261
1262#define SN_id_cmc_recipientNonce "id-cmc-recipientNonce"
1263#define NID_id_cmc_recipientNonce 333
1264#define OBJ_id_cmc_recipientNonce OBJ_id_cmc,7L
1265
1266#define SN_id_cmc_addExtensions "id-cmc-addExtensions"
1267#define NID_id_cmc_addExtensions 334
1268#define OBJ_id_cmc_addExtensions OBJ_id_cmc,8L
1269
1270#define SN_id_cmc_encryptedPOP "id-cmc-encryptedPOP"
1271#define NID_id_cmc_encryptedPOP 335
1272#define OBJ_id_cmc_encryptedPOP OBJ_id_cmc,9L
1273
1274#define SN_id_cmc_decryptedPOP "id-cmc-decryptedPOP"
1275#define NID_id_cmc_decryptedPOP 336
1276#define OBJ_id_cmc_decryptedPOP OBJ_id_cmc,10L
1277
1278#define SN_id_cmc_lraPOPWitness "id-cmc-lraPOPWitness"
1279#define NID_id_cmc_lraPOPWitness 337
1280#define OBJ_id_cmc_lraPOPWitness OBJ_id_cmc,11L
1281
1282#define SN_id_cmc_getCert "id-cmc-getCert"
1283#define NID_id_cmc_getCert 338
1284#define OBJ_id_cmc_getCert OBJ_id_cmc,15L
1285
1286#define SN_id_cmc_getCRL "id-cmc-getCRL"
1287#define NID_id_cmc_getCRL 339
1288#define OBJ_id_cmc_getCRL OBJ_id_cmc,16L
1289
1290#define SN_id_cmc_revokeRequest "id-cmc-revokeRequest"
1291#define NID_id_cmc_revokeRequest 340
1292#define OBJ_id_cmc_revokeRequest OBJ_id_cmc,17L
1293
1294#define SN_id_cmc_regInfo "id-cmc-regInfo"
1295#define NID_id_cmc_regInfo 341
1296#define OBJ_id_cmc_regInfo OBJ_id_cmc,18L
1297
1298#define SN_id_cmc_responseInfo "id-cmc-responseInfo"
1299#define NID_id_cmc_responseInfo 342
1300#define OBJ_id_cmc_responseInfo OBJ_id_cmc,19L
1301
1302#define SN_id_cmc_queryPending "id-cmc-queryPending"
1303#define NID_id_cmc_queryPending 343
1304#define OBJ_id_cmc_queryPending OBJ_id_cmc,21L
1305
1306#define SN_id_cmc_popLinkRandom "id-cmc-popLinkRandom"
1307#define NID_id_cmc_popLinkRandom 344
1308#define OBJ_id_cmc_popLinkRandom OBJ_id_cmc,22L
1309
1310#define SN_id_cmc_popLinkWitness "id-cmc-popLinkWitness"
1311#define NID_id_cmc_popLinkWitness 345
1312#define OBJ_id_cmc_popLinkWitness OBJ_id_cmc,23L
1313
1314#define SN_id_cmc_confirmCertAcceptance "id-cmc-confirmCertAcceptance"
1315#define NID_id_cmc_confirmCertAcceptance 346
1316#define OBJ_id_cmc_confirmCertAcceptance OBJ_id_cmc,24L
1317
1318#define SN_id_on_personalData "id-on-personalData"
1319#define NID_id_on_personalData 347
1320#define OBJ_id_on_personalData OBJ_id_on,1L
1321
1322#define SN_id_pda_dateOfBirth "id-pda-dateOfBirth"
1323#define NID_id_pda_dateOfBirth 348
1324#define OBJ_id_pda_dateOfBirth OBJ_id_pda,1L
1325
1326#define SN_id_pda_placeOfBirth "id-pda-placeOfBirth"
1327#define NID_id_pda_placeOfBirth 349
1328#define OBJ_id_pda_placeOfBirth OBJ_id_pda,2L
1329
1330#define SN_id_pda_gender "id-pda-gender"
1331#define NID_id_pda_gender 351
1332#define OBJ_id_pda_gender OBJ_id_pda,3L
1333
1334#define SN_id_pda_countryOfCitizenship "id-pda-countryOfCitizenship"
1335#define NID_id_pda_countryOfCitizenship 352
1336#define OBJ_id_pda_countryOfCitizenship OBJ_id_pda,4L
1337
1338#define SN_id_pda_countryOfResidence "id-pda-countryOfResidence"
1339#define NID_id_pda_countryOfResidence 353
1340#define OBJ_id_pda_countryOfResidence OBJ_id_pda,5L
1341
1342#define SN_id_aca_authenticationInfo "id-aca-authenticationInfo"
1343#define NID_id_aca_authenticationInfo 354
1344#define OBJ_id_aca_authenticationInfo OBJ_id_aca,1L
1345
1346#define SN_id_aca_accessIdentity "id-aca-accessIdentity"
1347#define NID_id_aca_accessIdentity 355
1348#define OBJ_id_aca_accessIdentity OBJ_id_aca,2L
1349
1350#define SN_id_aca_chargingIdentity "id-aca-chargingIdentity"
1351#define NID_id_aca_chargingIdentity 356
1352#define OBJ_id_aca_chargingIdentity OBJ_id_aca,3L
1353
1354#define SN_id_aca_group "id-aca-group"
1355#define NID_id_aca_group 357
1356#define OBJ_id_aca_group OBJ_id_aca,4L
1357
1358#define SN_id_aca_role "id-aca-role"
1359#define NID_id_aca_role 358
1360#define OBJ_id_aca_role OBJ_id_aca,5L
1361
1362#define SN_id_aca_encAttrs "id-aca-encAttrs"
1363#define NID_id_aca_encAttrs 399
1364#define OBJ_id_aca_encAttrs OBJ_id_aca,6L
1365
1366#define SN_id_qcs_pkixQCSyntax_v1 "id-qcs-pkixQCSyntax-v1"
1367#define NID_id_qcs_pkixQCSyntax_v1 359
1368#define OBJ_id_qcs_pkixQCSyntax_v1 OBJ_id_qcs,1L
1369
1370#define SN_id_cct_crs "id-cct-crs"
1371#define NID_id_cct_crs 360
1372#define OBJ_id_cct_crs OBJ_id_cct,1L
1373
1374#define SN_id_cct_PKIData "id-cct-PKIData"
1375#define NID_id_cct_PKIData 361
1376#define OBJ_id_cct_PKIData OBJ_id_cct,2L
1377
1378#define SN_id_cct_PKIResponse "id-cct-PKIResponse"
1379#define NID_id_cct_PKIResponse 362
1380#define OBJ_id_cct_PKIResponse OBJ_id_cct,3L
1381
1382#define SN_ad_OCSP "OCSP"
1383#define LN_ad_OCSP "OCSP"
1384#define NID_ad_OCSP 178
1385#define OBJ_ad_OCSP OBJ_id_ad,1L
1386
1387#define SN_ad_ca_issuers "caIssuers"
1388#define LN_ad_ca_issuers "CA Issuers"
1389#define NID_ad_ca_issuers 179
1390#define OBJ_ad_ca_issuers OBJ_id_ad,2L
1391
1392#define SN_ad_timeStamping "ad_timestamping"
1393#define LN_ad_timeStamping "AD Time Stamping"
1394#define NID_ad_timeStamping 363
1395#define OBJ_ad_timeStamping OBJ_id_ad,3L
1396
1397#define SN_ad_dvcs "AD_DVCS"
1398#define LN_ad_dvcs "ad dvcs"
1399#define NID_ad_dvcs 364
1400#define OBJ_ad_dvcs OBJ_id_ad,4L
1401
1402#define OBJ_id_pkix_OCSP OBJ_ad_OCSP
1403
1404#define SN_id_pkix_OCSP_basic "basicOCSPResponse"
1405#define LN_id_pkix_OCSP_basic "Basic OCSP Response"
1406#define NID_id_pkix_OCSP_basic 365
1407#define OBJ_id_pkix_OCSP_basic OBJ_id_pkix_OCSP,1L
1408
1409#define SN_id_pkix_OCSP_Nonce "Nonce"
1410#define LN_id_pkix_OCSP_Nonce "OCSP Nonce"
1411#define NID_id_pkix_OCSP_Nonce 366
1412#define OBJ_id_pkix_OCSP_Nonce OBJ_id_pkix_OCSP,2L
1413
1414#define SN_id_pkix_OCSP_CrlID "CrlID"
1415#define LN_id_pkix_OCSP_CrlID "OCSP CRL ID"
1416#define NID_id_pkix_OCSP_CrlID 367
1417#define OBJ_id_pkix_OCSP_CrlID OBJ_id_pkix_OCSP,3L
1418
1419#define SN_id_pkix_OCSP_acceptableResponses "acceptableResponses"
1420#define LN_id_pkix_OCSP_acceptableResponses "Acceptable OCSP Responses"
1421#define NID_id_pkix_OCSP_acceptableResponses 368
1422#define OBJ_id_pkix_OCSP_acceptableResponses OBJ_id_pkix_OCSP,4L
1423
1424#define SN_id_pkix_OCSP_noCheck "noCheck"
1425#define LN_id_pkix_OCSP_noCheck "OCSP No Check"
1426#define NID_id_pkix_OCSP_noCheck 369
1427#define OBJ_id_pkix_OCSP_noCheck OBJ_id_pkix_OCSP,5L
1428
1429#define SN_id_pkix_OCSP_archiveCutoff "archiveCutoff"
1430#define LN_id_pkix_OCSP_archiveCutoff "OCSP Archive Cutoff"
1431#define NID_id_pkix_OCSP_archiveCutoff 370
1432#define OBJ_id_pkix_OCSP_archiveCutoff OBJ_id_pkix_OCSP,6L
1433
1434#define SN_id_pkix_OCSP_serviceLocator "serviceLocator"
1435#define LN_id_pkix_OCSP_serviceLocator "OCSP Service Locator"
1436#define NID_id_pkix_OCSP_serviceLocator 371
1437#define OBJ_id_pkix_OCSP_serviceLocator OBJ_id_pkix_OCSP,7L
1438
1439#define SN_id_pkix_OCSP_extendedStatus "extendedStatus"
1440#define LN_id_pkix_OCSP_extendedStatus "Extended OCSP Status"
1441#define NID_id_pkix_OCSP_extendedStatus 372
1442#define OBJ_id_pkix_OCSP_extendedStatus OBJ_id_pkix_OCSP,8L
1443
1444#define SN_id_pkix_OCSP_valid "valid"
1445#define NID_id_pkix_OCSP_valid 373
1446#define OBJ_id_pkix_OCSP_valid OBJ_id_pkix_OCSP,9L
1447
1448#define SN_id_pkix_OCSP_path "path"
1449#define NID_id_pkix_OCSP_path 374
1450#define OBJ_id_pkix_OCSP_path OBJ_id_pkix_OCSP,10L
1451
1452#define SN_id_pkix_OCSP_trustRoot "trustRoot"
1453#define LN_id_pkix_OCSP_trustRoot "Trust Root"
1454#define NID_id_pkix_OCSP_trustRoot 375
1455#define OBJ_id_pkix_OCSP_trustRoot OBJ_id_pkix_OCSP,11L
1456
1457#define SN_algorithm "algorithm"
1458#define LN_algorithm "algorithm"
1459#define NID_algorithm 376
1460#define OBJ_algorithm 1L,3L,14L,3L,2L
1461
1462#define SN_md5WithRSA "RSA-NP-MD5"
1463#define LN_md5WithRSA "md5WithRSA"
1464#define NID_md5WithRSA 104
1465#define OBJ_md5WithRSA OBJ_algorithm,3L
1466
1467#define SN_des_ecb "DES-ECB"
1468#define LN_des_ecb "des-ecb"
1469#define NID_des_ecb 29
1470#define OBJ_des_ecb OBJ_algorithm,6L
1471
1472#define SN_des_cbc "DES-CBC"
1473#define LN_des_cbc "des-cbc"
1474#define NID_des_cbc 31
1475#define OBJ_des_cbc OBJ_algorithm,7L
1476
1477#define SN_des_ofb64 "DES-OFB"
1478#define LN_des_ofb64 "des-ofb"
1479#define NID_des_ofb64 45
1480#define OBJ_des_ofb64 OBJ_algorithm,8L
1481
1482#define SN_des_cfb64 "DES-CFB"
1483#define LN_des_cfb64 "des-cfb"
1484#define NID_des_cfb64 30
1485#define OBJ_des_cfb64 OBJ_algorithm,9L
1486
1487#define SN_rsaSignature "rsaSignature"
1488#define NID_rsaSignature 377
1489#define OBJ_rsaSignature OBJ_algorithm,11L
1490
1491#define SN_dsa_2 "DSA-old"
1492#define LN_dsa_2 "dsaEncryption-old"
1493#define NID_dsa_2 67
1494#define OBJ_dsa_2 OBJ_algorithm,12L
1495
1496#define SN_dsaWithSHA "DSA-SHA"
1497#define LN_dsaWithSHA "dsaWithSHA"
1498#define NID_dsaWithSHA 66
1499#define OBJ_dsaWithSHA OBJ_algorithm,13L
1500
1501#define SN_shaWithRSAEncryption "RSA-SHA"
1502#define LN_shaWithRSAEncryption "shaWithRSAEncryption"
1503#define NID_shaWithRSAEncryption 42
1504#define OBJ_shaWithRSAEncryption OBJ_algorithm,15L
1505
1506#define SN_des_ede_ecb "DES-EDE"
1507#define LN_des_ede_ecb "des-ede"
1508#define NID_des_ede_ecb 32
1509#define OBJ_des_ede_ecb OBJ_algorithm,17L
1510
1511#define SN_des_ede3_ecb "DES-EDE3"
1512#define LN_des_ede3_ecb "des-ede3"
1513#define NID_des_ede3_ecb 33
1514
1515#define SN_des_ede_cbc "DES-EDE-CBC"
1516#define LN_des_ede_cbc "des-ede-cbc"
1517#define NID_des_ede_cbc 43
1518
1519#define SN_des_ede_cfb64 "DES-EDE-CFB"
1520#define LN_des_ede_cfb64 "des-ede-cfb"
1521#define NID_des_ede_cfb64 60
1522
1523#define SN_des_ede3_cfb64 "DES-EDE3-CFB"
1524#define LN_des_ede3_cfb64 "des-ede3-cfb"
1525#define NID_des_ede3_cfb64 61
1526
1527#define SN_des_ede_ofb64 "DES-EDE-OFB"
1528#define LN_des_ede_ofb64 "des-ede-ofb"
1529#define NID_des_ede_ofb64 62
1530
1531#define SN_des_ede3_ofb64 "DES-EDE3-OFB"
1532#define LN_des_ede3_ofb64 "des-ede3-ofb"
1533#define NID_des_ede3_ofb64 63
1534
1535#define SN_desx_cbc "DESX-CBC"
1536#define LN_desx_cbc "desx-cbc"
1537#define NID_desx_cbc 80
1538
1539#define SN_sha "SHA"
1540#define LN_sha "sha"
1541#define NID_sha 41
1542#define OBJ_sha OBJ_algorithm,18L
1543
1544#define SN_sha1 "SHA1"
1545#define LN_sha1 "sha1"
1546#define NID_sha1 64
1547#define OBJ_sha1 OBJ_algorithm,26L
1548
1549#define SN_dsaWithSHA1_2 "DSA-SHA1-old"
1550#define LN_dsaWithSHA1_2 "dsaWithSHA1-old"
1551#define NID_dsaWithSHA1_2 70
1552#define OBJ_dsaWithSHA1_2 OBJ_algorithm,27L
1553
1554#define SN_sha1WithRSA "RSA-SHA1-2"
1555#define LN_sha1WithRSA "sha1WithRSA"
1556#define NID_sha1WithRSA 115
1557#define OBJ_sha1WithRSA OBJ_algorithm,29L
1558
1559#define SN_ripemd160 "RIPEMD160"
1560#define LN_ripemd160 "ripemd160"
1561#define NID_ripemd160 117
1562#define OBJ_ripemd160 1L,3L,36L,3L,2L,1L
1563
1564#define SN_ripemd160WithRSA "RSA-RIPEMD160"
1565#define LN_ripemd160WithRSA "ripemd160WithRSA"
1566#define NID_ripemd160WithRSA 119
1567#define OBJ_ripemd160WithRSA 1L,3L,36L,3L,3L,1L,2L
1568
1569#define SN_sxnet "SXNetID"
1570#define LN_sxnet "Strong Extranet ID"
1571#define NID_sxnet 143
1572#define OBJ_sxnet 1L,3L,101L,1L,4L,1L
1573
1574#define SN_X500 "X500"
1575#define LN_X500 "directory services (X.500)"
1576#define NID_X500 11
1577#define OBJ_X500 2L,5L
1578
1579#define SN_X509 "X509"
1580#define NID_X509 12
1581#define OBJ_X509 OBJ_X500,4L
1582
1583#define SN_commonName "CN"
1584#define LN_commonName "commonName"
1585#define NID_commonName 13
1586#define OBJ_commonName OBJ_X509,3L
1587
1588#define SN_surname "SN"
1589#define LN_surname "surname"
1590#define NID_surname 100
1591#define OBJ_surname OBJ_X509,4L
1592
1593#define LN_serialNumber "serialNumber"
1594#define NID_serialNumber 105
1595#define OBJ_serialNumber OBJ_X509,5L
1596
1597#define SN_countryName "C"
1598#define LN_countryName "countryName"
1599#define NID_countryName 14
1600#define OBJ_countryName OBJ_X509,6L
1601
1602#define SN_localityName "L"
1603#define LN_localityName "localityName"
1604#define NID_localityName 15
1605#define OBJ_localityName OBJ_X509,7L
1606
1607#define SN_stateOrProvinceName "ST"
1608#define LN_stateOrProvinceName "stateOrProvinceName"
1609#define NID_stateOrProvinceName 16
1610#define OBJ_stateOrProvinceName OBJ_X509,8L
1611
1612#define SN_organizationName "O"
1613#define LN_organizationName "organizationName"
1614#define NID_organizationName 17
1615#define OBJ_organizationName OBJ_X509,10L
1616
1617#define SN_organizationalUnitName "OU"
1618#define LN_organizationalUnitName "organizationalUnitName"
1619#define NID_organizationalUnitName 18
1620#define OBJ_organizationalUnitName OBJ_X509,11L
1621
1622#define LN_title "title"
1623#define NID_title 106
1624#define OBJ_title OBJ_X509,12L
1625
1626#define LN_description "description"
1627#define NID_description 107
1628#define OBJ_description OBJ_X509,13L
1629
1630#define SN_name "name"
1631#define LN_name "name"
1632#define NID_name 173
1633#define OBJ_name OBJ_X509,41L
1634
1635#define SN_givenName "gn"
1636#define LN_givenName "givenName"
1637#define NID_givenName 99
1638#define OBJ_givenName OBJ_X509,42L
1639
1640#define LN_initials "initials"
1641#define NID_initials 101
1642#define OBJ_initials OBJ_X509,43L
1643
1644#define LN_generationQualifier "generationQualifier"
1645#define NID_generationQualifier 509
1646#define OBJ_generationQualifier OBJ_X509,44L
1647
1648#define LN_x500UniqueIdentifier "x500UniqueIdentifier"
1649#define NID_x500UniqueIdentifier 503
1650#define OBJ_x500UniqueIdentifier OBJ_X509,45L
1651
1652#define SN_dnQualifier "dnQualifier"
1653#define LN_dnQualifier "dnQualifier"
1654#define NID_dnQualifier 174
1655#define OBJ_dnQualifier OBJ_X509,46L
1656
1657#define SN_role "role"
1658#define LN_role "role"
1659#define NID_role 400
1660#define OBJ_role OBJ_X509,72L
1661
1662#define SN_X500algorithms "X500algorithms"
1663#define LN_X500algorithms "directory services - algorithms"
1664#define NID_X500algorithms 378
1665#define OBJ_X500algorithms OBJ_X500,8L
1666
1667#define SN_rsa "RSA"
1668#define LN_rsa "rsa"
1669#define NID_rsa 19
1670#define OBJ_rsa OBJ_X500algorithms,1L,1L
1671
1672#define SN_mdc2WithRSA "RSA-MDC2"
1673#define LN_mdc2WithRSA "mdc2WithRSA"
1674#define NID_mdc2WithRSA 96
1675#define OBJ_mdc2WithRSA OBJ_X500algorithms,3L,100L
1676
1677#define SN_mdc2 "MDC2"
1678#define LN_mdc2 "mdc2"
1679#define NID_mdc2 95
1680#define OBJ_mdc2 OBJ_X500algorithms,3L,101L
1681
1682#define SN_id_ce "id-ce"
1683#define NID_id_ce 81
1684#define OBJ_id_ce OBJ_X500,29L
1685
1686#define SN_subject_key_identifier "subjectKeyIdentifier"
1687#define LN_subject_key_identifier "X509v3 Subject Key Identifier"
1688#define NID_subject_key_identifier 82
1689#define OBJ_subject_key_identifier OBJ_id_ce,14L
1690
1691#define SN_key_usage "keyUsage"
1692#define LN_key_usage "X509v3 Key Usage"
1693#define NID_key_usage 83
1694#define OBJ_key_usage OBJ_id_ce,15L
1695
1696#define SN_private_key_usage_period "privateKeyUsagePeriod"
1697#define LN_private_key_usage_period "X509v3 Private Key Usage Period"
1698#define NID_private_key_usage_period 84
1699#define OBJ_private_key_usage_period OBJ_id_ce,16L
1700
1701#define SN_subject_alt_name "subjectAltName"
1702#define LN_subject_alt_name "X509v3 Subject Alternative Name"
1703#define NID_subject_alt_name 85
1704#define OBJ_subject_alt_name OBJ_id_ce,17L
1705
1706#define SN_issuer_alt_name "issuerAltName"
1707#define LN_issuer_alt_name "X509v3 Issuer Alternative Name"
1708#define NID_issuer_alt_name 86
1709#define OBJ_issuer_alt_name OBJ_id_ce,18L
1710
1711#define SN_basic_constraints "basicConstraints"
1712#define LN_basic_constraints "X509v3 Basic Constraints"
1713#define NID_basic_constraints 87
1714#define OBJ_basic_constraints OBJ_id_ce,19L
1715
1716#define SN_crl_number "crlNumber"
1717#define LN_crl_number "X509v3 CRL Number"
1718#define NID_crl_number 88
1719#define OBJ_crl_number OBJ_id_ce,20L
1720
1721#define SN_crl_reason "CRLReason"
1722#define LN_crl_reason "X509v3 CRL Reason Code"
1723#define NID_crl_reason 141
1724#define OBJ_crl_reason OBJ_id_ce,21L
1725
1726#define SN_invalidity_date "invalidityDate"
1727#define LN_invalidity_date "Invalidity Date"
1728#define NID_invalidity_date 142
1729#define OBJ_invalidity_date OBJ_id_ce,24L
1730
1731#define SN_delta_crl "deltaCRL"
1732#define LN_delta_crl "X509v3 Delta CRL Indicator"
1733#define NID_delta_crl 140
1734#define OBJ_delta_crl OBJ_id_ce,27L
1735
1736#define SN_crl_distribution_points "crlDistributionPoints"
1737#define LN_crl_distribution_points "X509v3 CRL Distribution Points"
1738#define NID_crl_distribution_points 103
1739#define OBJ_crl_distribution_points OBJ_id_ce,31L
1740
1741#define SN_certificate_policies "certificatePolicies"
1742#define LN_certificate_policies "X509v3 Certificate Policies"
1743#define NID_certificate_policies 89
1744#define OBJ_certificate_policies OBJ_id_ce,32L
1745
1746#define SN_authority_key_identifier "authorityKeyIdentifier"
1747#define LN_authority_key_identifier "X509v3 Authority Key Identifier"
1748#define NID_authority_key_identifier 90
1749#define OBJ_authority_key_identifier OBJ_id_ce,35L
1750
1751#define SN_policy_constraints "policyConstraints"
1752#define LN_policy_constraints "X509v3 Policy Constraints"
1753#define NID_policy_constraints 401
1754#define OBJ_policy_constraints OBJ_id_ce,36L
1755
1756#define SN_ext_key_usage "extendedKeyUsage"
1757#define LN_ext_key_usage "X509v3 Extended Key Usage"
1758#define NID_ext_key_usage 126
1759#define OBJ_ext_key_usage OBJ_id_ce,37L
1760
1761#define SN_target_information "targetInformation"
1762#define LN_target_information "X509v3 AC Targeting"
1763#define NID_target_information 402
1764#define OBJ_target_information OBJ_id_ce,55L
1765
1766#define SN_no_rev_avail "noRevAvail"
1767#define LN_no_rev_avail "X509v3 No Revocation Available"
1768#define NID_no_rev_avail 403
1769#define OBJ_no_rev_avail OBJ_id_ce,56L
1770
1771#define SN_netscape "Netscape"
1772#define LN_netscape "Netscape Communications Corp."
1773#define NID_netscape 57
1774#define OBJ_netscape 2L,16L,840L,1L,113730L
1775
1776#define SN_netscape_cert_extension "nsCertExt"
1777#define LN_netscape_cert_extension "Netscape Certificate Extension"
1778#define NID_netscape_cert_extension 58
1779#define OBJ_netscape_cert_extension OBJ_netscape,1L
1780
1781#define SN_netscape_data_type "nsDataType"
1782#define LN_netscape_data_type "Netscape Data Type"
1783#define NID_netscape_data_type 59
1784#define OBJ_netscape_data_type OBJ_netscape,2L
1785
1786#define SN_netscape_cert_type "nsCertType"
1787#define LN_netscape_cert_type "Netscape Cert Type"
1788#define NID_netscape_cert_type 71
1789#define OBJ_netscape_cert_type OBJ_netscape_cert_extension,1L
1790
1791#define SN_netscape_base_url "nsBaseUrl"
1792#define LN_netscape_base_url "Netscape Base Url"
1793#define NID_netscape_base_url 72
1794#define OBJ_netscape_base_url OBJ_netscape_cert_extension,2L
1795
1796#define SN_netscape_revocation_url "nsRevocationUrl"
1797#define LN_netscape_revocation_url "Netscape Revocation Url"
1798#define NID_netscape_revocation_url 73
1799#define OBJ_netscape_revocation_url OBJ_netscape_cert_extension,3L
1800
1801#define SN_netscape_ca_revocation_url "nsCaRevocationUrl"
1802#define LN_netscape_ca_revocation_url "Netscape CA Revocation Url"
1803#define NID_netscape_ca_revocation_url 74
1804#define OBJ_netscape_ca_revocation_url OBJ_netscape_cert_extension,4L
1805
1806#define SN_netscape_renewal_url "nsRenewalUrl"
1807#define LN_netscape_renewal_url "Netscape Renewal Url"
1808#define NID_netscape_renewal_url 75
1809#define OBJ_netscape_renewal_url OBJ_netscape_cert_extension,7L
1810
1811#define SN_netscape_ca_policy_url "nsCaPolicyUrl"
1812#define LN_netscape_ca_policy_url "Netscape CA Policy Url"
1813#define NID_netscape_ca_policy_url 76
1814#define OBJ_netscape_ca_policy_url OBJ_netscape_cert_extension,8L
1815
1816#define SN_netscape_ssl_server_name "nsSslServerName"
1817#define LN_netscape_ssl_server_name "Netscape SSL Server Name"
1818#define NID_netscape_ssl_server_name 77
1819#define OBJ_netscape_ssl_server_name OBJ_netscape_cert_extension,12L
1820
1821#define SN_netscape_comment "nsComment"
1822#define LN_netscape_comment "Netscape Comment"
1823#define NID_netscape_comment 78
1824#define OBJ_netscape_comment OBJ_netscape_cert_extension,13L
1825
1826#define SN_netscape_cert_sequence "nsCertSequence"
1827#define LN_netscape_cert_sequence "Netscape Certificate Sequence"
1828#define NID_netscape_cert_sequence 79
1829#define OBJ_netscape_cert_sequence OBJ_netscape_data_type,5L
1830
1831#define SN_ns_sgc "nsSGC"
1832#define LN_ns_sgc "Netscape Server Gated Crypto"
1833#define NID_ns_sgc 139
1834#define OBJ_ns_sgc OBJ_netscape,4L,1L
1835
1836#define SN_org "ORG"
1837#define LN_org "org"
1838#define NID_org 379
1839#define OBJ_org OBJ_iso,3L
1840
1841#define SN_dod "DOD"
1842#define LN_dod "dod"
1843#define NID_dod 380
1844#define OBJ_dod OBJ_org,6L
1845
1846#define SN_iana "IANA"
1847#define LN_iana "iana"
1848#define NID_iana 381
1849#define OBJ_iana OBJ_dod,1L
1850
1851#define OBJ_internet OBJ_iana
1852
1853#define SN_Directory "directory"
1854#define LN_Directory "Directory"
1855#define NID_Directory 382
1856#define OBJ_Directory OBJ_internet,1L
1857
1858#define SN_Management "mgmt"
1859#define LN_Management "Management"
1860#define NID_Management 383
1861#define OBJ_Management OBJ_internet,2L
1862
1863#define SN_Experimental "experimental"
1864#define LN_Experimental "Experimental"
1865#define NID_Experimental 384
1866#define OBJ_Experimental OBJ_internet,3L
1867
1868#define SN_Private "private"
1869#define LN_Private "Private"
1870#define NID_Private 385
1871#define OBJ_Private OBJ_internet,4L
1872
1873#define SN_Security "security"
1874#define LN_Security "Security"
1875#define NID_Security 386
1876#define OBJ_Security OBJ_internet,5L
1877
1878#define SN_SNMPv2 "snmpv2"
1879#define LN_SNMPv2 "SNMPv2"
1880#define NID_SNMPv2 387
1881#define OBJ_SNMPv2 OBJ_internet,6L
1882
1883#define LN_Mail "Mail"
1884#define NID_Mail 388
1885#define OBJ_Mail OBJ_internet,7L
1886
1887#define SN_Enterprises "enterprises"
1888#define LN_Enterprises "Enterprises"
1889#define NID_Enterprises 389
1890#define OBJ_Enterprises OBJ_Private,1L
1891
1892#define SN_dcObject "dcobject"
1893#define LN_dcObject "dcObject"
1894#define NID_dcObject 390
1895#define OBJ_dcObject OBJ_Enterprises,1466L,344L
1896
1897#define SN_mime_mhs "mime-mhs"
1898#define LN_mime_mhs "MIME MHS"
1899#define NID_mime_mhs 504
1900#define OBJ_mime_mhs OBJ_Mail,1L
1901
1902#define SN_mime_mhs_headings "mime-mhs-headings"
1903#define LN_mime_mhs_headings "mime-mhs-headings"
1904#define NID_mime_mhs_headings 505
1905#define OBJ_mime_mhs_headings OBJ_mime_mhs,1L
1906
1907#define SN_mime_mhs_bodies "mime-mhs-bodies"
1908#define LN_mime_mhs_bodies "mime-mhs-bodies"
1909#define NID_mime_mhs_bodies 506
1910#define OBJ_mime_mhs_bodies OBJ_mime_mhs,2L
1911
1912#define SN_id_hex_partial_message "id-hex-partial-message"
1913#define LN_id_hex_partial_message "id-hex-partial-message"
1914#define NID_id_hex_partial_message 507
1915#define OBJ_id_hex_partial_message OBJ_mime_mhs_headings,1L
1916
1917#define SN_id_hex_multipart_message "id-hex-multipart-message"
1918#define LN_id_hex_multipart_message "id-hex-multipart-message"
1919#define NID_id_hex_multipart_message 508
1920#define OBJ_id_hex_multipart_message OBJ_mime_mhs_headings,2L
1921
1922#define SN_rle_compression "RLE"
1923#define LN_rle_compression "run length compression"
1924#define NID_rle_compression 124
1925#define OBJ_rle_compression 1L,1L,1L,1L,666L,1L
1926
1927#define SN_zlib_compression "ZLIB"
1928#define LN_zlib_compression "zlib compression"
1929#define NID_zlib_compression 125
1930#define OBJ_zlib_compression 1L,1L,1L,1L,666L,2L
1931
1932#define OBJ_csor 2L,16L,840L,1L,101L,3L
1933
1934#define OBJ_nistAlgorithms OBJ_csor,4L
1935
1936#define OBJ_aes OBJ_nistAlgorithms,1L
1937
1938#define SN_aes_128_ecb "AES-128-ECB"
1939#define LN_aes_128_ecb "aes-128-ecb"
1940#define NID_aes_128_ecb 418
1941#define OBJ_aes_128_ecb OBJ_aes,1L
1942
1943#define SN_aes_128_cbc "AES-128-CBC"
1944#define LN_aes_128_cbc "aes-128-cbc"
1945#define NID_aes_128_cbc 419
1946#define OBJ_aes_128_cbc OBJ_aes,2L
1947
1948#define SN_aes_128_ofb128 "AES-128-OFB"
1949#define LN_aes_128_ofb128 "aes-128-ofb"
1950#define NID_aes_128_ofb128 420
1951#define OBJ_aes_128_ofb128 OBJ_aes,3L
1952
1953#define SN_aes_128_cfb128 "AES-128-CFB"
1954#define LN_aes_128_cfb128 "aes-128-cfb"
1955#define NID_aes_128_cfb128 421
1956#define OBJ_aes_128_cfb128 OBJ_aes,4L
1957
1958#define SN_aes_192_ecb "AES-192-ECB"
1959#define LN_aes_192_ecb "aes-192-ecb"
1960#define NID_aes_192_ecb 422
1961#define OBJ_aes_192_ecb OBJ_aes,21L
1962
1963#define SN_aes_192_cbc "AES-192-CBC"
1964#define LN_aes_192_cbc "aes-192-cbc"
1965#define NID_aes_192_cbc 423
1966#define OBJ_aes_192_cbc OBJ_aes,22L
1967
1968#define SN_aes_192_ofb128 "AES-192-OFB"
1969#define LN_aes_192_ofb128 "aes-192-ofb"
1970#define NID_aes_192_ofb128 424
1971#define OBJ_aes_192_ofb128 OBJ_aes,23L
1972
1973#define SN_aes_192_cfb128 "AES-192-CFB"
1974#define LN_aes_192_cfb128 "aes-192-cfb"
1975#define NID_aes_192_cfb128 425
1976#define OBJ_aes_192_cfb128 OBJ_aes,24L
1977
1978#define SN_aes_256_ecb "AES-256-ECB"
1979#define LN_aes_256_ecb "aes-256-ecb"
1980#define NID_aes_256_ecb 426
1981#define OBJ_aes_256_ecb OBJ_aes,41L
1982
1983#define SN_aes_256_cbc "AES-256-CBC"
1984#define LN_aes_256_cbc "aes-256-cbc"
1985#define NID_aes_256_cbc 427
1986#define OBJ_aes_256_cbc OBJ_aes,42L
1987
1988#define SN_aes_256_ofb128 "AES-256-OFB"
1989#define LN_aes_256_ofb128 "aes-256-ofb"
1990#define NID_aes_256_ofb128 428
1991#define OBJ_aes_256_ofb128 OBJ_aes,43L
1992
1993#define SN_aes_256_cfb128 "AES-256-CFB"
1994#define LN_aes_256_cfb128 "aes-256-cfb"
1995#define NID_aes_256_cfb128 429
1996#define OBJ_aes_256_cfb128 OBJ_aes,44L
1997
1998#define SN_hold_instruction_code "holdInstructionCode"
1999#define LN_hold_instruction_code "Hold Instruction Code"
2000#define NID_hold_instruction_code 430
2001#define OBJ_hold_instruction_code OBJ_id_ce,23L
2002
2003#define OBJ_holdInstruction OBJ_X9_57,2L
2004
2005#define SN_hold_instruction_none "holdInstructionNone"
2006#define LN_hold_instruction_none "Hold Instruction None"
2007#define NID_hold_instruction_none 431
2008#define OBJ_hold_instruction_none OBJ_holdInstruction,1L
2009
2010#define SN_hold_instruction_call_issuer "holdInstructionCallIssuer"
2011#define LN_hold_instruction_call_issuer "Hold Instruction Call Issuer"
2012#define NID_hold_instruction_call_issuer 432
2013#define OBJ_hold_instruction_call_issuer OBJ_holdInstruction,2L
2014
2015#define SN_hold_instruction_reject "holdInstructionReject"
2016#define LN_hold_instruction_reject "Hold Instruction Reject"
2017#define NID_hold_instruction_reject 433
2018#define OBJ_hold_instruction_reject OBJ_holdInstruction,3L
2019
2020#define SN_data "data"
2021#define NID_data 434
2022#define OBJ_data OBJ_ccitt,9L
2023
2024#define SN_pss "pss"
2025#define NID_pss 435
2026#define OBJ_pss OBJ_data,2342L
2027
2028#define SN_ucl "ucl"
2029#define NID_ucl 436
2030#define OBJ_ucl OBJ_pss,19200300L
2031
2032#define SN_pilot "pilot"
2033#define NID_pilot 437
2034#define OBJ_pilot OBJ_ucl,100L
2035
2036#define LN_pilotAttributeType "pilotAttributeType"
2037#define NID_pilotAttributeType 438
2038#define OBJ_pilotAttributeType OBJ_pilot,1L
2039
2040#define LN_pilotAttributeSyntax "pilotAttributeSyntax"
2041#define NID_pilotAttributeSyntax 439
2042#define OBJ_pilotAttributeSyntax OBJ_pilot,3L
2043
2044#define LN_pilotObjectClass "pilotObjectClass"
2045#define NID_pilotObjectClass 440
2046#define OBJ_pilotObjectClass OBJ_pilot,4L
2047
2048#define LN_pilotGroups "pilotGroups"
2049#define NID_pilotGroups 441
2050#define OBJ_pilotGroups OBJ_pilot,10L
2051
2052#define LN_iA5StringSyntax "iA5StringSyntax"
2053#define NID_iA5StringSyntax 442
2054#define OBJ_iA5StringSyntax OBJ_pilotAttributeSyntax,4L
2055
2056#define LN_caseIgnoreIA5StringSyntax "caseIgnoreIA5StringSyntax"
2057#define NID_caseIgnoreIA5StringSyntax 443
2058#define OBJ_caseIgnoreIA5StringSyntax OBJ_pilotAttributeSyntax,5L
2059
2060#define LN_pilotObject "pilotObject"
2061#define NID_pilotObject 444
2062#define OBJ_pilotObject OBJ_pilotObjectClass,3L
2063
2064#define LN_pilotPerson "pilotPerson"
2065#define NID_pilotPerson 445
2066#define OBJ_pilotPerson OBJ_pilotObjectClass,4L
2067
2068#define SN_account "account"
2069#define NID_account 446
2070#define OBJ_account OBJ_pilotObjectClass,5L
2071
2072#define SN_document "document"
2073#define NID_document 447
2074#define OBJ_document OBJ_pilotObjectClass,6L
2075
2076#define SN_room "room"
2077#define NID_room 448
2078#define OBJ_room OBJ_pilotObjectClass,7L
2079
2080#define LN_documentSeries "documentSeries"
2081#define NID_documentSeries 449
2082#define OBJ_documentSeries OBJ_pilotObjectClass,9L
2083
2084#define SN_Domain "domain"
2085#define LN_Domain "Domain"
2086#define NID_Domain 392
2087#define OBJ_Domain OBJ_pilotObjectClass,13L
2088
2089#define LN_rFC822localPart "rFC822localPart"
2090#define NID_rFC822localPart 450
2091#define OBJ_rFC822localPart OBJ_pilotObjectClass,14L
2092
2093#define LN_dNSDomain "dNSDomain"
2094#define NID_dNSDomain 451
2095#define OBJ_dNSDomain OBJ_pilotObjectClass,15L
2096
2097#define LN_domainRelatedObject "domainRelatedObject"
2098#define NID_domainRelatedObject 452
2099#define OBJ_domainRelatedObject OBJ_pilotObjectClass,17L
2100
2101#define LN_friendlyCountry "friendlyCountry"
2102#define NID_friendlyCountry 453
2103#define OBJ_friendlyCountry OBJ_pilotObjectClass,18L
2104
2105#define LN_simpleSecurityObject "simpleSecurityObject"
2106#define NID_simpleSecurityObject 454
2107#define OBJ_simpleSecurityObject OBJ_pilotObjectClass,19L
2108
2109#define LN_pilotOrganization "pilotOrganization"
2110#define NID_pilotOrganization 455
2111#define OBJ_pilotOrganization OBJ_pilotObjectClass,20L
2112
2113#define LN_pilotDSA "pilotDSA"
2114#define NID_pilotDSA 456
2115#define OBJ_pilotDSA OBJ_pilotObjectClass,21L
2116
2117#define LN_qualityLabelledData "qualityLabelledData"
2118#define NID_qualityLabelledData 457
2119#define OBJ_qualityLabelledData OBJ_pilotObjectClass,22L
2120
2121#define SN_userId "UID"
2122#define LN_userId "userId"
2123#define NID_userId 458
2124#define OBJ_userId OBJ_pilotAttributeType,1L
2125
2126#define LN_textEncodedORAddress "textEncodedORAddress"
2127#define NID_textEncodedORAddress 459
2128#define OBJ_textEncodedORAddress OBJ_pilotAttributeType,2L
2129
2130#define SN_rfc822Mailbox "mail"
2131#define LN_rfc822Mailbox "rfc822Mailbox"
2132#define NID_rfc822Mailbox 460
2133#define OBJ_rfc822Mailbox OBJ_pilotAttributeType,3L
2134
2135#define SN_info "info"
2136#define NID_info 461
2137#define OBJ_info OBJ_pilotAttributeType,4L
2138
2139#define LN_favouriteDrink "favouriteDrink"
2140#define NID_favouriteDrink 462
2141#define OBJ_favouriteDrink OBJ_pilotAttributeType,5L
2142
2143#define LN_roomNumber "roomNumber"
2144#define NID_roomNumber 463
2145#define OBJ_roomNumber OBJ_pilotAttributeType,6L
2146
2147#define SN_photo "photo"
2148#define NID_photo 464
2149#define OBJ_photo OBJ_pilotAttributeType,7L
2150
2151#define LN_userClass "userClass"
2152#define NID_userClass 465
2153#define OBJ_userClass OBJ_pilotAttributeType,8L
2154
2155#define SN_host "host"
2156#define NID_host 466
2157#define OBJ_host OBJ_pilotAttributeType,9L
2158
2159#define SN_manager "manager"
2160#define NID_manager 467
2161#define OBJ_manager OBJ_pilotAttributeType,10L
2162
2163#define LN_documentIdentifier "documentIdentifier"
2164#define NID_documentIdentifier 468
2165#define OBJ_documentIdentifier OBJ_pilotAttributeType,11L
2166
2167#define LN_documentTitle "documentTitle"
2168#define NID_documentTitle 469
2169#define OBJ_documentTitle OBJ_pilotAttributeType,12L
2170
2171#define LN_documentVersion "documentVersion"
2172#define NID_documentVersion 470
2173#define OBJ_documentVersion OBJ_pilotAttributeType,13L
2174
2175#define LN_documentAuthor "documentAuthor"
2176#define NID_documentAuthor 471
2177#define OBJ_documentAuthor OBJ_pilotAttributeType,14L
2178
2179#define LN_documentLocation "documentLocation"
2180#define NID_documentLocation 472
2181#define OBJ_documentLocation OBJ_pilotAttributeType,15L
2182
2183#define LN_homeTelephoneNumber "homeTelephoneNumber"
2184#define NID_homeTelephoneNumber 473
2185#define OBJ_homeTelephoneNumber OBJ_pilotAttributeType,20L
2186
2187#define SN_secretary "secretary"
2188#define NID_secretary 474
2189#define OBJ_secretary OBJ_pilotAttributeType,21L
2190
2191#define LN_otherMailbox "otherMailbox"
2192#define NID_otherMailbox 475
2193#define OBJ_otherMailbox OBJ_pilotAttributeType,22L
2194
2195#define LN_lastModifiedTime "lastModifiedTime"
2196#define NID_lastModifiedTime 476
2197#define OBJ_lastModifiedTime OBJ_pilotAttributeType,23L
2198
2199#define LN_lastModifiedBy "lastModifiedBy"
2200#define NID_lastModifiedBy 477
2201#define OBJ_lastModifiedBy OBJ_pilotAttributeType,24L
2202
2203#define SN_domainComponent "DC"
2204#define LN_domainComponent "domainComponent"
2205#define NID_domainComponent 391
2206#define OBJ_domainComponent OBJ_pilotAttributeType,25L
2207
2208#define LN_aRecord "aRecord"
2209#define NID_aRecord 478
2210#define OBJ_aRecord OBJ_pilotAttributeType,26L
2211
2212#define LN_pilotAttributeType27 "pilotAttributeType27"
2213#define NID_pilotAttributeType27 479
2214#define OBJ_pilotAttributeType27 OBJ_pilotAttributeType,27L
2215
2216#define LN_mXRecord "mXRecord"
2217#define NID_mXRecord 480
2218#define OBJ_mXRecord OBJ_pilotAttributeType,28L
2219
2220#define LN_nSRecord "nSRecord"
2221#define NID_nSRecord 481
2222#define OBJ_nSRecord OBJ_pilotAttributeType,29L
2223
2224#define LN_sOARecord "sOARecord"
2225#define NID_sOARecord 482
2226#define OBJ_sOARecord OBJ_pilotAttributeType,30L
2227
2228#define LN_cNAMERecord "cNAMERecord"
2229#define NID_cNAMERecord 483
2230#define OBJ_cNAMERecord OBJ_pilotAttributeType,31L
2231
2232#define LN_associatedDomain "associatedDomain"
2233#define NID_associatedDomain 484
2234#define OBJ_associatedDomain OBJ_pilotAttributeType,37L
2235
2236#define LN_associatedName "associatedName"
2237#define NID_associatedName 485
2238#define OBJ_associatedName OBJ_pilotAttributeType,38L
2239
2240#define LN_homePostalAddress "homePostalAddress"
2241#define NID_homePostalAddress 486
2242#define OBJ_homePostalAddress OBJ_pilotAttributeType,39L
2243
2244#define LN_personalTitle "personalTitle"
2245#define NID_personalTitle 487
2246#define OBJ_personalTitle OBJ_pilotAttributeType,40L
2247
2248#define LN_mobileTelephoneNumber "mobileTelephoneNumber"
2249#define NID_mobileTelephoneNumber 488
2250#define OBJ_mobileTelephoneNumber OBJ_pilotAttributeType,41L
2251
2252#define LN_pagerTelephoneNumber "pagerTelephoneNumber"
2253#define NID_pagerTelephoneNumber 489
2254#define OBJ_pagerTelephoneNumber OBJ_pilotAttributeType,42L
2255
2256#define LN_friendlyCountryName "friendlyCountryName"
2257#define NID_friendlyCountryName 490
2258#define OBJ_friendlyCountryName OBJ_pilotAttributeType,43L
2259
2260#define LN_organizationalStatus "organizationalStatus"
2261#define NID_organizationalStatus 491
2262#define OBJ_organizationalStatus OBJ_pilotAttributeType,45L
2263
2264#define LN_janetMailbox "janetMailbox"
2265#define NID_janetMailbox 492
2266#define OBJ_janetMailbox OBJ_pilotAttributeType,46L
2267
2268#define LN_mailPreferenceOption "mailPreferenceOption"
2269#define NID_mailPreferenceOption 493
2270#define OBJ_mailPreferenceOption OBJ_pilotAttributeType,47L
2271
2272#define LN_buildingName "buildingName"
2273#define NID_buildingName 494
2274#define OBJ_buildingName OBJ_pilotAttributeType,48L
2275
2276#define LN_dSAQuality "dSAQuality"
2277#define NID_dSAQuality 495
2278#define OBJ_dSAQuality OBJ_pilotAttributeType,49L
2279
2280#define LN_singleLevelQuality "singleLevelQuality"
2281#define NID_singleLevelQuality 496
2282#define OBJ_singleLevelQuality OBJ_pilotAttributeType,50L
2283
2284#define LN_subtreeMinimumQuality "subtreeMinimumQuality"
2285#define NID_subtreeMinimumQuality 497
2286#define OBJ_subtreeMinimumQuality OBJ_pilotAttributeType,51L
2287
2288#define LN_subtreeMaximumQuality "subtreeMaximumQuality"
2289#define NID_subtreeMaximumQuality 498
2290#define OBJ_subtreeMaximumQuality OBJ_pilotAttributeType,52L
2291
2292#define LN_personalSignature "personalSignature"
2293#define NID_personalSignature 499
2294#define OBJ_personalSignature OBJ_pilotAttributeType,53L
2295
2296#define LN_dITRedirect "dITRedirect"
2297#define NID_dITRedirect 500
2298#define OBJ_dITRedirect OBJ_pilotAttributeType,54L
2299
2300#define SN_audio "audio"
2301#define NID_audio 501
2302#define OBJ_audio OBJ_pilotAttributeType,55L
2303
2304#define LN_documentPublisher "documentPublisher"
2305#define NID_documentPublisher 502
2306#define OBJ_documentPublisher OBJ_pilotAttributeType,56L
2307
diff --git a/src/lib/libssl/src/crypto/opensslv.h b/src/lib/libssl/src/crypto/opensslv.h
index f45afe09f3..0d23a02fb2 100644
--- a/src/lib/libssl/src/crypto/opensslv.h
+++ b/src/lib/libssl/src/crypto/opensslv.h
@@ -25,8 +25,8 @@
25 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for 25 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
26 * major minor fix final patch/beta) 26 * major minor fix final patch/beta)
27 */ 27 */
28#define OPENSSL_VERSION_NUMBER 0x00907000L 28#define OPENSSL_VERSION_NUMBER 0x00907001L
29#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.7-dev XX xxx XXXX" 29#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.7-beta1 01 Jun 2002"
30#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT 30#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
31 31
32 32
diff --git a/src/lib/libssl/src/crypto/pem/pem_pkey.c b/src/lib/libssl/src/crypto/pem/pem_pkey.c
index 270892d72b..d96ecf6940 100644
--- a/src/lib/libssl/src/crypto/pem/pem_pkey.c
+++ b/src/lib/libssl/src/crypto/pem/pem_pkey.c
@@ -85,6 +85,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo
85 else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) { 85 else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) {
86 PKCS8_PRIV_KEY_INFO *p8inf; 86 PKCS8_PRIV_KEY_INFO *p8inf;
87 p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len); 87 p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);
88 if(!p8inf) goto p8err;
88 ret = EVP_PKCS82PKEY(p8inf); 89 ret = EVP_PKCS82PKEY(p8inf);
89 PKCS8_PRIV_KEY_INFO_free(p8inf); 90 PKCS8_PRIV_KEY_INFO_free(p8inf);
90 } else if (strcmp(nm,PEM_STRING_PKCS8) == 0) { 91 } else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {
diff --git a/src/lib/libssl/src/crypto/rand/rand_egd.c b/src/lib/libssl/src/crypto/rand/rand_egd.c
index dd490c8254..97ed12cf67 100644
--- a/src/lib/libssl/src/crypto/rand/rand_egd.c
+++ b/src/lib/libssl/src/crypto/rand/rand_egd.c
@@ -94,7 +94,7 @@
94 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. 94 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255.
95 */ 95 */
96 96
97#if defined(OPENSSL_SYS_WIN32) || defined(VMS) || defined(__VMS) 97#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
98int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) 98int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
99 { 99 {
100 return(-1); 100 return(-1);
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eay.c b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
index d82dd15493..0eda816081 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_eay.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
@@ -479,10 +479,10 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
479 int ret=0; 479 int ret=0;
480 BN_CTX *ctx; 480 BN_CTX *ctx;
481 481
482 if ((ctx=BN_CTX_new()) == NULL) goto err;
483 BN_init(&m1); 482 BN_init(&m1);
484 BN_init(&r1); 483 BN_init(&r1);
485 BN_init(&vrfy); 484 BN_init(&vrfy);
485 if ((ctx=BN_CTX_new()) == NULL) goto err;
486 486
487 if (rsa->flags & RSA_FLAG_CACHE_PRIVATE) 487 if (rsa->flags & RSA_FLAG_CACHE_PRIVATE)
488 { 488 {
diff --git a/src/lib/libssl/src/crypto/txt_db/txt_db.c b/src/lib/libssl/src/crypto/txt_db/txt_db.c
index e6334d6add..9b186f2da5 100644
--- a/src/lib/libssl/src/crypto/txt_db/txt_db.c
+++ b/src/lib/libssl/src/crypto/txt_db/txt_db.c
@@ -122,7 +122,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
122 else 122 else
123 { 123 {
124 buf->data[offset-1]='\0'; /* blat the '\n' */ 124 buf->data[offset-1]='\0'; /* blat the '\n' */
125 p=(char *)OPENSSL_malloc(add+offset); 125 if (!(p=(char *)OPENSSL_malloc(add+offset))) goto err;
126 offset=0; 126 offset=0;
127 } 127 }
128 pp=(char **)p; 128 pp=(char **)p;
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_ia5.c b/src/lib/libssl/src/crypto/x509v3/v3_ia5.c
index f3bba38269..f9414456de 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_ia5.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_ia5.c
@@ -82,7 +82,7 @@ static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
82{ 82{
83 char *tmp; 83 char *tmp;
84 if(!ia5 || !ia5->length) return NULL; 84 if(!ia5 || !ia5->length) return NULL;
85 tmp = OPENSSL_malloc(ia5->length + 1); 85 if (!(tmp = OPENSSL_malloc(ia5->length + 1))) return NULL;
86 memcpy(tmp, ia5->data, ia5->length); 86 memcpy(tmp, ia5->data, ia5->length);
87 tmp[ia5->length] = 0; 87 tmp[ia5->length] = 0;
88 return tmp; 88 return tmp;
diff --git a/src/lib/libssl/src/doc/apps/smime.pod b/src/lib/libssl/src/doc/apps/smime.pod
index ce99b5c345..fa5d23e8dc 100644
--- a/src/lib/libssl/src/doc/apps/smime.pod
+++ b/src/lib/libssl/src/doc/apps/smime.pod
@@ -21,7 +21,6 @@ B<openssl> B<smime>
21[B<-certfile file>] 21[B<-certfile file>]
22[B<-signer file>] 22[B<-signer file>]
23[B<-recip file>] 23[B<-recip file>]
24[B<-in file>]
25[B<-inform SMIME|PEM|DER>] 24[B<-inform SMIME|PEM|DER>]
26[B<-passin arg>] 25[B<-passin arg>]
27[B<-inkey file>] 26[B<-inkey file>]
diff --git a/src/lib/libssl/src/doc/crypto/BN_rand.pod b/src/lib/libssl/src/doc/crypto/BN_rand.pod
index 18301a396a..81f93c2eb3 100644
--- a/src/lib/libssl/src/doc/crypto/BN_rand.pod
+++ b/src/lib/libssl/src/doc/crypto/BN_rand.pod
@@ -14,7 +14,7 @@ BN_rand, BN_pseudo_rand - generate pseudo-random number
14 14
15 int BN_rand_range(BIGNUM *rnd, BIGNUM *range); 15 int BN_rand_range(BIGNUM *rnd, BIGNUM *range);
16 16
17 int BN_pseudo_rand_range(BIGNUM *rnd, int bits, int top, int bottom); 17 int BN_pseudo_rand_range(BIGNUM *rnd, BIGNUM *range);
18 18
19=head1 DESCRIPTION 19=head1 DESCRIPTION
20 20
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.pod
index 81286ee650..3a240c4d37 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.pod
@@ -14,7 +14,7 @@ SSL_CTX_set_cert_store, SSL_CTX_get_cert_store - manipulate X509 certificate ver
14=head1 DESCRIPTION 14=head1 DESCRIPTION
15 15
16SSL_CTX_set_cert_store() sets/replaces the certificate verification storage 16SSL_CTX_set_cert_store() sets/replaces the certificate verification storage
17of B<ctx> to/with B<store>. If another X505_STORE object is currently 17of B<ctx> to/with B<store>. If another X509_STORE object is currently
18set in B<ctx>, it will be X509_STORE_free()ed. 18set in B<ctx>, it will be X509_STORE_free()ed.
19 19
20SSL_CTX_get_cert_store() returns a pointer to the current certificate 20SSL_CTX_get_cert_store() returns a pointer to the current certificate
diff --git a/src/lib/libssl/src/e_os.h b/src/lib/libssl/src/e_os.h
index 49811404c5..055c1b0e29 100644
--- a/src/lib/libssl/src/e_os.h
+++ b/src/lib/libssl/src/e_os.h
@@ -114,7 +114,7 @@ extern "C" {
114 ********************************************************************/ 114 ********************************************************************/
115/* The following is used becaue of the small stack in some 115/* The following is used becaue of the small stack in some
116 * Microsoft operating systems */ 116 * Microsoft operating systems */
117#if defined(OPENSSL_SYS_MSDOS) 117#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32)
118# define MS_STATIC static 118# define MS_STATIC static
119#else 119#else
120# define MS_STATIC 120# define MS_STATIC
diff --git a/src/lib/libssl/src/makevms.com b/src/lib/libssl/src/makevms.com
index 5a0f5e228c..ba9e911fac 100644
--- a/src/lib/libssl/src/makevms.com
+++ b/src/lib/libssl/src/makevms.com
@@ -54,11 +54,16 @@ $!
54$! If you don't speficy a compiler, it will try to determine which 54$! If you don't speficy a compiler, it will try to determine which
55$! "C" compiler to use. 55$! "C" compiler to use.
56$! 56$!
57$! P5, if defined, sets a TCP/IP library to use, through one of the following 57$! P5, if defined, sets a TCP/IP library to use, through one of the following
58$! keywords: 58$! keywords:
59$! 59$!
60$! UCX for UCX or UCX emulation 60$! UCX for UCX or UCX emulation
61$! TCPIP for TCP/IP Services or TCP/IP Services emulation
62$! (this is prefered over UCX)
61$! SOCKETSHR for SOCKETSHR+NETLIB 63$! SOCKETSHR for SOCKETSHR+NETLIB
64$! NONE to avoid specifying which TCP/IP implementation to
65$! use at build time (this works with DEC C). This is
66$! the default.
62$! 67$!
63$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up) 68$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
64$! 69$!
@@ -375,7 +380,7 @@ $ SOFTLINKS:
375$! 380$!
376$! Tell The User We Are Partly Rebuilding The [.TEST] Directory. 381$! Tell The User We Are Partly Rebuilding The [.TEST] Directory.
377$! 382$!
378$ WRITE SYS$OUTPUT "Rebuilding The '[.APPS]MD5.C' And '[.APPS]RMD160.C' Files." 383$ WRITE SYS$OUTPUT "Rebuilding The '[.APPS]MD4.C', '[.APPS]MD5.C' And '[.APPS]RMD160.C' Files."
379$! 384$!
380$ DELETE SYS$DISK:[.APPS]MD4.C;*,MD5.C;*,RMD160.C;* 385$ DELETE SYS$DISK:[.APPS]MD4.C;*,MD5.C;*,RMD160.C;*
381$! 386$!
@@ -986,7 +991,8 @@ $ ENDIF
986$! 991$!
987$! Time to check the contents of P5, and to make sure we get the correct library. 992$! Time to check the contents of P5, and to make sure we get the correct library.
988$! 993$!
989$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" 994$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
995 .OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
990$ THEN 996$ THEN
991$! 997$!
992$! Check to see if SOCKETSHR was chosen 998$! Check to see if SOCKETSHR was chosen
@@ -996,7 +1002,7 @@ $ THEN
996$! 1002$!
997$! Set the library to use SOCKETSHR 1003$! Set the library to use SOCKETSHR
998$! 1004$!
999$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT" 1005$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
1000$! 1006$!
1001$! Tell the user 1007$! Tell the user
1002$! 1008$!
@@ -1030,7 +1036,7 @@ $ THEN
1030$! 1036$!
1031$! Set the library to use UCX. 1037$! Set the library to use UCX.
1032$! 1038$!
1033$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT" 1039$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
1034$! 1040$!
1035$! Tell the user 1041$! Tell the user
1036$! 1042$!
@@ -1040,6 +1046,40 @@ $! Done with UCX
1040$! 1046$!
1041$ ENDIF 1047$ ENDIF
1042$! 1048$!
1049$! Check to see if TCPIP was chosen
1050$!
1051$ IF P5.EQS."TCPIP"
1052$ THEN
1053$!
1054$! Set the library to use TCPIP (post UCX).
1055$!
1056$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
1057$!
1058$! Tell the user
1059$!
1060$ WRITE SYS$OUTPUT "Using TCPIP (post UCX) for TCP/IP"
1061$!
1062$! Done with TCPIP
1063$!
1064$ ENDIF
1065$!
1066$! Check to see if NONE was chosen
1067$!
1068$ IF P5.EQS."NONE"
1069$ THEN
1070$!
1071$! Do not use a TCPIP library.
1072$!
1073$ TCPIP_LIB = ""
1074$!
1075$! Tell the user
1076$!
1077$ WRITE SYS$OUTPUT "A specific TCPIP library will not be used."
1078$!
1079$! Done with NONE.
1080$!
1081$ ENDIF
1082$!
1043$! Set the TCPIP_TYPE symbol 1083$! Set the TCPIP_TYPE symbol
1044$! 1084$!
1045$ TCPIP_TYPE = P5 1085$ TCPIP_TYPE = P5
@@ -1061,6 +1101,8 @@ $ WRITE SYS$OUTPUT "The Option ",P5," Is Invalid. The Valid Options Are:"
1061$ WRITE SYS$OUTPUT "" 1101$ WRITE SYS$OUTPUT ""
1062$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 1102$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
1063$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 1103$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1104$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP TCP/IP (post UCX) library."
1105$ WRITE SYS$OUTPUT " NONE : To not link with a specific TCP/IP library."
1064$ WRITE SYS$OUTPUT "" 1106$ WRITE SYS$OUTPUT ""
1065$! 1107$!
1066$! Time To EXIT. 1108$! Time To EXIT.
@@ -1068,9 +1110,19 @@ $!
1068$ EXIT 1110$ EXIT
1069$ ELSE 1111$ ELSE
1070$! 1112$!
1113$! If TCPIP is not defined, then hardcode it to make
1114$! it clear that no TCPIP is desired.
1115$!
1116$ IF P5 .EQS. ""
1117$ THEN
1118$ TCPIP_LIB = ""
1119$ TCPIP_TYPE = "NONE"
1120$ ELSE
1121$!
1071$! Set the TCPIP_TYPE symbol 1122$! Set the TCPIP_TYPE symbol
1072$! 1123$!
1073$ TCPIP_TYPE = P5 1124$ TCPIP_TYPE = P5
1125$ ENDIF
1074$ ENDIF 1126$ ENDIF
1075$! 1127$!
1076$! Done with TCP/IP libraries 1128$! Done with TCP/IP libraries
diff --git a/src/lib/libssl/src/ssl/ssl-lib.com b/src/lib/libssl/src/ssl/ssl-lib.com
index 313ff2565e..1f1921e162 100644
--- a/src/lib/libssl/src/ssl/ssl-lib.com
+++ b/src/lib/libssl/src/ssl/ssl-lib.com
@@ -49,6 +49,7 @@ $! P5, if defined, sets a TCP/IP library to use, through one of the following
49$! keywords: 49$! keywords:
50$! 50$!
51$! UCX for UCX 51$! UCX for UCX
52$! TCPIP for TCPIP (post UCX)
52$! SOCKETSHR for SOCKETSHR+NETLIB 53$! SOCKETSHR for SOCKETSHR+NETLIB
53$! 54$!
54$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up) 55$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
@@ -313,6 +314,7 @@ $ WRITE SYS$OUTPUT "Creating SSL_TASK OSU HTTP SSL Engine."
313$! 314$!
314$! Compile The File. 315$! Compile The File.
315$! 316$!
317$ ON ERROR THEN GOTO SSL_TASK_END
316$ CC5/OBJECT='OBJ_DIR'SSL_TASK.OBJ SYS$DISK:[]SSL_TASK.C 318$ CC5/OBJECT='OBJ_DIR'SSL_TASK.OBJ SYS$DISK:[]SSL_TASK.C
317$! 319$!
318$! Link The Program, Check To See If We Need To Link With RSAREF Or Not. 320$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
@@ -387,6 +389,7 @@ $ ENDIF
387$! 389$!
388$! Time To Return. 390$! Time To Return.
389$! 391$!
392$SSL_TASK_END:
390$ RETURN 393$ RETURN
391$! 394$!
392$! Check For The Link Option FIle. 395$! Check For The Link Option FIle.
@@ -1087,7 +1090,8 @@ $ ENDIF
1087$! 1090$!
1088$! Time to check the contents, and to make sure we get the correct library. 1091$! Time to check the contents, and to make sure we get the correct library.
1089$! 1092$!
1090$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" 1093$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
1094 .OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
1091$ THEN 1095$ THEN
1092$! 1096$!
1093$! Check to see if SOCKETSHR was chosen 1097$! Check to see if SOCKETSHR was chosen
@@ -1097,7 +1101,7 @@ $ THEN
1097$! 1101$!
1098$! Set the library to use SOCKETSHR 1102$! Set the library to use SOCKETSHR
1099$! 1103$!
1100$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT" 1104$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
1101$! 1105$!
1102$! Done with SOCKETSHR 1106$! Done with SOCKETSHR
1103$! 1107$!
@@ -1123,19 +1127,45 @@ $ THEN
1123$! 1127$!
1124$! Set the library to use UCX. 1128$! Set the library to use UCX.
1125$! 1129$!
1126$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT" 1130$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
1127$ IF F$TRNLNM("UCX$IPC_SHR") .NES. "" 1131$ IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
1128$ THEN 1132$ THEN
1129$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT" 1133$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
1130$ ELSE 1134$ ELSE
1131$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN - 1135$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
1132 TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT" 1136 TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
1133$ ENDIF 1137$ ENDIF
1134$! 1138$!
1135$! Done with UCX 1139$! Done with UCX
1136$! 1140$!
1137$ ENDIF 1141$ ENDIF
1138$! 1142$!
1143$! Check to see if TCPIP was chosen
1144$!
1145$ IF P5.EQS."TCPIP"
1146$ THEN
1147$!
1148$! Set the library to use TCPIP (post UCX).
1149$!
1150$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
1151$!
1152$! Done with TCPIP
1153$!
1154$ ENDIF
1155$!
1156$! Check to see if NONE was chosen
1157$!
1158$ IF P5.EQS."NONE"
1159$ THEN
1160$!
1161$! Do not use a TCPIP library.
1162$!
1163$ TCPIP_LIB = ""
1164$!
1165$! Done with NONE
1166$!
1167$ ENDIF
1168$!
1139$! Print info 1169$! Print info
1140$! 1170$!
1141$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB 1171$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -1151,6 +1181,7 @@ $ WRITE SYS$OUTPUT "The Option ",P5," Is Invalid. The Valid Options Are:"
1151$ WRITE SYS$OUTPUT "" 1181$ WRITE SYS$OUTPUT ""
1152$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 1182$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
1153$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 1183$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1184$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
1154$ WRITE SYS$OUTPUT "" 1185$ WRITE SYS$OUTPUT ""
1155$! 1186$!
1156$! Time To EXIT. 1187$! Time To EXIT.
diff --git a/src/lib/libssl/src/test/Makefile.ssl b/src/lib/libssl/src/test/Makefile.ssl
index a11e3dfcd7..d6add0bf7b 100644
--- a/src/lib/libssl/src/test/Makefile.ssl
+++ b/src/lib/libssl/src/test/Makefile.ssl
@@ -14,7 +14,6 @@ MAKEFILE= Makefile.ssl
14MAKE= make -f $(MAKEFILE) 14MAKE= make -f $(MAKEFILE)
15MAKEDEPPROG= makedepend 15MAKEDEPPROG= makedepend
16MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) 16MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
17PERL= perl
18 17
19PEX_LIBS= 18PEX_LIBS=
20EX_LIBS= #-lnsl -lsocket 19EX_LIBS= #-lnsl -lsocket
diff --git a/src/lib/libssl/src/test/maketests.com b/src/lib/libssl/src/test/maketests.com
index e0be3dd43b..b3bf8bb837 100644
--- a/src/lib/libssl/src/test/maketests.com
+++ b/src/lib/libssl/src/test/maketests.com
@@ -910,7 +910,8 @@ $ ENDIF
910$! 910$!
911$! Time to check the contents, and to make sure we get the correct library. 911$! Time to check the contents, and to make sure we get the correct library.
912$! 912$!
913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" 913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
914 .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
914$ THEN 915$ THEN
915$! 916$!
916$! Check to see if SOCKETSHR was chosen 917$! Check to see if SOCKETSHR was chosen
@@ -920,7 +921,7 @@ $ THEN
920$! 921$!
921$! Set the library to use SOCKETSHR 922$! Set the library to use SOCKETSHR
922$! 923$!
923$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT" 924$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
924$! 925$!
925$! Done with SOCKETSHR 926$! Done with SOCKETSHR
926$! 927$!
@@ -946,19 +947,45 @@ $ THEN
946$! 947$!
947$! Set the library to use UCX. 948$! Set the library to use UCX.
948$! 949$!
949$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT" 950$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
950$ IF F$TRNLNM("UCX$IPC_SHR") .NES. "" 951$ IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
951$ THEN 952$ THEN
952$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT" 953$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
953$ ELSE 954$ ELSE
954$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN - 955$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
955 TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT" 956 TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
956$ ENDIF 957$ ENDIF
957$! 958$!
958$! Done with UCX 959$! Done with UCX
959$! 960$!
960$ ENDIF 961$ ENDIF
961$! 962$!
963$! Check to see if TCPIP was chosen
964$!
965$ IF P4.EQS."TCPIP"
966$ THEN
967$!
968$! Set the library to use TCPIP (post UCX).
969$!
970$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
971$!
972$! Done with TCPIP
973$!
974$ ENDIF
975$!
976$! Check to see if NONE was chosen
977$!
978$ IF P4.EQS."NONE"
979$ THEN
980$!
981$! Do not use a TCPIP library.
982$!
983$ TCPIP_LIB = ""
984$!
985$! Done with NONE
986$!
987$ ENDIF
988$!
962$! Print info 989$! Print info
963$! 990$!
964$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB 991$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -974,6 +1001,7 @@ $ WRITE SYS$OUTPUT "The Option ",P4," Is Invalid. The Valid Options Are:"
974$ WRITE SYS$OUTPUT "" 1001$ WRITE SYS$OUTPUT ""
975$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 1002$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
976$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 1003$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1004$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
977$ WRITE SYS$OUTPUT "" 1005$ WRITE SYS$OUTPUT ""
978$! 1006$!
979$! Time To EXIT. 1007$! Time To EXIT.
diff --git a/src/lib/libssl/src/util/domd b/src/lib/libssl/src/util/domd
index aa99cb0523..8cbe383c16 100644
--- a/src/lib/libssl/src/util/domd
+++ b/src/lib/libssl/src/util/domd
@@ -18,11 +18,11 @@ if [ "$MAKEDEPEND" = "gcc" ]; then
18 sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp 18 sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
19 echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp 19 echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
20 gcc -D OPENSSL_DOING_MAKEDEPEND -M $@ >> Makefile.tmp 20 gcc -D OPENSSL_DOING_MAKEDEPEND -M $@ >> Makefile.tmp
21 perl $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new 21 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
22 rm -f Makefile.tmp 22 rm -f Makefile.tmp
23else 23else
24 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@ 24 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@
25 perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new 25 ${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
26fi 26fi
27mv Makefile.new Makefile.ssl 27mv Makefile.new Makefile.ssl
28# unfake the presence of Kerberos 28# unfake the presence of Kerberos
diff --git a/src/lib/libssl/src/util/libeay.num b/src/lib/libssl/src/util/libeay.num
index b74749e5de..4845158158 100644
--- a/src/lib/libssl/src/util/libeay.num
+++ b/src/lib/libssl/src/util/libeay.num
@@ -2774,3 +2774,9 @@ AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES
2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES 2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES
2775ENGINE_load_4758cca 3218 EXIST::FUNCTION: 2775ENGINE_load_4758cca 3218 EXIST::FUNCTION:
2776_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES 2776_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES
2777EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES
2778EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES
2779EVP_aes_128_cfb 3222 EXIST::FUNCTION:AES
2780EVP_aes_256_cfb 3223 EXIST::FUNCTION:AES
2781EVP_aes_128_ofb 3224 EXIST::FUNCTION:AES
2782EVP_aes_192_cfb 3225 EXIST::FUNCTION:AES
diff --git a/src/lib/libssl/src/util/mkerr.pl b/src/lib/libssl/src/util/mkerr.pl
index 6c2237d142..4105047b21 100644
--- a/src/lib/libssl/src/util/mkerr.pl
+++ b/src/lib/libssl/src/util/mkerr.pl
@@ -262,7 +262,7 @@ foreach $lib (keys %csrc)
262 } else { 262 } else {
263 push @out, 263 push @out,
264"/* ====================================================================\n", 264"/* ====================================================================\n",
265" * Copyright (c) 2001 The OpenSSL Project. All rights reserved.\n", 265" * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved.\n",
266" *\n", 266" *\n",
267" * Redistribution and use in source and binary forms, with or without\n", 267" * Redistribution and use in source and binary forms, with or without\n",
268" * modification, are permitted provided that the following conditions\n", 268" * modification, are permitted provided that the following conditions\n",
@@ -404,7 +404,7 @@ EOF
404 print OUT <<"EOF"; 404 print OUT <<"EOF";
405/* $cfile */ 405/* $cfile */
406/* ==================================================================== 406/* ====================================================================
407 * Copyright (c) 1999 The OpenSSL Project. All rights reserved. 407 * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved.
408 * 408 *
409 * Redistribution and use in source and binary forms, with or without 409 * Redistribution and use in source and binary forms, with or without
410 * modification, are permitted provided that the following conditions 410 * modification, are permitted provided that the following conditions
diff --git a/src/lib/libssl/src/util/pod2man.pl b/src/lib/libssl/src/util/pod2man.pl
index c6b64add60..657e4e264e 100644
--- a/src/lib/libssl/src/util/pod2man.pl
+++ b/src/lib/libssl/src/util/pod2man.pl
@@ -416,8 +416,8 @@ if ($name ne 'something') {
416 warn "$0: Improper man page - malformed NAME header in paragraph $. of $ARGV[0]\n" 416 warn "$0: Improper man page - malformed NAME header in paragraph $. of $ARGV[0]\n"
417 } 417 }
418 else { 418 else {
419 $n[0] =~ s/\n/ /; 419 $n[0] =~ s/\n/ /g;
420 $n[1] =~ s/\n/ /; 420 $n[1] =~ s/\n/ /g;
421 %namedesc = @n; 421 %namedesc = @n;
422 } 422 }
423 } 423 }
diff --git a/src/lib/libssl/test/Makefile.ssl b/src/lib/libssl/test/Makefile.ssl
index a11e3dfcd7..d6add0bf7b 100644
--- a/src/lib/libssl/test/Makefile.ssl
+++ b/src/lib/libssl/test/Makefile.ssl
@@ -14,7 +14,6 @@ MAKEFILE= Makefile.ssl
14MAKE= make -f $(MAKEFILE) 14MAKE= make -f $(MAKEFILE)
15MAKEDEPPROG= makedepend 15MAKEDEPPROG= makedepend
16MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) 16MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
17PERL= perl
18 17
19PEX_LIBS= 18PEX_LIBS=
20EX_LIBS= #-lnsl -lsocket 19EX_LIBS= #-lnsl -lsocket
diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com
index e0be3dd43b..b3bf8bb837 100644
--- a/src/lib/libssl/test/maketests.com
+++ b/src/lib/libssl/test/maketests.com
@@ -910,7 +910,8 @@ $ ENDIF
910$! 910$!
911$! Time to check the contents, and to make sure we get the correct library. 911$! Time to check the contents, and to make sure we get the correct library.
912$! 912$!
913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" 913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
914 .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
914$ THEN 915$ THEN
915$! 916$!
916$! Check to see if SOCKETSHR was chosen 917$! Check to see if SOCKETSHR was chosen
@@ -920,7 +921,7 @@ $ THEN
920$! 921$!
921$! Set the library to use SOCKETSHR 922$! Set the library to use SOCKETSHR
922$! 923$!
923$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT" 924$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
924$! 925$!
925$! Done with SOCKETSHR 926$! Done with SOCKETSHR
926$! 927$!
@@ -946,19 +947,45 @@ $ THEN
946$! 947$!
947$! Set the library to use UCX. 948$! Set the library to use UCX.
948$! 949$!
949$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT" 950$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
950$ IF F$TRNLNM("UCX$IPC_SHR") .NES. "" 951$ IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
951$ THEN 952$ THEN
952$ TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT" 953$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
953$ ELSE 954$ ELSE
954$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN - 955$ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
955 TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT" 956 TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
956$ ENDIF 957$ ENDIF
957$! 958$!
958$! Done with UCX 959$! Done with UCX
959$! 960$!
960$ ENDIF 961$ ENDIF
961$! 962$!
963$! Check to see if TCPIP was chosen
964$!
965$ IF P4.EQS."TCPIP"
966$ THEN
967$!
968$! Set the library to use TCPIP (post UCX).
969$!
970$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
971$!
972$! Done with TCPIP
973$!
974$ ENDIF
975$!
976$! Check to see if NONE was chosen
977$!
978$ IF P4.EQS."NONE"
979$ THEN
980$!
981$! Do not use a TCPIP library.
982$!
983$ TCPIP_LIB = ""
984$!
985$! Done with NONE
986$!
987$ ENDIF
988$!
962$! Print info 989$! Print info
963$! 990$!
964$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB 991$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -974,6 +1001,7 @@ $ WRITE SYS$OUTPUT "The Option ",P4," Is Invalid. The Valid Options Are:"
974$ WRITE SYS$OUTPUT "" 1001$ WRITE SYS$OUTPUT ""
975$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 1002$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
976$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 1003$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1004$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
977$ WRITE SYS$OUTPUT "" 1005$ WRITE SYS$OUTPUT ""
978$! 1006$!
979$! Time To EXIT. 1007$! Time To EXIT.
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 00:36:34 +0000