summaryrefslogtreecommitdiff
path: root/src/lib/libc
diff options
context:
space:
mode:
authormarkus <>2002-09-05 22:45:21 +0000
committermarkus <>2002-09-05 22:45:21 +0000
commit2a6851ef8adb0e84ff2515493d3704a13c6256b0 (patch)
tree9df5b497548eaf51e9f234d27aaf988cd14882c2 /src/lib/libc
parent5514995a9d5ed91db089875adb509c7781357c0e (diff)
downloadopenbsd-2a6851ef8adb0e84ff2515493d3704a13c6256b0.tar.gz
openbsd-2a6851ef8adb0e84ff2515493d3704a13c6256b0.tar.bz2
openbsd-2a6851ef8adb0e84ff2515493d3704a13c6256b0.zip
import openssl-0.9.7-beta3
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/asn1/a_utctm.c3
-rw-r--r--src/lib/libcrypto/bn/bntest.c2
-rw-r--r--src/lib/libcrypto/des/des_old.h4
-rw-r--r--src/lib/libcrypto/des/read_pwd.c2
-rw-r--r--src/lib/libcrypto/ebcdic.c4
-rw-r--r--src/lib/libcrypto/ec/ectest.c6
-rw-r--r--src/lib/libcrypto/engine/hw_4758_cca.c29
-rw-r--r--src/lib/libcrypto/engine/hw_aep.c28
-rw-r--r--src/lib/libcrypto/engine/hw_atalla.c27
-rw-r--r--src/lib/libcrypto/engine/hw_cswift.c43
-rw-r--r--src/lib/libcrypto/engine/hw_ncipher.c33
-rw-r--r--src/lib/libcrypto/engine/hw_nuron.c27
-rw-r--r--src/lib/libcrypto/engine/hw_ubsec.c26
-rw-r--r--src/lib/libcrypto/evp/evp_test.c4
-rw-r--r--src/lib/libcrypto/objects/obj_dat.h797
-rw-r--r--src/lib/libcrypto/objects/obj_mac.h551
-rw-r--r--src/lib/libcrypto/perlasm/x86nasm.pl2
-rw-r--r--src/lib/libcrypto/pkcs7/verify.c5
-rw-r--r--src/lib/libcrypto/rand/rand_egd.c2
-rw-r--r--src/lib/libcrypto/rand/rand_unix.c2
-rw-r--r--src/lib/libcrypto/symhacks.h2
-rw-r--r--src/lib/libcrypto/util/dirname.pl18
-rw-r--r--src/lib/libcrypto/util/domd4
-rw-r--r--src/lib/libcrypto/util/libeay.num30
-rw-r--r--src/lib/libcrypto/util/mk1mf.pl2
-rw-r--r--src/lib/libcrypto/util/mkdef.pl50
-rw-r--r--src/lib/libcrypto/util/mklink.pl15
-rw-r--r--src/lib/libcrypto/util/pl/BC-32.pl42
-rw-r--r--src/lib/libcrypto/util/pl/OS2-EMX.pl79
-rw-r--r--src/lib/libcrypto/util/pl/VC-32.pl36
-rw-r--r--src/lib/libcrypto/util/pod2mantest7
-rw-r--r--src/lib/libcrypto/util/point.sh6
32 files changed, 1724 insertions, 164 deletions
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/bn/bntest.c b/src/lib/libcrypto/bn/bntest.c
index 443cf420e5..8158a67374 100644
--- a/src/lib/libcrypto/bn/bntest.c
+++ b/src/lib/libcrypto/bn/bntest.c
@@ -925,7 +925,7 @@ int test_kron(BIO *bp, BN_CTX *ctx)
925 /* r := a^t mod b */ 925 /* r := a^t mod b */
926 b->neg=0; 926 b->neg=0;
927 927
928 if (!BN_mod_exp_recp(r, a, t, b, ctx)) goto err; /* XXX should be BN_mod_exp_recp, but ..._recp triggers a bug that must be fixed */ 928 if (!BN_mod_exp_recp(r, a, t, b, ctx)) goto err;
929 b->neg=1; 929 b->neg=1;
930 930
931 if (BN_is_word(r, 1)) 931 if (BN_is_word(r, 1))
diff --git a/src/lib/libcrypto/des/des_old.h b/src/lib/libcrypto/des/des_old.h
index 3778f93c15..51b987422a 100644
--- a/src/lib/libcrypto/des/des_old.h
+++ b/src/lib/libcrypto/des/des_old.h
@@ -173,7 +173,7 @@ typedef struct _ossl_old_des_ks_struct
173 DES_fcrypt((b),(s),(r)) 173 DES_fcrypt((b),(s),(r))
174#define des_crypt(b,s)\ 174#define des_crypt(b,s)\
175 DES_crypt((b),(s)) 175 DES_crypt((b),(s))
176#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) 176#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
177#define crypt(b,s)\ 177#define crypt(b,s)\
178 DES_crypt((b),(s)) 178 DES_crypt((b),(s))
179#endif 179#endif
@@ -366,7 +366,7 @@ int _ossl_old_des_enc_write(int fd,char *buf,int len,_ossl_old_des_key_schedule
366 _ossl_old_des_cblock *iv); 366 _ossl_old_des_cblock *iv);
367char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret); 367char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret);
368char *_ossl_old_des_crypt(const char *buf,const char *salt); 368char *_ossl_old_des_crypt(const char *buf,const char *salt);
369#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) 369#if !defined(PERL5) && !defined(NeXT)
370char *_ossl_old_crypt(const char *buf,const char *salt); 370char *_ossl_old_crypt(const char *buf,const char *salt);
371#endif 371#endif
372void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out, 372void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
diff --git a/src/lib/libcrypto/des/read_pwd.c b/src/lib/libcrypto/des/read_pwd.c
index 00000190f8..9061935f21 100644
--- a/src/lib/libcrypto/des/read_pwd.c
+++ b/src/lib/libcrypto/des/read_pwd.c
@@ -246,7 +246,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt,
246 long status; 246 long status;
247 unsigned short channel = 0; 247 unsigned short channel = 0;
248#else 248#else
249#ifndef OPENSSL_SYS_MSDOS 249#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
250 TTY_STRUCT tty_orig,tty_new; 250 TTY_STRUCT tty_orig,tty_new;
251#endif 251#endif
252#endif 252#endif
diff --git a/src/lib/libcrypto/ebcdic.c b/src/lib/libcrypto/ebcdic.c
index bc968ea807..d1bece87f7 100644
--- a/src/lib/libcrypto/ebcdic.c
+++ b/src/lib/libcrypto/ebcdic.c
@@ -211,8 +211,8 @@ ascii2ebcdic(void *dest, const void *srce, size_t count)
211} 211}
212 212
213#else /*CHARSET_EBCDIC*/ 213#else /*CHARSET_EBCDIC*/
214#include <openssl/opensslconf.h> 214#include <openssl/e_os2.h>
215#if defined(PEDANTIC) || defined(__DECC) 215#if defined(PEDANTIC) || defined(__DECC) || defined(OPENSSL_SYS_MACOSX)
216static void *dummy=&dummy; 216static void *dummy=&dummy;
217#endif 217#endif
218#endif 218#endif
diff --git a/src/lib/libcrypto/ec/ectest.c b/src/lib/libcrypto/ec/ectest.c
index 243cd83fb5..eab46cc080 100644
--- a/src/lib/libcrypto/ec/ectest.c
+++ b/src/lib/libcrypto/ec/ectest.c
@@ -75,8 +75,8 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
75 exit(1); \ 75 exit(1); \
76} while (0) 76} while (0)
77 77
78 78#if 0
79void timings(EC_GROUP *group, int multi, BN_CTX *ctx) 79static void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
80 { 80 {
81 clock_t clck; 81 clock_t clck;
82 int i, j; 82 int i, j;
@@ -138,7 +138,7 @@ void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
138 BN_free(s); 138 BN_free(s);
139 BN_free(s0); 139 BN_free(s0);
140 } 140 }
141 141#endif
142 142
143int main(int argc, char *argv[]) 143int main(int argc, char *argv[])
144 { 144 {
diff --git a/src/lib/libcrypto/engine/hw_4758_cca.c b/src/lib/libcrypto/engine/hw_4758_cca.c
index 77d3d2ffdf..1053c52082 100644
--- a/src/lib/libcrypto/engine/hw_4758_cca.c
+++ b/src/lib/libcrypto/engine/hw_4758_cca.c
@@ -124,8 +124,24 @@ static F_RANDOMNUMBERGENERATE randomNumberGenerate;
124 124
125/* static variables */ 125/* static variables */
126/*------------------*/ 126/*------------------*/
127static const char def_CCA4758_LIB_NAME[] = CCA_LIB_NAME; 127static const char *CCA4758_LIB_NAME = NULL;
128static const char *CCA4758_LIB_NAME = def_CCA4758_LIB_NAME; 128static const char *get_CCA4758_LIB_NAME(void)
129 {
130 if(CCA4758_LIB_NAME)
131 return CCA4758_LIB_NAME;
132 return CCA_LIB_NAME;
133 }
134static void free_CCA4758_LIB_NAME(void)
135 {
136 if(CCA4758_LIB_NAME)
137 OPENSSL_free((void*)CCA4758_LIB_NAME);
138 CCA4758_LIB_NAME = NULL;
139 }
140static long set_CCA4758_LIB_NAME(const char *name)
141 {
142 free_CCA4758_LIB_NAME();
143 return (((CCA4758_LIB_NAME = BUF_strdup(name)) != NULL) ? 1 : 0);
144 }
129#ifndef OPENSSL_NO_RSA 145#ifndef OPENSSL_NO_RSA
130static const char* n_keyRecordRead = CSNDKRR; 146static const char* n_keyRecordRead = CSNDKRR;
131static const char* n_digitalSignatureGenerate = CSNDDSG; 147static const char* n_digitalSignatureGenerate = CSNDDSG;
@@ -232,6 +248,7 @@ void ENGINE_load_4758cca(void)
232static int ibm_4758_cca_destroy(ENGINE *e) 248static int ibm_4758_cca_destroy(ENGINE *e)
233 { 249 {
234 ERR_unload_CCA4758_strings(); 250 ERR_unload_CCA4758_strings();
251 free_CCA4758_LIB_NAME();
235 return 1; 252 return 1;
236 } 253 }
237 254
@@ -243,7 +260,7 @@ static int ibm_4758_cca_init(ENGINE *e)
243 goto err; 260 goto err;
244 } 261 }
245 262
246 dso = DSO_load(NULL, CCA4758_LIB_NAME , NULL, 0); 263 dso = DSO_load(NULL, get_CCA4758_LIB_NAME(), NULL, 0);
247 if(!dso) 264 if(!dso)
248 { 265 {
249 CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_DSO_FAILURE); 266 CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_DSO_FAILURE);
@@ -299,7 +316,8 @@ err:
299 316
300static int ibm_4758_cca_finish(ENGINE *e) 317static int ibm_4758_cca_finish(ENGINE *e)
301 { 318 {
302 if(dso) 319 free_CCA4758_LIB_NAME();
320 if(!dso)
303 { 321 {
304 CCA4758err(CCA4758_F_IBM_4758_CCA_FINISH, 322 CCA4758err(CCA4758_F_IBM_4758_CCA_FINISH,
305 CCA4758_R_NOT_LOADED); 323 CCA4758_R_NOT_LOADED);
@@ -340,8 +358,7 @@ static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
340 CCA4758_R_ALREADY_LOADED); 358 CCA4758_R_ALREADY_LOADED);
341 return 0; 359 return 0;
342 } 360 }
343 CCA4758_LIB_NAME = (const char *)p; 361 return set_CCA4758_LIB_NAME((const char *)p);
344 return 1;
345 default: 362 default:
346 break; 363 break;
347 } 364 }
diff --git a/src/lib/libcrypto/engine/hw_aep.c b/src/lib/libcrypto/engine/hw_aep.c
index cf4507cff1..8b8380a582 100644
--- a/src/lib/libcrypto/engine/hw_aep.c
+++ b/src/lib/libcrypto/engine/hw_aep.c
@@ -60,7 +60,7 @@
60#include <string.h> 60#include <string.h>
61 61
62#include <openssl/e_os2.h> 62#include <openssl/e_os2.h>
63#ifndef OPENSSL_SYS_MSDOS 63#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
64#include <sys/types.h> 64#include <sys/types.h>
65#include <unistd.h> 65#include <unistd.h>
66#else 66#else
@@ -71,6 +71,7 @@ typedef int pid_t;
71#include <openssl/crypto.h> 71#include <openssl/crypto.h>
72#include <openssl/dso.h> 72#include <openssl/dso.h>
73#include <openssl/engine.h> 73#include <openssl/engine.h>
74#include <openssl/buffer.h>
74 75
75#ifndef OPENSSL_NO_HW 76#ifndef OPENSSL_NO_HW
76#ifndef OPENSSL_NO_HW_AEP 77#ifndef OPENSSL_NO_HW_AEP
@@ -363,7 +364,24 @@ static DSO *aep_dso = NULL;
363/* These are the static string constants for the DSO file name and the function 364/* These are the static string constants for the DSO file name and the function
364 * symbol names to bind to. 365 * symbol names to bind to.
365*/ 366*/
366static const char *AEP_LIBNAME = "aep"; 367static const char *AEP_LIBNAME = NULL;
368static const char *get_AEP_LIBNAME(void)
369 {
370 if(AEP_LIBNAME)
371 return AEP_LIBNAME;
372 return "aep";
373 }
374static void free_AEP_LIBNAME(void)
375 {
376 if(AEP_LIBNAME)
377 OPENSSL_free((void*)AEP_LIBNAME);
378 AEP_LIBNAME = NULL;
379 }
380static long set_AEP_LIBNAME(const char *name)
381 {
382 free_AEP_LIBNAME();
383 return ((AEP_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0);
384 }
367 385
368static const char *AEP_F1 = "AEP_ModExp"; 386static const char *AEP_F1 = "AEP_ModExp";
369static const char *AEP_F2 = "AEP_ModExpCrt"; 387static const char *AEP_F2 = "AEP_ModExpCrt";
@@ -412,7 +430,7 @@ static int aep_init(ENGINE *e)
412 } 430 }
413 /* Attempt to load libaep.so. */ 431 /* Attempt to load libaep.so. */
414 432
415 aep_dso = DSO_load(NULL, AEP_LIBNAME, NULL, 0); 433 aep_dso = DSO_load(NULL, get_AEP_LIBNAME(), NULL, 0);
416 434
417 if(aep_dso == NULL) 435 if(aep_dso == NULL)
418 { 436 {
@@ -474,6 +492,7 @@ static int aep_init(ENGINE *e)
474/* Destructor (complements the "ENGINE_aep()" constructor) */ 492/* Destructor (complements the "ENGINE_aep()" constructor) */
475static int aep_destroy(ENGINE *e) 493static int aep_destroy(ENGINE *e)
476 { 494 {
495 free_AEP_LIBNAME();
477 ERR_unload_AEPHK_strings(); 496 ERR_unload_AEPHK_strings();
478 return 1; 497 return 1;
479 } 498 }
@@ -549,8 +568,7 @@ static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
549 AEPHK_R_ALREADY_LOADED); 568 AEPHK_R_ALREADY_LOADED);
550 return 0; 569 return 0;
551 } 570 }
552 AEP_LIBNAME = (const char *)p; 571 return set_AEP_LIBNAME((const char*)p);
553 return 1;
554 default: 572 default:
555 break; 573 break;
556 } 574 }
diff --git a/src/lib/libcrypto/engine/hw_atalla.c b/src/lib/libcrypto/engine/hw_atalla.c
index 696cfcf156..6151c46902 100644
--- a/src/lib/libcrypto/engine/hw_atalla.c
+++ b/src/lib/libcrypto/engine/hw_atalla.c
@@ -286,8 +286,24 @@ static tfnASI_GetPerformanceStatistics *p_Atalla_GetPerformanceStatistics = NULL
286 * atasi.dll on win32). For the purposes of testing, I have created a symbollic 286 * atasi.dll on win32). For the purposes of testing, I have created a symbollic
287 * link called "libatasi.so" so that we can use native name-translation - a 287 * link called "libatasi.so" so that we can use native name-translation - a
288 * better solution will be needed. */ 288 * better solution will be needed. */
289static const char def_ATALLA_LIBNAME[] = "atasi"; 289static const char *ATALLA_LIBNAME = NULL;
290static const char *ATALLA_LIBNAME = def_ATALLA_LIBNAME; 290static const char *get_ATALLA_LIBNAME(void)
291 {
292 if(ATALLA_LIBNAME)
293 return ATALLA_LIBNAME;
294 return "atasi";
295 }
296static void free_ATALLA_LIBNAME(void)
297 {
298 if(ATALLA_LIBNAME)
299 OPENSSL_free((void*)ATALLA_LIBNAME);
300 ATALLA_LIBNAME = NULL;
301 }
302static long set_ATALLA_LIBNAME(const char *name)
303 {
304 free_ATALLA_LIBNAME();
305 return (((ATALLA_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
306 }
291static const char *ATALLA_F1 = "ASI_GetHardwareConfig"; 307static const char *ATALLA_F1 = "ASI_GetHardwareConfig";
292static const char *ATALLA_F2 = "ASI_RSAPrivateKeyOpFn"; 308static const char *ATALLA_F2 = "ASI_RSAPrivateKeyOpFn";
293static const char *ATALLA_F3 = "ASI_GetPerformanceStatistics"; 309static const char *ATALLA_F3 = "ASI_GetPerformanceStatistics";
@@ -295,6 +311,7 @@ static const char *ATALLA_F3 = "ASI_GetPerformanceStatistics";
295/* Destructor (complements the "ENGINE_atalla()" constructor) */ 311/* Destructor (complements the "ENGINE_atalla()" constructor) */
296static int atalla_destroy(ENGINE *e) 312static int atalla_destroy(ENGINE *e)
297 { 313 {
314 free_ATALLA_LIBNAME();
298 /* Unload the atalla error strings so any error state including our 315 /* Unload the atalla error strings so any error state including our
299 * functs or reasons won't lead to a segfault (they simply get displayed 316 * functs or reasons won't lead to a segfault (they simply get displayed
300 * without corresponding string data because none will be found). */ 317 * without corresponding string data because none will be found). */
@@ -324,7 +341,7 @@ static int atalla_init(ENGINE *e)
324 * drivers really use - for now a symbollic link needs to be 341 * drivers really use - for now a symbollic link needs to be
325 * created on the host system from libatasi.so to atasi.so on 342 * created on the host system from libatasi.so to atasi.so on
326 * unix variants. */ 343 * unix variants. */
327 atalla_dso = DSO_load(NULL, ATALLA_LIBNAME, NULL, 0); 344 atalla_dso = DSO_load(NULL, get_ATALLA_LIBNAME(), NULL, 0);
328 if(atalla_dso == NULL) 345 if(atalla_dso == NULL)
329 { 346 {
330 ATALLAerr(ATALLA_F_ATALLA_INIT,ATALLA_R_NOT_LOADED); 347 ATALLAerr(ATALLA_F_ATALLA_INIT,ATALLA_R_NOT_LOADED);
@@ -364,6 +381,7 @@ err:
364 381
365static int atalla_finish(ENGINE *e) 382static int atalla_finish(ENGINE *e)
366 { 383 {
384 free_ATALLA_LIBNAME();
367 if(atalla_dso == NULL) 385 if(atalla_dso == NULL)
368 { 386 {
369 ATALLAerr(ATALLA_F_ATALLA_FINISH,ATALLA_R_NOT_LOADED); 387 ATALLAerr(ATALLA_F_ATALLA_FINISH,ATALLA_R_NOT_LOADED);
@@ -397,8 +415,7 @@ static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
397 ATALLAerr(ATALLA_F_ATALLA_CTRL,ATALLA_R_ALREADY_LOADED); 415 ATALLAerr(ATALLA_F_ATALLA_CTRL,ATALLA_R_ALREADY_LOADED);
398 return 0; 416 return 0;
399 } 417 }
400 ATALLA_LIBNAME = (const char *)p; 418 return set_ATALLA_LIBNAME((const char *)p);
401 return 1;
402 default: 419 default:
403 break; 420 break;
404 } 421 }
diff --git a/src/lib/libcrypto/engine/hw_cswift.c b/src/lib/libcrypto/engine/hw_cswift.c
index d8b380550f..f5c897bdbb 100644
--- a/src/lib/libcrypto/engine/hw_cswift.c
+++ b/src/lib/libcrypto/engine/hw_cswift.c
@@ -280,8 +280,24 @@ t_swSimpleRequest *p_CSwift_SimpleRequest = NULL;
280t_swReleaseAccContext *p_CSwift_ReleaseAccContext = NULL; 280t_swReleaseAccContext *p_CSwift_ReleaseAccContext = NULL;
281 281
282/* Used in the DSO operations. */ 282/* Used in the DSO operations. */
283static const char def_CSWIFT_LIBNAME[] = "swift"; 283static const char *CSWIFT_LIBNAME = NULL;
284static const char *CSWIFT_LIBNAME = def_CSWIFT_LIBNAME; 284static const char *get_CSWIFT_LIBNAME(void)
285 {
286 if(CSWIFT_LIBNAME)
287 return CSWIFT_LIBNAME;
288 return "swift";
289 }
290static void free_CSWIFT_LIBNAME(void)
291 {
292 if(CSWIFT_LIBNAME)
293 OPENSSL_free((void*)CSWIFT_LIBNAME);
294 CSWIFT_LIBNAME = NULL;
295 }
296static long set_CSWIFT_LIBNAME(const char *name)
297 {
298 free_CSWIFT_LIBNAME();
299 return (((CSWIFT_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
300 }
285static const char *CSWIFT_F1 = "swAcquireAccContext"; 301static const char *CSWIFT_F1 = "swAcquireAccContext";
286static const char *CSWIFT_F2 = "swAttachKeyParam"; 302static const char *CSWIFT_F2 = "swAttachKeyParam";
287static const char *CSWIFT_F3 = "swSimpleRequest"; 303static const char *CSWIFT_F3 = "swSimpleRequest";
@@ -313,6 +329,7 @@ static void release_context(SW_CONTEXT_HANDLE hac)
313/* Destructor (complements the "ENGINE_cswift()" constructor) */ 329/* Destructor (complements the "ENGINE_cswift()" constructor) */
314static int cswift_destroy(ENGINE *e) 330static int cswift_destroy(ENGINE *e)
315 { 331 {
332 free_CSWIFT_LIBNAME();
316 ERR_unload_CSWIFT_strings(); 333 ERR_unload_CSWIFT_strings();
317 return 1; 334 return 1;
318 } 335 }
@@ -332,7 +349,7 @@ static int cswift_init(ENGINE *e)
332 goto err; 349 goto err;
333 } 350 }
334 /* Attempt to load libswift.so/swift.dll/whatever. */ 351 /* Attempt to load libswift.so/swift.dll/whatever. */
335 cswift_dso = DSO_load(NULL, CSWIFT_LIBNAME, NULL, 0); 352 cswift_dso = DSO_load(NULL, get_CSWIFT_LIBNAME(), NULL, 0);
336 if(cswift_dso == NULL) 353 if(cswift_dso == NULL)
337 { 354 {
338 CSWIFTerr(CSWIFT_F_CSWIFT_INIT,CSWIFT_R_NOT_LOADED); 355 CSWIFTerr(CSWIFT_F_CSWIFT_INIT,CSWIFT_R_NOT_LOADED);
@@ -377,6 +394,7 @@ err:
377 394
378static int cswift_finish(ENGINE *e) 395static int cswift_finish(ENGINE *e)
379 { 396 {
397 free_CSWIFT_LIBNAME();
380 if(cswift_dso == NULL) 398 if(cswift_dso == NULL)
381 { 399 {
382 CSWIFTerr(CSWIFT_F_CSWIFT_FINISH,CSWIFT_R_NOT_LOADED); 400 CSWIFTerr(CSWIFT_F_CSWIFT_FINISH,CSWIFT_R_NOT_LOADED);
@@ -411,8 +429,7 @@ static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
411 CSWIFTerr(CSWIFT_F_CSWIFT_CTRL,CSWIFT_R_ALREADY_LOADED); 429 CSWIFTerr(CSWIFT_F_CSWIFT_CTRL,CSWIFT_R_ALREADY_LOADED);
412 return 0; 430 return 0;
413 } 431 }
414 CSWIFT_LIBNAME = (const char *)p; 432 return set_CSWIFT_LIBNAME((const char *)p);
415 return 1;
416 default: 433 default:
417 break; 434 break;
418 } 435 }
@@ -484,7 +501,7 @@ static int cswift_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
484 goto err; 501 goto err;
485 default: 502 default:
486 { 503 {
487 char tmpbuf[20]; 504 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
488 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP,CSWIFT_R_REQUEST_FAILED); 505 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP,CSWIFT_R_REQUEST_FAILED);
489 sprintf(tmpbuf, "%ld", sw_status); 506 sprintf(tmpbuf, "%ld", sw_status);
490 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 507 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
@@ -501,7 +518,7 @@ static int cswift_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
501 if((sw_status = p_CSwift_SimpleRequest(hac, SW_CMD_MODEXP, &arg, 1, 518 if((sw_status = p_CSwift_SimpleRequest(hac, SW_CMD_MODEXP, &arg, 1,
502 &res, 1)) != SW_OK) 519 &res, 1)) != SW_OK)
503 { 520 {
504 char tmpbuf[20]; 521 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
505 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP,CSWIFT_R_REQUEST_FAILED); 522 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP,CSWIFT_R_REQUEST_FAILED);
506 sprintf(tmpbuf, "%ld", sw_status); 523 sprintf(tmpbuf, "%ld", sw_status);
507 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 524 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
@@ -591,7 +608,7 @@ static int cswift_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
591 goto err; 608 goto err;
592 default: 609 default:
593 { 610 {
594 char tmpbuf[20]; 611 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
595 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP_CRT,CSWIFT_R_REQUEST_FAILED); 612 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP_CRT,CSWIFT_R_REQUEST_FAILED);
596 sprintf(tmpbuf, "%ld", sw_status); 613 sprintf(tmpbuf, "%ld", sw_status);
597 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 614 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
@@ -608,7 +625,7 @@ static int cswift_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
608 if((sw_status = p_CSwift_SimpleRequest(hac, SW_CMD_MODEXP_CRT, &arg, 1, 625 if((sw_status = p_CSwift_SimpleRequest(hac, SW_CMD_MODEXP_CRT, &arg, 1,
609 &res, 1)) != SW_OK) 626 &res, 1)) != SW_OK)
610 { 627 {
611 char tmpbuf[20]; 628 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
612 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP_CRT,CSWIFT_R_REQUEST_FAILED); 629 CSWIFTerr(CSWIFT_F_CSWIFT_MOD_EXP_CRT,CSWIFT_R_REQUEST_FAILED);
613 sprintf(tmpbuf, "%ld", sw_status); 630 sprintf(tmpbuf, "%ld", sw_status);
614 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 631 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
@@ -723,7 +740,7 @@ static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa)
723 goto err; 740 goto err;
724 default: 741 default:
725 { 742 {
726 char tmpbuf[20]; 743 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
727 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_SIGN,CSWIFT_R_REQUEST_FAILED); 744 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_SIGN,CSWIFT_R_REQUEST_FAILED);
728 sprintf(tmpbuf, "%ld", sw_status); 745 sprintf(tmpbuf, "%ld", sw_status);
729 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 746 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
@@ -741,7 +758,7 @@ static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa)
741 &res, 1); 758 &res, 1);
742 if(sw_status != SW_OK) 759 if(sw_status != SW_OK)
743 { 760 {
744 char tmpbuf[20]; 761 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
745 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_SIGN,CSWIFT_R_REQUEST_FAILED); 762 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_SIGN,CSWIFT_R_REQUEST_FAILED);
746 sprintf(tmpbuf, "%ld", sw_status); 763 sprintf(tmpbuf, "%ld", sw_status);
747 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 764 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
@@ -835,7 +852,7 @@ static int cswift_dsa_verify(const unsigned char *dgst, int dgst_len,
835 goto err; 852 goto err;
836 default: 853 default:
837 { 854 {
838 char tmpbuf[20]; 855 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
839 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_VERIFY,CSWIFT_R_REQUEST_FAILED); 856 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_VERIFY,CSWIFT_R_REQUEST_FAILED);
840 sprintf(tmpbuf, "%ld", sw_status); 857 sprintf(tmpbuf, "%ld", sw_status);
841 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 858 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
@@ -857,7 +874,7 @@ static int cswift_dsa_verify(const unsigned char *dgst, int dgst_len,
857 &res, 1); 874 &res, 1);
858 if(sw_status != SW_OK) 875 if(sw_status != SW_OK)
859 { 876 {
860 char tmpbuf[20]; 877 char tmpbuf[DECIMAL_SIZE(sw_status)+1];
861 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_VERIFY,CSWIFT_R_REQUEST_FAILED); 878 CSWIFTerr(CSWIFT_F_CSWIFT_DSA_VERIFY,CSWIFT_R_REQUEST_FAILED);
862 sprintf(tmpbuf, "%ld", sw_status); 879 sprintf(tmpbuf, "%ld", sw_status);
863 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf); 880 ERR_add_error_data(2, "CryptoSwift error number is ",tmpbuf);
diff --git a/src/lib/libcrypto/engine/hw_ncipher.c b/src/lib/libcrypto/engine/hw_ncipher.c
index 4762a54e3d..a43d4360f2 100644
--- a/src/lib/libcrypto/engine/hw_ncipher.c
+++ b/src/lib/libcrypto/engine/hw_ncipher.c
@@ -59,9 +59,9 @@
59 59
60#include <stdio.h> 60#include <stdio.h>
61#include <string.h> 61#include <string.h>
62#include "cryptlib.h"
62#include <openssl/crypto.h> 63#include <openssl/crypto.h>
63#include <openssl/pem.h> 64#include <openssl/pem.h>
64#include "cryptlib.h"
65#include <openssl/dso.h> 65#include <openssl/dso.h>
66#include <openssl/engine.h> 66#include <openssl/engine.h>
67#include <openssl/ui.h> 67#include <openssl/ui.h>
@@ -109,11 +109,13 @@ static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa);
109static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 109static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
110 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); 110 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
111 111
112#ifndef OPENSSL_NO_DH
112/* DH stuff */ 113/* DH stuff */
113/* This function is alised to mod_exp (with the DH and mont dropped). */ 114/* This function is alised to mod_exp (with the DH and mont dropped). */
114static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, 115static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
115 const BIGNUM *a, const BIGNUM *p, 116 const BIGNUM *a, const BIGNUM *p,
116 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); 117 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
118#endif
117 119
118/* RAND stuff */ 120/* RAND stuff */
119static int hwcrhk_rand_bytes(unsigned char *buf, int num); 121static int hwcrhk_rand_bytes(unsigned char *buf, int num);
@@ -422,8 +424,24 @@ static HWCryptoHook_RSAUnloadKey_t *p_hwcrhk_RSAUnloadKey = NULL;
422static HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL; 424static HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL;
423 425
424/* Used in the DSO operations. */ 426/* Used in the DSO operations. */
425static const char def_HWCRHK_LIBNAME[] = "nfhwcrhk"; 427static const char *HWCRHK_LIBNAME = NULL;
426static const char *HWCRHK_LIBNAME = def_HWCRHK_LIBNAME; 428static void free_HWCRHK_LIBNAME(void)
429 {
430 if(HWCRHK_LIBNAME)
431 OPENSSL_free((void*)HWCRHK_LIBNAME);
432 HWCRHK_LIBNAME = NULL;
433 }
434static const char *get_HWCRHK_LIBNAME(void)
435 {
436 if(HWCRHK_LIBNAME)
437 return HWCRHK_LIBNAME;
438 return "nfhwcrhk";
439 }
440static long set_HWCRHK_LIBNAME(const char *name)
441 {
442 free_HWCRHK_LIBNAME();
443 return (((HWCRHK_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
444 }
427static const char *n_hwcrhk_Init = "HWCryptoHook_Init"; 445static const char *n_hwcrhk_Init = "HWCryptoHook_Init";
428static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish"; 446static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish";
429static const char *n_hwcrhk_ModExp = "HWCryptoHook_ModExp"; 447static const char *n_hwcrhk_ModExp = "HWCryptoHook_ModExp";
@@ -469,6 +487,7 @@ static void release_context(HWCryptoHook_ContextHandle hac)
469/* Destructor (complements the "ENGINE_ncipher()" constructor) */ 487/* Destructor (complements the "ENGINE_ncipher()" constructor) */
470static int hwcrhk_destroy(ENGINE *e) 488static int hwcrhk_destroy(ENGINE *e)
471 { 489 {
490 free_HWCRHK_LIBNAME();
472 ERR_unload_HWCRHK_strings(); 491 ERR_unload_HWCRHK_strings();
473 return 1; 492 return 1;
474 } 493 }
@@ -494,7 +513,7 @@ static int hwcrhk_init(ENGINE *e)
494 goto err; 513 goto err;
495 } 514 }
496 /* Attempt to load libnfhwcrhk.so/nfhwcrhk.dll/whatever. */ 515 /* Attempt to load libnfhwcrhk.so/nfhwcrhk.dll/whatever. */
497 hwcrhk_dso = DSO_load(NULL, HWCRHK_LIBNAME, NULL, 0); 516 hwcrhk_dso = DSO_load(NULL, get_HWCRHK_LIBNAME(), NULL, 0);
498 if(hwcrhk_dso == NULL) 517 if(hwcrhk_dso == NULL)
499 { 518 {
500 HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DSO_FAILURE); 519 HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DSO_FAILURE);
@@ -586,6 +605,7 @@ err:
586static int hwcrhk_finish(ENGINE *e) 605static int hwcrhk_finish(ENGINE *e)
587 { 606 {
588 int to_return = 1; 607 int to_return = 1;
608 free_HWCRHK_LIBNAME();
589 if(hwcrhk_dso == NULL) 609 if(hwcrhk_dso == NULL)
590 { 610 {
591 HWCRHKerr(HWCRHK_F_HWCRHK_FINISH,HWCRHK_R_NOT_LOADED); 611 HWCRHKerr(HWCRHK_F_HWCRHK_FINISH,HWCRHK_R_NOT_LOADED);
@@ -634,8 +654,7 @@ static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
634 HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,ERR_R_PASSED_NULL_PARAMETER); 654 HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,ERR_R_PASSED_NULL_PARAMETER);
635 return 0; 655 return 0;
636 } 656 }
637 HWCRHK_LIBNAME = (const char *)p; 657 return set_HWCRHK_LIBNAME((const char *)p);
638 return 1;
639 case ENGINE_CTRL_SET_LOGSTREAM: 658 case ENGINE_CTRL_SET_LOGSTREAM:
640 { 659 {
641 BIO *bio = (BIO *)p; 660 BIO *bio = (BIO *)p;
@@ -1040,6 +1059,7 @@ static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
1040 return hwcrhk_mod_exp(r, a, p, m, ctx); 1059 return hwcrhk_mod_exp(r, a, p, m, ctx);
1041 } 1060 }
1042 1061
1062#ifndef OPENSSL_NO_DH
1043/* This function is aliased to mod_exp (with the dh and mont dropped). */ 1063/* This function is aliased to mod_exp (with the dh and mont dropped). */
1044static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, 1064static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
1045 const BIGNUM *a, const BIGNUM *p, 1065 const BIGNUM *a, const BIGNUM *p,
@@ -1047,6 +1067,7 @@ static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
1047 { 1067 {
1048 return hwcrhk_mod_exp(r, a, p, m, ctx); 1068 return hwcrhk_mod_exp(r, a, p, m, ctx);
1049 } 1069 }
1070#endif
1050 1071
1051/* Random bytes are good */ 1072/* Random bytes are good */
1052static int hwcrhk_rand_bytes(unsigned char *buf, int num) 1073static int hwcrhk_rand_bytes(unsigned char *buf, int num)
diff --git a/src/lib/libcrypto/engine/hw_nuron.c b/src/lib/libcrypto/engine/hw_nuron.c
index 2672012154..130b6d8b40 100644
--- a/src/lib/libcrypto/engine/hw_nuron.c
+++ b/src/lib/libcrypto/engine/hw_nuron.c
@@ -69,8 +69,24 @@
69#define NURON_LIB_NAME "nuron engine" 69#define NURON_LIB_NAME "nuron engine"
70#include "hw_nuron_err.c" 70#include "hw_nuron_err.c"
71 71
72static const char def_NURON_LIBNAME[] = "nuronssl"; 72static const char *NURON_LIBNAME = NULL;
73static const char *NURON_LIBNAME = def_NURON_LIBNAME; 73static const char *get_NURON_LIBNAME(void)
74 {
75 if(NURON_LIBNAME)
76 return NURON_LIBNAME;
77 return "nuronssl";
78 }
79static void free_NURON_LIBNAME(void)
80 {
81 if(NURON_LIBNAME)
82 OPENSSL_free((void*)NURON_LIBNAME);
83 NURON_LIBNAME = NULL;
84 }
85static long set_NURON_LIBNAME(const char *name)
86 {
87 free_NURON_LIBNAME();
88 return (((NURON_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
89 }
74static const char *NURON_F1 = "nuron_mod_exp"; 90static const char *NURON_F1 = "nuron_mod_exp";
75 91
76/* The definitions for control commands specific to this engine */ 92/* The definitions for control commands specific to this engine */
@@ -90,6 +106,7 @@ static DSO *pvDSOHandle = NULL;
90 106
91static int nuron_destroy(ENGINE *e) 107static int nuron_destroy(ENGINE *e)
92 { 108 {
109 free_NURON_LIBNAME();
93 ERR_unload_NURON_strings(); 110 ERR_unload_NURON_strings();
94 return 1; 111 return 1;
95 } 112 }
@@ -102,7 +119,7 @@ static int nuron_init(ENGINE *e)
102 return 0; 119 return 0;
103 } 120 }
104 121
105 pvDSOHandle = DSO_load(NULL, NURON_LIBNAME, NULL, 122 pvDSOHandle = DSO_load(NULL, get_NURON_LIBNAME(), NULL,
106 DSO_FLAG_NAME_TRANSLATION_EXT_ONLY); 123 DSO_FLAG_NAME_TRANSLATION_EXT_ONLY);
107 if(!pvDSOHandle) 124 if(!pvDSOHandle)
108 { 125 {
@@ -122,6 +139,7 @@ static int nuron_init(ENGINE *e)
122 139
123static int nuron_finish(ENGINE *e) 140static int nuron_finish(ENGINE *e)
124 { 141 {
142 free_NURON_LIBNAME();
125 if(pvDSOHandle == NULL) 143 if(pvDSOHandle == NULL)
126 { 144 {
127 NURONerr(NURON_F_NURON_FINISH,NURON_R_NOT_LOADED); 145 NURONerr(NURON_F_NURON_FINISH,NURON_R_NOT_LOADED);
@@ -153,8 +171,7 @@ static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
153 NURONerr(NURON_F_NURON_CTRL,NURON_R_ALREADY_LOADED); 171 NURONerr(NURON_F_NURON_CTRL,NURON_R_ALREADY_LOADED);
154 return 0; 172 return 0;
155 } 173 }
156 NURON_LIBNAME = (const char *)p; 174 return set_NURON_LIBNAME((const char *)p);
157 return 1;
158 default: 175 default:
159 break; 176 break;
160 } 177 }
diff --git a/src/lib/libcrypto/engine/hw_ubsec.c b/src/lib/libcrypto/engine/hw_ubsec.c
index 743c06043c..63397f868c 100644
--- a/src/lib/libcrypto/engine/hw_ubsec.c
+++ b/src/lib/libcrypto/engine/hw_ubsec.c
@@ -304,7 +304,24 @@ static int max_key_len = 1024; /* ??? */
304 * symbol names to bind to. 304 * symbol names to bind to.
305 */ 305 */
306 306
307static const char *UBSEC_LIBNAME = "ubsec"; 307static const char *UBSEC_LIBNAME = NULL;
308static const char *get_UBSEC_LIBNAME(void)
309 {
310 if(UBSEC_LIBNAME)
311 return UBSEC_LIBNAME;
312 return "ubsec";
313 }
314static void free_UBSEC_LIBNAME(void)
315 {
316 if(UBSEC_LIBNAME)
317 OPENSSL_free((void*)UBSEC_LIBNAME);
318 UBSEC_LIBNAME = NULL;
319 }
320static long set_UBSEC_LIBNAME(const char *name)
321 {
322 free_UBSEC_LIBNAME();
323 return (((UBSEC_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
324 }
308static const char *UBSEC_F1 = "ubsec_bytes_to_bits"; 325static const char *UBSEC_F1 = "ubsec_bytes_to_bits";
309static const char *UBSEC_F2 = "ubsec_bits_to_bytes"; 326static const char *UBSEC_F2 = "ubsec_bits_to_bytes";
310static const char *UBSEC_F3 = "ubsec_open"; 327static const char *UBSEC_F3 = "ubsec_open";
@@ -328,6 +345,7 @@ static const char *UBSEC_F13 = "ubsec_max_key_len_ioctl";
328/* Destructor (complements the "ENGINE_ubsec()" constructor) */ 345/* Destructor (complements the "ENGINE_ubsec()" constructor) */
329static int ubsec_destroy(ENGINE *e) 346static int ubsec_destroy(ENGINE *e)
330 { 347 {
348 free_UBSEC_LIBNAME();
331 ERR_unload_UBSEC_strings(); 349 ERR_unload_UBSEC_strings();
332 return 1; 350 return 1;
333 } 351 }
@@ -364,7 +382,7 @@ static int ubsec_init(ENGINE *e)
364 /* 382 /*
365 * Attempt to load libubsec.so/ubsec.dll/whatever. 383 * Attempt to load libubsec.so/ubsec.dll/whatever.
366 */ 384 */
367 ubsec_dso = DSO_load(NULL, UBSEC_LIBNAME, NULL, 0); 385 ubsec_dso = DSO_load(NULL, get_UBSEC_LIBNAME(), NULL, 0);
368 if(ubsec_dso == NULL) 386 if(ubsec_dso == NULL)
369 { 387 {
370 UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_DSO_FAILURE); 388 UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_DSO_FAILURE);
@@ -459,6 +477,7 @@ err:
459 477
460static int ubsec_finish(ENGINE *e) 478static int ubsec_finish(ENGINE *e)
461 { 479 {
480 free_UBSEC_LIBNAME();
462 if(ubsec_dso == NULL) 481 if(ubsec_dso == NULL)
463 { 482 {
464 UBSECerr(UBSEC_F_UBSEC_FINISH, UBSEC_R_NOT_LOADED); 483 UBSECerr(UBSEC_F_UBSEC_FINISH, UBSEC_R_NOT_LOADED);
@@ -508,8 +527,7 @@ static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
508 UBSECerr(UBSEC_F_UBSEC_CTRL,UBSEC_R_ALREADY_LOADED); 527 UBSECerr(UBSEC_F_UBSEC_CTRL,UBSEC_R_ALREADY_LOADED);
509 return 0; 528 return 0;
510 } 529 }
511 UBSEC_LIBNAME = (const char *)p; 530 return set_UBSEC_LIBNAME((const char *)p);
512 return 1;
513 default: 531 default:
514 break; 532 break;
515 } 533 }
diff --git a/src/lib/libcrypto/evp/evp_test.c b/src/lib/libcrypto/evp/evp_test.c
index 1bfffb34cf..90294ef686 100644
--- a/src/lib/libcrypto/evp/evp_test.c
+++ b/src/lib/libcrypto/evp/evp_test.c
@@ -118,7 +118,7 @@ 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,
@@ -358,7 +358,7 @@ int main(int argc,char **argv)
358 p[-1] = '\0'; 358 p[-1] = '\0';
359 encdec = -1; 359 encdec = -1;
360 } else { 360 } else {
361 encdec = atoi(strsep(&p,"\n")); 361 encdec = atoi(sstrsep(&p,"\n"));
362 } 362 }
363 363
364 364
diff --git a/src/lib/libcrypto/objects/obj_dat.h b/src/lib/libcrypto/objects/obj_dat.h
index 39cfcda783..30812c8aa6 100644
--- a/src/lib/libcrypto/objects/obj_dat.h
+++ b/src/lib/libcrypto/objects/obj_dat.h
@@ -62,12 +62,12 @@
62 * [including the GNU Public Licence.] 62 * [including the GNU Public Licence.]
63 */ 63 */
64 64
65#define NUM_NID 510 65#define NUM_NID 645
66#define NUM_SN 507 66#define NUM_SN 641
67#define NUM_LN 507 67#define NUM_LN 641
68#define NUM_OBJ 481 68#define NUM_OBJ 615
69 69
70static unsigned char lvalues[3881]={ 70static unsigned char lvalues[4435]={
710x00, /* [ 0] OBJ_undef */ 710x00, /* [ 0] OBJ_undef */
720x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 720x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */
730x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ 730x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */
@@ -549,6 +549,140 @@ static unsigned char lvalues[3881]={
5490x2B,0x06,0x01,0x07,0x01,0x01,0x01, /* [3863] OBJ_id_hex_partial_message */ 5490x2B,0x06,0x01,0x07,0x01,0x01,0x01, /* [3863] OBJ_id_hex_partial_message */
5500x2B,0x06,0x01,0x07,0x01,0x01,0x02, /* [3870] OBJ_id_hex_multipart_message */ 5500x2B,0x06,0x01,0x07,0x01,0x01,0x02, /* [3870] OBJ_id_hex_multipart_message */
5510x55,0x04,0x2C, /* [3877] OBJ_generationQualifier */ 5510x55,0x04,0x2C, /* [3877] OBJ_generationQualifier */
5520x55,0x04,0x41, /* [3880] OBJ_pseudonym */
5530x67,0x2A, /* [3883] OBJ_id_set */
5540x67,0x2A,0x00, /* [3885] OBJ_set_ctype */
5550x67,0x2A,0x01, /* [3888] OBJ_set_msgExt */
5560x67,0x2A,0x03, /* [3891] OBJ_set_attr */
5570x67,0x2A,0x05, /* [3894] OBJ_set_policy */
5580x67,0x2A,0x07, /* [3897] OBJ_set_certExt */
5590x67,0x2A,0x08, /* [3900] OBJ_set_brand */
5600x67,0x2A,0x00,0x00, /* [3903] OBJ_setct_PANData */
5610x67,0x2A,0x00,0x01, /* [3907] OBJ_setct_PANToken */
5620x67,0x2A,0x00,0x02, /* [3911] OBJ_setct_PANOnly */
5630x67,0x2A,0x00,0x03, /* [3915] OBJ_setct_OIData */
5640x67,0x2A,0x00,0x04, /* [3919] OBJ_setct_PI */
5650x67,0x2A,0x00,0x05, /* [3923] OBJ_setct_PIData */
5660x67,0x2A,0x00,0x06, /* [3927] OBJ_setct_PIDataUnsigned */
5670x67,0x2A,0x00,0x07, /* [3931] OBJ_setct_HODInput */
5680x67,0x2A,0x00,0x08, /* [3935] OBJ_setct_AuthResBaggage */
5690x67,0x2A,0x00,0x09, /* [3939] OBJ_setct_AuthRevReqBaggage */
5700x67,0x2A,0x00,0x0A, /* [3943] OBJ_setct_AuthRevResBaggage */
5710x67,0x2A,0x00,0x0B, /* [3947] OBJ_setct_CapTokenSeq */
5720x67,0x2A,0x00,0x0C, /* [3951] OBJ_setct_PInitResData */
5730x67,0x2A,0x00,0x0D, /* [3955] OBJ_setct_PI_TBS */
5740x67,0x2A,0x00,0x0E, /* [3959] OBJ_setct_PResData */
5750x67,0x2A,0x00,0x10, /* [3963] OBJ_setct_AuthReqTBS */
5760x67,0x2A,0x00,0x11, /* [3967] OBJ_setct_AuthResTBS */
5770x67,0x2A,0x00,0x12, /* [3971] OBJ_setct_AuthResTBSX */
5780x67,0x2A,0x00,0x13, /* [3975] OBJ_setct_AuthTokenTBS */
5790x67,0x2A,0x00,0x14, /* [3979] OBJ_setct_CapTokenData */
5800x67,0x2A,0x00,0x15, /* [3983] OBJ_setct_CapTokenTBS */
5810x67,0x2A,0x00,0x16, /* [3987] OBJ_setct_AcqCardCodeMsg */
5820x67,0x2A,0x00,0x17, /* [3991] OBJ_setct_AuthRevReqTBS */
5830x67,0x2A,0x00,0x18, /* [3995] OBJ_setct_AuthRevResData */
5840x67,0x2A,0x00,0x19, /* [3999] OBJ_setct_AuthRevResTBS */
5850x67,0x2A,0x00,0x1A, /* [4003] OBJ_setct_CapReqTBS */
5860x67,0x2A,0x00,0x1B, /* [4007] OBJ_setct_CapReqTBSX */
5870x67,0x2A,0x00,0x1C, /* [4011] OBJ_setct_CapResData */
5880x67,0x2A,0x00,0x1D, /* [4015] OBJ_setct_CapRevReqTBS */
5890x67,0x2A,0x00,0x1E, /* [4019] OBJ_setct_CapRevReqTBSX */
5900x67,0x2A,0x00,0x1F, /* [4023] OBJ_setct_CapRevResData */
5910x67,0x2A,0x00,0x20, /* [4027] OBJ_setct_CredReqTBS */
5920x67,0x2A,0x00,0x21, /* [4031] OBJ_setct_CredReqTBSX */
5930x67,0x2A,0x00,0x22, /* [4035] OBJ_setct_CredResData */
5940x67,0x2A,0x00,0x23, /* [4039] OBJ_setct_CredRevReqTBS */
5950x67,0x2A,0x00,0x24, /* [4043] OBJ_setct_CredRevReqTBSX */
5960x67,0x2A,0x00,0x25, /* [4047] OBJ_setct_CredRevResData */
5970x67,0x2A,0x00,0x26, /* [4051] OBJ_setct_PCertReqData */
5980x67,0x2A,0x00,0x27, /* [4055] OBJ_setct_PCertResTBS */
5990x67,0x2A,0x00,0x28, /* [4059] OBJ_setct_BatchAdminReqData */
6000x67,0x2A,0x00,0x29, /* [4063] OBJ_setct_BatchAdminResData */
6010x67,0x2A,0x00,0x2A, /* [4067] OBJ_setct_CardCInitResTBS */
6020x67,0x2A,0x00,0x2B, /* [4071] OBJ_setct_MeAqCInitResTBS */
6030x67,0x2A,0x00,0x2C, /* [4075] OBJ_setct_RegFormResTBS */
6040x67,0x2A,0x00,0x2D, /* [4079] OBJ_setct_CertReqData */
6050x67,0x2A,0x00,0x2E, /* [4083] OBJ_setct_CertReqTBS */
6060x67,0x2A,0x00,0x2F, /* [4087] OBJ_setct_CertResData */
6070x67,0x2A,0x00,0x30, /* [4091] OBJ_setct_CertInqReqTBS */
6080x67,0x2A,0x00,0x31, /* [4095] OBJ_setct_ErrorTBS */
6090x67,0x2A,0x00,0x32, /* [4099] OBJ_setct_PIDualSignedTBE */
6100x67,0x2A,0x00,0x33, /* [4103] OBJ_setct_PIUnsignedTBE */
6110x67,0x2A,0x00,0x34, /* [4107] OBJ_setct_AuthReqTBE */
6120x67,0x2A,0x00,0x35, /* [4111] OBJ_setct_AuthResTBE */
6130x67,0x2A,0x00,0x36, /* [4115] OBJ_setct_AuthResTBEX */
6140x67,0x2A,0x00,0x37, /* [4119] OBJ_setct_AuthTokenTBE */
6150x67,0x2A,0x00,0x38, /* [4123] OBJ_setct_CapTokenTBE */
6160x67,0x2A,0x00,0x39, /* [4127] OBJ_setct_CapTokenTBEX */
6170x67,0x2A,0x00,0x3A, /* [4131] OBJ_setct_AcqCardCodeMsgTBE */
6180x67,0x2A,0x00,0x3B, /* [4135] OBJ_setct_AuthRevReqTBE */
6190x67,0x2A,0x00,0x3C, /* [4139] OBJ_setct_AuthRevResTBE */
6200x67,0x2A,0x00,0x3D, /* [4143] OBJ_setct_AuthRevResTBEB */
6210x67,0x2A,0x00,0x3E, /* [4147] OBJ_setct_CapReqTBE */
6220x67,0x2A,0x00,0x3F, /* [4151] OBJ_setct_CapReqTBEX */
6230x67,0x2A,0x00,0x40, /* [4155] OBJ_setct_CapResTBE */
6240x67,0x2A,0x00,0x41, /* [4159] OBJ_setct_CapRevReqTBE */
6250x67,0x2A,0x00,0x42, /* [4163] OBJ_setct_CapRevReqTBEX */
6260x67,0x2A,0x00,0x43, /* [4167] OBJ_setct_CapRevResTBE */
6270x67,0x2A,0x00,0x44, /* [4171] OBJ_setct_CredReqTBE */
6280x67,0x2A,0x00,0x45, /* [4175] OBJ_setct_CredReqTBEX */
6290x67,0x2A,0x00,0x46, /* [4179] OBJ_setct_CredResTBE */
6300x67,0x2A,0x00,0x47, /* [4183] OBJ_setct_CredRevReqTBE */
6310x67,0x2A,0x00,0x48, /* [4187] OBJ_setct_CredRevReqTBEX */
6320x67,0x2A,0x00,0x49, /* [4191] OBJ_setct_CredRevResTBE */
6330x67,0x2A,0x00,0x4A, /* [4195] OBJ_setct_BatchAdminReqTBE */
6340x67,0x2A,0x00,0x4B, /* [4199] OBJ_setct_BatchAdminResTBE */
6350x67,0x2A,0x00,0x4C, /* [4203] OBJ_setct_RegFormReqTBE */
6360x67,0x2A,0x00,0x4D, /* [4207] OBJ_setct_CertReqTBE */
6370x67,0x2A,0x00,0x4E, /* [4211] OBJ_setct_CertReqTBEX */
6380x67,0x2A,0x00,0x4F, /* [4215] OBJ_setct_CertResTBE */
6390x67,0x2A,0x00,0x50, /* [4219] OBJ_setct_CRLNotificationTBS */
6400x67,0x2A,0x00,0x51, /* [4223] OBJ_setct_CRLNotificationResTBS */
6410x67,0x2A,0x00,0x52, /* [4227] OBJ_setct_BCIDistributionTBS */
6420x67,0x2A,0x01,0x01, /* [4231] OBJ_setext_genCrypt */
6430x67,0x2A,0x01,0x03, /* [4235] OBJ_setext_miAuth */
6440x67,0x2A,0x01,0x04, /* [4239] OBJ_setext_pinSecure */
6450x67,0x2A,0x01,0x05, /* [4243] OBJ_setext_pinAny */
6460x67,0x2A,0x01,0x07, /* [4247] OBJ_setext_track2 */
6470x67,0x2A,0x01,0x08, /* [4251] OBJ_setext_cv */
6480x67,0x2A,0x05,0x00, /* [4255] OBJ_set_policy_root */
6490x67,0x2A,0x07,0x00, /* [4259] OBJ_setCext_hashedRoot */
6500x67,0x2A,0x07,0x01, /* [4263] OBJ_setCext_certType */
6510x67,0x2A,0x07,0x02, /* [4267] OBJ_setCext_merchData */
6520x67,0x2A,0x07,0x03, /* [4271] OBJ_setCext_cCertRequired */
6530x67,0x2A,0x07,0x04, /* [4275] OBJ_setCext_tunneling */
6540x67,0x2A,0x07,0x05, /* [4279] OBJ_setCext_setExt */
6550x67,0x2A,0x07,0x06, /* [4283] OBJ_setCext_setQualf */
6560x67,0x2A,0x07,0x07, /* [4287] OBJ_setCext_PGWYcapabilities */
6570x67,0x2A,0x07,0x08, /* [4291] OBJ_setCext_TokenIdentifier */
6580x67,0x2A,0x07,0x09, /* [4295] OBJ_setCext_Track2Data */
6590x67,0x2A,0x07,0x0A, /* [4299] OBJ_setCext_TokenType */
6600x67,0x2A,0x07,0x0B, /* [4303] OBJ_setCext_IssuerCapabilities */
6610x67,0x2A,0x03,0x00, /* [4307] OBJ_setAttr_Cert */
6620x67,0x2A,0x03,0x01, /* [4311] OBJ_setAttr_PGWYcap */
6630x67,0x2A,0x03,0x02, /* [4315] OBJ_setAttr_TokenType */
6640x67,0x2A,0x03,0x03, /* [4319] OBJ_setAttr_IssCap */
6650x67,0x2A,0x03,0x00,0x00, /* [4323] OBJ_set_rootKeyThumb */
6660x67,0x2A,0x03,0x00,0x01, /* [4328] OBJ_set_addPolicy */
6670x67,0x2A,0x03,0x02,0x01, /* [4333] OBJ_setAttr_Token_EMV */
6680x67,0x2A,0x03,0x02,0x02, /* [4338] OBJ_setAttr_Token_B0Prime */
6690x67,0x2A,0x03,0x03,0x03, /* [4343] OBJ_setAttr_IssCap_CVM */
6700x67,0x2A,0x03,0x03,0x04, /* [4348] OBJ_setAttr_IssCap_T2 */
6710x67,0x2A,0x03,0x03,0x05, /* [4353] OBJ_setAttr_IssCap_Sig */
6720x67,0x2A,0x03,0x03,0x03,0x01, /* [4358] OBJ_setAttr_GenCryptgrm */
6730x67,0x2A,0x03,0x03,0x04,0x01, /* [4364] OBJ_setAttr_T2Enc */
6740x67,0x2A,0x03,0x03,0x04,0x02, /* [4370] OBJ_setAttr_T2cleartxt */
6750x67,0x2A,0x03,0x03,0x05,0x01, /* [4376] OBJ_setAttr_TokICCsig */
6760x67,0x2A,0x03,0x03,0x05,0x02, /* [4382] OBJ_setAttr_SecDevSig */
6770x67,0x2A,0x08,0x01, /* [4388] OBJ_set_brand_IATA_ATA */
6780x67,0x2A,0x08,0x1E, /* [4392] OBJ_set_brand_Diners */
6790x67,0x2A,0x08,0x22, /* [4396] OBJ_set_brand_AmericanExpress */
6800x67,0x2A,0x08,0x23, /* [4400] OBJ_set_brand_JCB */
6810x67,0x2A,0x08,0x04, /* [4404] OBJ_set_brand_Visa */
6820x67,0x2A,0x08,0x05, /* [4408] OBJ_set_brand_MasterCard */
6830x67,0x2A,0x08,0xAE,0x7B, /* [4412] OBJ_set_brand_Novus */
6840x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A, /* [4417] OBJ_des_cdmf */
6850x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4425] OBJ_rsaOAEPEncryptionSET */
552}; 686};
553 687
554static ASN1_OBJECT nid_objs[NUM_NID]={ 688static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -1334,6 +1468,257 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
1334 NID_id_hex_multipart_message,7,&(lvalues[3870]),0}, 1468 NID_id_hex_multipart_message,7,&(lvalues[3870]),0},
1335{"generationQualifier","generationQualifier",NID_generationQualifier, 1469{"generationQualifier","generationQualifier",NID_generationQualifier,
1336 3,&(lvalues[3877]),0}, 1470 3,&(lvalues[3877]),0},
1471{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3880]),0},
1472{NULL,NULL,NID_undef,0,NULL},
1473{"id-set","Secure Electronic Transactions",NID_id_set,2,
1474 &(lvalues[3883]),0},
1475{"set-ctype","content types",NID_set_ctype,3,&(lvalues[3885]),0},
1476{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[3888]),0},
1477{"set-attr","set-attr",NID_set_attr,3,&(lvalues[3891]),0},
1478{"set-policy","set-policy",NID_set_policy,3,&(lvalues[3894]),0},
1479{"set-certExt","certificate extensions",NID_set_certExt,3,
1480 &(lvalues[3897]),0},
1481{"set-brand","set-brand",NID_set_brand,3,&(lvalues[3900]),0},
1482{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[3903]),0},
1483{"setct-PANToken","setct-PANToken",NID_setct_PANToken,4,
1484 &(lvalues[3907]),0},
1485{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[3911]),0},
1486{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[3915]),0},
1487{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[3919]),0},
1488{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[3923]),0},
1489{"setct-PIDataUnsigned","setct-PIDataUnsigned",
1490 NID_setct_PIDataUnsigned,4,&(lvalues[3927]),0},
1491{"setct-HODInput","setct-HODInput",NID_setct_HODInput,4,
1492 &(lvalues[3931]),0},
1493{"setct-AuthResBaggage","setct-AuthResBaggage",
1494 NID_setct_AuthResBaggage,4,&(lvalues[3935]),0},
1495{"setct-AuthRevReqBaggage","setct-AuthRevReqBaggage",
1496 NID_setct_AuthRevReqBaggage,4,&(lvalues[3939]),0},
1497{"setct-AuthRevResBaggage","setct-AuthRevResBaggage",
1498 NID_setct_AuthRevResBaggage,4,&(lvalues[3943]),0},
1499{"setct-CapTokenSeq","setct-CapTokenSeq",NID_setct_CapTokenSeq,4,
1500 &(lvalues[3947]),0},
1501{"setct-PInitResData","setct-PInitResData",NID_setct_PInitResData,4,
1502 &(lvalues[3951]),0},
1503{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[3955]),0},
1504{"setct-PResData","setct-PResData",NID_setct_PResData,4,
1505 &(lvalues[3959]),0},
1506{"setct-AuthReqTBS","setct-AuthReqTBS",NID_setct_AuthReqTBS,4,
1507 &(lvalues[3963]),0},
1508{"setct-AuthResTBS","setct-AuthResTBS",NID_setct_AuthResTBS,4,
1509 &(lvalues[3967]),0},
1510{"setct-AuthResTBSX","setct-AuthResTBSX",NID_setct_AuthResTBSX,4,
1511 &(lvalues[3971]),0},
1512{"setct-AuthTokenTBS","setct-AuthTokenTBS",NID_setct_AuthTokenTBS,4,
1513 &(lvalues[3975]),0},
1514{"setct-CapTokenData","setct-CapTokenData",NID_setct_CapTokenData,4,
1515 &(lvalues[3979]),0},
1516{"setct-CapTokenTBS","setct-CapTokenTBS",NID_setct_CapTokenTBS,4,
1517 &(lvalues[3983]),0},
1518{"setct-AcqCardCodeMsg","setct-AcqCardCodeMsg",
1519 NID_setct_AcqCardCodeMsg,4,&(lvalues[3987]),0},
1520{"setct-AuthRevReqTBS","setct-AuthRevReqTBS",NID_setct_AuthRevReqTBS,
1521 4,&(lvalues[3991]),0},
1522{"setct-AuthRevResData","setct-AuthRevResData",
1523 NID_setct_AuthRevResData,4,&(lvalues[3995]),0},
1524{"setct-AuthRevResTBS","setct-AuthRevResTBS",NID_setct_AuthRevResTBS,
1525 4,&(lvalues[3999]),0},
1526{"setct-CapReqTBS","setct-CapReqTBS",NID_setct_CapReqTBS,4,
1527 &(lvalues[4003]),0},
1528{"setct-CapReqTBSX","setct-CapReqTBSX",NID_setct_CapReqTBSX,4,
1529 &(lvalues[4007]),0},
1530{"setct-CapResData","setct-CapResData",NID_setct_CapResData,4,
1531 &(lvalues[4011]),0},
1532{"setct-CapRevReqTBS","setct-CapRevReqTBS",NID_setct_CapRevReqTBS,4,
1533 &(lvalues[4015]),0},
1534{"setct-CapRevReqTBSX","setct-CapRevReqTBSX",NID_setct_CapRevReqTBSX,
1535 4,&(lvalues[4019]),0},
1536{"setct-CapRevResData","setct-CapRevResData",NID_setct_CapRevResData,
1537 4,&(lvalues[4023]),0},
1538{"setct-CredReqTBS","setct-CredReqTBS",NID_setct_CredReqTBS,4,
1539 &(lvalues[4027]),0},
1540{"setct-CredReqTBSX","setct-CredReqTBSX",NID_setct_CredReqTBSX,4,
1541 &(lvalues[4031]),0},
1542{"setct-CredResData","setct-CredResData",NID_setct_CredResData,4,
1543 &(lvalues[4035]),0},
1544{"setct-CredRevReqTBS","setct-CredRevReqTBS",NID_setct_CredRevReqTBS,
1545 4,&(lvalues[4039]),0},
1546{"setct-CredRevReqTBSX","setct-CredRevReqTBSX",
1547 NID_setct_CredRevReqTBSX,4,&(lvalues[4043]),0},
1548{"setct-CredRevResData","setct-CredRevResData",
1549 NID_setct_CredRevResData,4,&(lvalues[4047]),0},
1550{"setct-PCertReqData","setct-PCertReqData",NID_setct_PCertReqData,4,
1551 &(lvalues[4051]),0},
1552{"setct-PCertResTBS","setct-PCertResTBS",NID_setct_PCertResTBS,4,
1553 &(lvalues[4055]),0},
1554{"setct-BatchAdminReqData","setct-BatchAdminReqData",
1555 NID_setct_BatchAdminReqData,4,&(lvalues[4059]),0},
1556{"setct-BatchAdminResData","setct-BatchAdminResData",
1557 NID_setct_BatchAdminResData,4,&(lvalues[4063]),0},
1558{"setct-CardCInitResTBS","setct-CardCInitResTBS",
1559 NID_setct_CardCInitResTBS,4,&(lvalues[4067]),0},
1560{"setct-MeAqCInitResTBS","setct-MeAqCInitResTBS",
1561 NID_setct_MeAqCInitResTBS,4,&(lvalues[4071]),0},
1562{"setct-RegFormResTBS","setct-RegFormResTBS",NID_setct_RegFormResTBS,
1563 4,&(lvalues[4075]),0},
1564{"setct-CertReqData","setct-CertReqData",NID_setct_CertReqData,4,
1565 &(lvalues[4079]),0},
1566{"setct-CertReqTBS","setct-CertReqTBS",NID_setct_CertReqTBS,4,
1567 &(lvalues[4083]),0},
1568{"setct-CertResData","setct-CertResData",NID_setct_CertResData,4,
1569 &(lvalues[4087]),0},
1570{"setct-CertInqReqTBS","setct-CertInqReqTBS",NID_setct_CertInqReqTBS,
1571 4,&(lvalues[4091]),0},
1572{"setct-ErrorTBS","setct-ErrorTBS",NID_setct_ErrorTBS,4,
1573 &(lvalues[4095]),0},
1574{"setct-PIDualSignedTBE","setct-PIDualSignedTBE",
1575 NID_setct_PIDualSignedTBE,4,&(lvalues[4099]),0},
1576{"setct-PIUnsignedTBE","setct-PIUnsignedTBE",NID_setct_PIUnsignedTBE,
1577 4,&(lvalues[4103]),0},
1578{"setct-AuthReqTBE","setct-AuthReqTBE",NID_setct_AuthReqTBE,4,
1579 &(lvalues[4107]),0},
1580{"setct-AuthResTBE","setct-AuthResTBE",NID_setct_AuthResTBE,4,
1581 &(lvalues[4111]),0},
1582{"setct-AuthResTBEX","setct-AuthResTBEX",NID_setct_AuthResTBEX,4,
1583 &(lvalues[4115]),0},
1584{"setct-AuthTokenTBE","setct-AuthTokenTBE",NID_setct_AuthTokenTBE,4,
1585 &(lvalues[4119]),0},
1586{"setct-CapTokenTBE","setct-CapTokenTBE",NID_setct_CapTokenTBE,4,
1587 &(lvalues[4123]),0},
1588{"setct-CapTokenTBEX","setct-CapTokenTBEX",NID_setct_CapTokenTBEX,4,
1589 &(lvalues[4127]),0},
1590{"setct-AcqCardCodeMsgTBE","setct-AcqCardCodeMsgTBE",
1591 NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4131]),0},
1592{"setct-AuthRevReqTBE","setct-AuthRevReqTBE",NID_setct_AuthRevReqTBE,
1593 4,&(lvalues[4135]),0},
1594{"setct-AuthRevResTBE","setct-AuthRevResTBE",NID_setct_AuthRevResTBE,
1595 4,&(lvalues[4139]),0},
1596{"setct-AuthRevResTBEB","setct-AuthRevResTBEB",
1597 NID_setct_AuthRevResTBEB,4,&(lvalues[4143]),0},
1598{"setct-CapReqTBE","setct-CapReqTBE",NID_setct_CapReqTBE,4,
1599 &(lvalues[4147]),0},
1600{"setct-CapReqTBEX","setct-CapReqTBEX",NID_setct_CapReqTBEX,4,
1601 &(lvalues[4151]),0},
1602{"setct-CapResTBE","setct-CapResTBE",NID_setct_CapResTBE,4,
1603 &(lvalues[4155]),0},
1604{"setct-CapRevReqTBE","setct-CapRevReqTBE",NID_setct_CapRevReqTBE,4,
1605 &(lvalues[4159]),0},
1606{"setct-CapRevReqTBEX","setct-CapRevReqTBEX",NID_setct_CapRevReqTBEX,
1607 4,&(lvalues[4163]),0},
1608{"setct-CapRevResTBE","setct-CapRevResTBE",NID_setct_CapRevResTBE,4,
1609 &(lvalues[4167]),0},
1610{"setct-CredReqTBE","setct-CredReqTBE",NID_setct_CredReqTBE,4,
1611 &(lvalues[4171]),0},
1612{"setct-CredReqTBEX","setct-CredReqTBEX",NID_setct_CredReqTBEX,4,
1613 &(lvalues[4175]),0},
1614{"setct-CredResTBE","setct-CredResTBE",NID_setct_CredResTBE,4,
1615 &(lvalues[4179]),0},
1616{"setct-CredRevReqTBE","setct-CredRevReqTBE",NID_setct_CredRevReqTBE,
1617 4,&(lvalues[4183]),0},
1618{"setct-CredRevReqTBEX","setct-CredRevReqTBEX",
1619 NID_setct_CredRevReqTBEX,4,&(lvalues[4187]),0},
1620{"setct-CredRevResTBE","setct-CredRevResTBE",NID_setct_CredRevResTBE,
1621 4,&(lvalues[4191]),0},
1622{"setct-BatchAdminReqTBE","setct-BatchAdminReqTBE",
1623 NID_setct_BatchAdminReqTBE,4,&(lvalues[4195]),0},
1624{"setct-BatchAdminResTBE","setct-BatchAdminResTBE",
1625 NID_setct_BatchAdminResTBE,4,&(lvalues[4199]),0},
1626{"setct-RegFormReqTBE","setct-RegFormReqTBE",NID_setct_RegFormReqTBE,
1627 4,&(lvalues[4203]),0},
1628{"setct-CertReqTBE","setct-CertReqTBE",NID_setct_CertReqTBE,4,
1629 &(lvalues[4207]),0},
1630{"setct-CertReqTBEX","setct-CertReqTBEX",NID_setct_CertReqTBEX,4,
1631 &(lvalues[4211]),0},
1632{"setct-CertResTBE","setct-CertResTBE",NID_setct_CertResTBE,4,
1633 &(lvalues[4215]),0},
1634{"setct-CRLNotificationTBS","setct-CRLNotificationTBS",
1635 NID_setct_CRLNotificationTBS,4,&(lvalues[4219]),0},
1636{"setct-CRLNotificationResTBS","setct-CRLNotificationResTBS",
1637 NID_setct_CRLNotificationResTBS,4,&(lvalues[4223]),0},
1638{"setct-BCIDistributionTBS","setct-BCIDistributionTBS",
1639 NID_setct_BCIDistributionTBS,4,&(lvalues[4227]),0},
1640{"setext-genCrypt","generic cryptogram",NID_setext_genCrypt,4,
1641 &(lvalues[4231]),0},
1642{"setext-miAuth","merchant initiated auth",NID_setext_miAuth,4,
1643 &(lvalues[4235]),0},
1644{"setext-pinSecure","setext-pinSecure",NID_setext_pinSecure,4,
1645 &(lvalues[4239]),0},
1646{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4243]),0},
1647{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4247]),0},
1648{"setext-cv","additional verification",NID_setext_cv,4,
1649 &(lvalues[4251]),0},
1650{"set-policy-root","set-policy-root",NID_set_policy_root,4,
1651 &(lvalues[4255]),0},
1652{"setCext-hashedRoot","setCext-hashedRoot",NID_setCext_hashedRoot,4,
1653 &(lvalues[4259]),0},
1654{"setCext-certType","setCext-certType",NID_setCext_certType,4,
1655 &(lvalues[4263]),0},
1656{"setCext-merchData","setCext-merchData",NID_setCext_merchData,4,
1657 &(lvalues[4267]),0},
1658{"setCext-cCertRequired","setCext-cCertRequired",
1659 NID_setCext_cCertRequired,4,&(lvalues[4271]),0},
1660{"setCext-tunneling","setCext-tunneling",NID_setCext_tunneling,4,
1661 &(lvalues[4275]),0},
1662{"setCext-setExt","setCext-setExt",NID_setCext_setExt,4,
1663 &(lvalues[4279]),0},
1664{"setCext-setQualf","setCext-setQualf",NID_setCext_setQualf,4,
1665 &(lvalues[4283]),0},
1666{"setCext-PGWYcapabilities","setCext-PGWYcapabilities",
1667 NID_setCext_PGWYcapabilities,4,&(lvalues[4287]),0},
1668{"setCext-TokenIdentifier","setCext-TokenIdentifier",
1669 NID_setCext_TokenIdentifier,4,&(lvalues[4291]),0},
1670{"setCext-Track2Data","setCext-Track2Data",NID_setCext_Track2Data,4,
1671 &(lvalues[4295]),0},
1672{"setCext-TokenType","setCext-TokenType",NID_setCext_TokenType,4,
1673 &(lvalues[4299]),0},
1674{"setCext-IssuerCapabilities","setCext-IssuerCapabilities",
1675 NID_setCext_IssuerCapabilities,4,&(lvalues[4303]),0},
1676{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4307]),0},
1677{"setAttr-PGWYcap","payment gateway capabilities",NID_setAttr_PGWYcap,
1678 4,&(lvalues[4311]),0},
1679{"setAttr-TokenType","setAttr-TokenType",NID_setAttr_TokenType,4,
1680 &(lvalues[4315]),0},
1681{"setAttr-IssCap","issuer capabilities",NID_setAttr_IssCap,4,
1682 &(lvalues[4319]),0},
1683{"set-rootKeyThumb","set-rootKeyThumb",NID_set_rootKeyThumb,5,
1684 &(lvalues[4323]),0},
1685{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4328]),0},
1686{"setAttr-Token-EMV","setAttr-Token-EMV",NID_setAttr_Token_EMV,5,
1687 &(lvalues[4333]),0},
1688{"setAttr-Token-B0Prime","setAttr-Token-B0Prime",
1689 NID_setAttr_Token_B0Prime,5,&(lvalues[4338]),0},
1690{"setAttr-IssCap-CVM","setAttr-IssCap-CVM",NID_setAttr_IssCap_CVM,5,
1691 &(lvalues[4343]),0},
1692{"setAttr-IssCap-T2","setAttr-IssCap-T2",NID_setAttr_IssCap_T2,5,
1693 &(lvalues[4348]),0},
1694{"setAttr-IssCap-Sig","setAttr-IssCap-Sig",NID_setAttr_IssCap_Sig,5,
1695 &(lvalues[4353]),0},
1696{"setAttr-GenCryptgrm","generate cryptogram",NID_setAttr_GenCryptgrm,
1697 6,&(lvalues[4358]),0},
1698{"setAttr-T2Enc","encrypted track 2",NID_setAttr_T2Enc,6,
1699 &(lvalues[4364]),0},
1700{"setAttr-T2cleartxt","cleartext track 2",NID_setAttr_T2cleartxt,6,
1701 &(lvalues[4370]),0},
1702{"setAttr-TokICCsig","ICC or token signature",NID_setAttr_TokICCsig,6,
1703 &(lvalues[4376]),0},
1704{"setAttr-SecDevSig","secure device signature",NID_setAttr_SecDevSig,
1705 6,&(lvalues[4382]),0},
1706{"set-brand-IATA-ATA","set-brand-IATA-ATA",NID_set_brand_IATA_ATA,4,
1707 &(lvalues[4388]),0},
1708{"set-brand-Diners","set-brand-Diners",NID_set_brand_Diners,4,
1709 &(lvalues[4392]),0},
1710{"set-brand-AmericanExpress","set-brand-AmericanExpress",
1711 NID_set_brand_AmericanExpress,4,&(lvalues[4396]),0},
1712{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4400]),0},
1713{"set-brand-Visa","set-brand-Visa",NID_set_brand_Visa,4,
1714 &(lvalues[4404]),0},
1715{"set-brand-MasterCard","set-brand-MasterCard",
1716 NID_set_brand_MasterCard,4,&(lvalues[4408]),0},
1717{"set-brand-Novus","set-brand-Novus",NID_set_brand_Novus,5,
1718 &(lvalues[4412]),0},
1719{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4417]),0},
1720{"rsaOAEPEncryptionSET","rsaOAEPEncryptionSET",
1721 NID_rsaOAEPEncryptionSET,9,&(lvalues[4425]),0},
1337}; 1722};
1338 1723
1339static ASN1_OBJECT *sn_objs[NUM_SN]={ 1724static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -1366,6 +1751,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1366&(nid_objs[367]),/* "CrlID" */ 1751&(nid_objs[367]),/* "CrlID" */
1367&(nid_objs[391]),/* "DC" */ 1752&(nid_objs[391]),/* "DC" */
1368&(nid_objs[31]),/* "DES-CBC" */ 1753&(nid_objs[31]),/* "DES-CBC" */
1754&(nid_objs[643]),/* "DES-CDMF" */
1369&(nid_objs[30]),/* "DES-CFB" */ 1755&(nid_objs[30]),/* "DES-CFB" */
1370&(nid_objs[29]),/* "DES-ECB" */ 1756&(nid_objs[29]),/* "DES-ECB" */
1371&(nid_objs[32]),/* "DES-EDE" */ 1757&(nid_objs[32]),/* "DES-EDE" */
@@ -1642,6 +2028,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1642&(nid_objs[314]),/* "id-regInfo" */ 2028&(nid_objs[314]),/* "id-regInfo" */
1643&(nid_objs[322]),/* "id-regInfo-certReq" */ 2029&(nid_objs[322]),/* "id-regInfo-certReq" */
1644&(nid_objs[321]),/* "id-regInfo-utf8Pairs" */ 2030&(nid_objs[321]),/* "id-regInfo-utf8Pairs" */
2031&(nid_objs[512]),/* "id-set" */
1645&(nid_objs[191]),/* "id-smime-aa" */ 2032&(nid_objs[191]),/* "id-smime-aa" */
1646&(nid_objs[215]),/* "id-smime-aa-contentHint" */ 2033&(nid_objs[215]),/* "id-smime-aa-contentHint" */
1647&(nid_objs[218]),/* "id-smime-aa-contentIdentifier" */ 2034&(nid_objs[218]),/* "id-smime-aa-contentIdentifier" */
@@ -1798,6 +2185,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1798&(nid_objs[415]),/* "prime256v1" */ 2185&(nid_objs[415]),/* "prime256v1" */
1799&(nid_objs[385]),/* "private" */ 2186&(nid_objs[385]),/* "private" */
1800&(nid_objs[84]),/* "privateKeyUsagePeriod" */ 2187&(nid_objs[84]),/* "privateKeyUsagePeriod" */
2188&(nid_objs[510]),/* "pseudonym" */
1801&(nid_objs[435]),/* "pss" */ 2189&(nid_objs[435]),/* "pss" */
1802&(nid_objs[286]),/* "qcStatements" */ 2190&(nid_objs[286]),/* "qcStatements" */
1803&(nid_objs[457]),/* "qualityLabelledData" */ 2191&(nid_objs[457]),/* "qualityLabelledData" */
@@ -1806,6 +2194,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1806&(nid_objs[448]),/* "room" */ 2194&(nid_objs[448]),/* "room" */
1807&(nid_objs[463]),/* "roomNumber" */ 2195&(nid_objs[463]),/* "roomNumber" */
1808&(nid_objs[ 6]),/* "rsaEncryption" */ 2196&(nid_objs[ 6]),/* "rsaEncryption" */
2197&(nid_objs[644]),/* "rsaOAEPEncryptionSET" */
1809&(nid_objs[377]),/* "rsaSignature" */ 2198&(nid_objs[377]),/* "rsaSignature" */
1810&(nid_objs[ 1]),/* "rsadsi" */ 2199&(nid_objs[ 1]),/* "rsadsi" */
1811&(nid_objs[482]),/* "sOARecord" */ 2200&(nid_objs[482]),/* "sOARecord" */
@@ -1821,6 +2210,136 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1821&(nid_objs[105]),/* "serialNumber" */ 2210&(nid_objs[105]),/* "serialNumber" */
1822&(nid_objs[129]),/* "serverAuth" */ 2211&(nid_objs[129]),/* "serverAuth" */
1823&(nid_objs[371]),/* "serviceLocator" */ 2212&(nid_objs[371]),/* "serviceLocator" */
2213&(nid_objs[625]),/* "set-addPolicy" */
2214&(nid_objs[515]),/* "set-attr" */
2215&(nid_objs[518]),/* "set-brand" */
2216&(nid_objs[638]),/* "set-brand-AmericanExpress" */
2217&(nid_objs[637]),/* "set-brand-Diners" */
2218&(nid_objs[636]),/* "set-brand-IATA-ATA" */
2219&(nid_objs[639]),/* "set-brand-JCB" */
2220&(nid_objs[641]),/* "set-brand-MasterCard" */
2221&(nid_objs[642]),/* "set-brand-Novus" */
2222&(nid_objs[640]),/* "set-brand-Visa" */
2223&(nid_objs[517]),/* "set-certExt" */
2224&(nid_objs[513]),/* "set-ctype" */
2225&(nid_objs[514]),/* "set-msgExt" */
2226&(nid_objs[516]),/* "set-policy" */
2227&(nid_objs[607]),/* "set-policy-root" */
2228&(nid_objs[624]),/* "set-rootKeyThumb" */
2229&(nid_objs[620]),/* "setAttr-Cert" */
2230&(nid_objs[631]),/* "setAttr-GenCryptgrm" */
2231&(nid_objs[623]),/* "setAttr-IssCap" */
2232&(nid_objs[628]),/* "setAttr-IssCap-CVM" */
2233&(nid_objs[630]),/* "setAttr-IssCap-Sig" */
2234&(nid_objs[629]),/* "setAttr-IssCap-T2" */
2235&(nid_objs[621]),/* "setAttr-PGWYcap" */
2236&(nid_objs[635]),/* "setAttr-SecDevSig" */
2237&(nid_objs[632]),/* "setAttr-T2Enc" */
2238&(nid_objs[633]),/* "setAttr-T2cleartxt" */
2239&(nid_objs[634]),/* "setAttr-TokICCsig" */
2240&(nid_objs[627]),/* "setAttr-Token-B0Prime" */
2241&(nid_objs[626]),/* "setAttr-Token-EMV" */
2242&(nid_objs[622]),/* "setAttr-TokenType" */
2243&(nid_objs[619]),/* "setCext-IssuerCapabilities" */
2244&(nid_objs[615]),/* "setCext-PGWYcapabilities" */
2245&(nid_objs[616]),/* "setCext-TokenIdentifier" */
2246&(nid_objs[618]),/* "setCext-TokenType" */
2247&(nid_objs[617]),/* "setCext-Track2Data" */
2248&(nid_objs[611]),/* "setCext-cCertRequired" */
2249&(nid_objs[609]),/* "setCext-certType" */
2250&(nid_objs[608]),/* "setCext-hashedRoot" */
2251&(nid_objs[610]),/* "setCext-merchData" */
2252&(nid_objs[613]),/* "setCext-setExt" */
2253&(nid_objs[614]),/* "setCext-setQualf" */
2254&(nid_objs[612]),/* "setCext-tunneling" */
2255&(nid_objs[540]),/* "setct-AcqCardCodeMsg" */
2256&(nid_objs[576]),/* "setct-AcqCardCodeMsgTBE" */
2257&(nid_objs[570]),/* "setct-AuthReqTBE" */
2258&(nid_objs[534]),/* "setct-AuthReqTBS" */
2259&(nid_objs[527]),/* "setct-AuthResBaggage" */
2260&(nid_objs[571]),/* "setct-AuthResTBE" */
2261&(nid_objs[572]),/* "setct-AuthResTBEX" */
2262&(nid_objs[535]),/* "setct-AuthResTBS" */
2263&(nid_objs[536]),/* "setct-AuthResTBSX" */
2264&(nid_objs[528]),/* "setct-AuthRevReqBaggage" */
2265&(nid_objs[577]),/* "setct-AuthRevReqTBE" */
2266&(nid_objs[541]),/* "setct-AuthRevReqTBS" */
2267&(nid_objs[529]),/* "setct-AuthRevResBaggage" */
2268&(nid_objs[542]),/* "setct-AuthRevResData" */
2269&(nid_objs[578]),/* "setct-AuthRevResTBE" */
2270&(nid_objs[579]),/* "setct-AuthRevResTBEB" */
2271&(nid_objs[543]),/* "setct-AuthRevResTBS" */
2272&(nid_objs[573]),/* "setct-AuthTokenTBE" */
2273&(nid_objs[537]),/* "setct-AuthTokenTBS" */
2274&(nid_objs[600]),/* "setct-BCIDistributionTBS" */
2275&(nid_objs[558]),/* "setct-BatchAdminReqData" */
2276&(nid_objs[592]),/* "setct-BatchAdminReqTBE" */
2277&(nid_objs[559]),/* "setct-BatchAdminResData" */
2278&(nid_objs[593]),/* "setct-BatchAdminResTBE" */
2279&(nid_objs[599]),/* "setct-CRLNotificationResTBS" */
2280&(nid_objs[598]),/* "setct-CRLNotificationTBS" */
2281&(nid_objs[580]),/* "setct-CapReqTBE" */
2282&(nid_objs[581]),/* "setct-CapReqTBEX" */
2283&(nid_objs[544]),/* "setct-CapReqTBS" */
2284&(nid_objs[545]),/* "setct-CapReqTBSX" */
2285&(nid_objs[546]),/* "setct-CapResData" */
2286&(nid_objs[582]),/* "setct-CapResTBE" */
2287&(nid_objs[583]),/* "setct-CapRevReqTBE" */
2288&(nid_objs[584]),/* "setct-CapRevReqTBEX" */
2289&(nid_objs[547]),/* "setct-CapRevReqTBS" */
2290&(nid_objs[548]),/* "setct-CapRevReqTBSX" */
2291&(nid_objs[549]),/* "setct-CapRevResData" */
2292&(nid_objs[585]),/* "setct-CapRevResTBE" */
2293&(nid_objs[538]),/* "setct-CapTokenData" */
2294&(nid_objs[530]),/* "setct-CapTokenSeq" */
2295&(nid_objs[574]),/* "setct-CapTokenTBE" */
2296&(nid_objs[575]),/* "setct-CapTokenTBEX" */
2297&(nid_objs[539]),/* "setct-CapTokenTBS" */
2298&(nid_objs[560]),/* "setct-CardCInitResTBS" */
2299&(nid_objs[566]),/* "setct-CertInqReqTBS" */
2300&(nid_objs[563]),/* "setct-CertReqData" */
2301&(nid_objs[595]),/* "setct-CertReqTBE" */
2302&(nid_objs[596]),/* "setct-CertReqTBEX" */
2303&(nid_objs[564]),/* "setct-CertReqTBS" */
2304&(nid_objs[565]),/* "setct-CertResData" */
2305&(nid_objs[597]),/* "setct-CertResTBE" */
2306&(nid_objs[586]),/* "setct-CredReqTBE" */
2307&(nid_objs[587]),/* "setct-CredReqTBEX" */
2308&(nid_objs[550]),/* "setct-CredReqTBS" */
2309&(nid_objs[551]),/* "setct-CredReqTBSX" */
2310&(nid_objs[552]),/* "setct-CredResData" */
2311&(nid_objs[588]),/* "setct-CredResTBE" */
2312&(nid_objs[589]),/* "setct-CredRevReqTBE" */
2313&(nid_objs[590]),/* "setct-CredRevReqTBEX" */
2314&(nid_objs[553]),/* "setct-CredRevReqTBS" */
2315&(nid_objs[554]),/* "setct-CredRevReqTBSX" */
2316&(nid_objs[555]),/* "setct-CredRevResData" */
2317&(nid_objs[591]),/* "setct-CredRevResTBE" */
2318&(nid_objs[567]),/* "setct-ErrorTBS" */
2319&(nid_objs[526]),/* "setct-HODInput" */
2320&(nid_objs[561]),/* "setct-MeAqCInitResTBS" */
2321&(nid_objs[522]),/* "setct-OIData" */
2322&(nid_objs[519]),/* "setct-PANData" */
2323&(nid_objs[521]),/* "setct-PANOnly" */
2324&(nid_objs[520]),/* "setct-PANToken" */
2325&(nid_objs[556]),/* "setct-PCertReqData" */
2326&(nid_objs[557]),/* "setct-PCertResTBS" */
2327&(nid_objs[523]),/* "setct-PI" */
2328&(nid_objs[532]),/* "setct-PI-TBS" */
2329&(nid_objs[524]),/* "setct-PIData" */
2330&(nid_objs[525]),/* "setct-PIDataUnsigned" */
2331&(nid_objs[568]),/* "setct-PIDualSignedTBE" */
2332&(nid_objs[569]),/* "setct-PIUnsignedTBE" */
2333&(nid_objs[531]),/* "setct-PInitResData" */
2334&(nid_objs[533]),/* "setct-PResData" */
2335&(nid_objs[594]),/* "setct-RegFormReqTBE" */
2336&(nid_objs[562]),/* "setct-RegFormResTBS" */
2337&(nid_objs[606]),/* "setext-cv" */
2338&(nid_objs[601]),/* "setext-genCrypt" */
2339&(nid_objs[602]),/* "setext-miAuth" */
2340&(nid_objs[604]),/* "setext-pinAny" */
2341&(nid_objs[603]),/* "setext-pinSecure" */
2342&(nid_objs[605]),/* "setext-track2" */
1824&(nid_objs[52]),/* "signingTime" */ 2343&(nid_objs[52]),/* "signingTime" */
1825&(nid_objs[454]),/* "simpleSecurityObject" */ 2344&(nid_objs[454]),/* "simpleSecurityObject" */
1826&(nid_objs[496]),/* "singleLevelQuality" */ 2345&(nid_objs[496]),/* "singleLevelQuality" */
@@ -1866,6 +2385,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
1866&(nid_objs[430]),/* "Hold Instruction Code" */ 2385&(nid_objs[430]),/* "Hold Instruction Code" */
1867&(nid_objs[431]),/* "Hold Instruction None" */ 2386&(nid_objs[431]),/* "Hold Instruction None" */
1868&(nid_objs[433]),/* "Hold Instruction Reject" */ 2387&(nid_objs[433]),/* "Hold Instruction Reject" */
2388&(nid_objs[634]),/* "ICC or token signature" */
1869&(nid_objs[294]),/* "IPSec End System" */ 2389&(nid_objs[294]),/* "IPSec End System" */
1870&(nid_objs[295]),/* "IPSec Tunnel" */ 2390&(nid_objs[295]),/* "IPSec Tunnel" */
1871&(nid_objs[296]),/* "IPSec User" */ 2391&(nid_objs[296]),/* "IPSec User" */
@@ -1914,6 +2434,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
1914&(nid_objs[188]),/* "S/MIME" */ 2434&(nid_objs[188]),/* "S/MIME" */
1915&(nid_objs[167]),/* "S/MIME Capabilities" */ 2435&(nid_objs[167]),/* "S/MIME Capabilities" */
1916&(nid_objs[387]),/* "SNMPv2" */ 2436&(nid_objs[387]),/* "SNMPv2" */
2437&(nid_objs[512]),/* "Secure Electronic Transactions" */
1917&(nid_objs[386]),/* "Security" */ 2438&(nid_objs[386]),/* "Security" */
1918&(nid_objs[394]),/* "Selected Attribute Types" */ 2439&(nid_objs[394]),/* "Selected Attribute Types" */
1919&(nid_objs[143]),/* "Strong Extranet ID" */ 2440&(nid_objs[143]),/* "Strong Extranet ID" */
@@ -1948,6 +2469,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
1948&(nid_objs[288]),/* "ac-targeting" */ 2469&(nid_objs[288]),/* "ac-targeting" */
1949&(nid_objs[446]),/* "account" */ 2470&(nid_objs[446]),/* "account" */
1950&(nid_objs[364]),/* "ad dvcs" */ 2471&(nid_objs[364]),/* "ad dvcs" */
2472&(nid_objs[606]),/* "additional verification" */
1951&(nid_objs[419]),/* "aes-128-cbc" */ 2473&(nid_objs[419]),/* "aes-128-cbc" */
1952&(nid_objs[421]),/* "aes-128-cfb" */ 2474&(nid_objs[421]),/* "aes-128-cfb" */
1953&(nid_objs[418]),/* "aes-128-ecb" */ 2475&(nid_objs[418]),/* "aes-128-ecb" */
@@ -1977,10 +2499,13 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
1977&(nid_objs[111]),/* "cast5-ofb" */ 2499&(nid_objs[111]),/* "cast5-ofb" */
1978&(nid_objs[404]),/* "ccitt" */ 2500&(nid_objs[404]),/* "ccitt" */
1979&(nid_objs[152]),/* "certBag" */ 2501&(nid_objs[152]),/* "certBag" */
2502&(nid_objs[517]),/* "certificate extensions" */
1980&(nid_objs[54]),/* "challengePassword" */ 2503&(nid_objs[54]),/* "challengePassword" */
1981&(nid_objs[407]),/* "characteristic-two-field" */ 2504&(nid_objs[407]),/* "characteristic-two-field" */
1982&(nid_objs[395]),/* "clearance" */ 2505&(nid_objs[395]),/* "clearance" */
2506&(nid_objs[633]),/* "cleartext track 2" */
1983&(nid_objs[13]),/* "commonName" */ 2507&(nid_objs[13]),/* "commonName" */
2508&(nid_objs[513]),/* "content types" */
1984&(nid_objs[50]),/* "contentType" */ 2509&(nid_objs[50]),/* "contentType" */
1985&(nid_objs[53]),/* "countersignature" */ 2510&(nid_objs[53]),/* "countersignature" */
1986&(nid_objs[14]),/* "countryName" */ 2511&(nid_objs[14]),/* "countryName" */
@@ -1991,6 +2516,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
1991&(nid_objs[434]),/* "data" */ 2516&(nid_objs[434]),/* "data" */
1992&(nid_objs[390]),/* "dcObject" */ 2517&(nid_objs[390]),/* "dcObject" */
1993&(nid_objs[31]),/* "des-cbc" */ 2518&(nid_objs[31]),/* "des-cbc" */
2519&(nid_objs[643]),/* "des-cdmf" */
1994&(nid_objs[30]),/* "des-cfb" */ 2520&(nid_objs[30]),/* "des-cfb" */
1995&(nid_objs[29]),/* "des-ecb" */ 2521&(nid_objs[29]),/* "des-ecb" */
1996&(nid_objs[32]),/* "des-ede" */ 2522&(nid_objs[32]),/* "des-ede" */
@@ -2027,12 +2553,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2027&(nid_objs[297]),/* "dvcs" */ 2553&(nid_objs[297]),/* "dvcs" */
2028&(nid_objs[416]),/* "ecdsa-with-SHA1" */ 2554&(nid_objs[416]),/* "ecdsa-with-SHA1" */
2029&(nid_objs[48]),/* "emailAddress" */ 2555&(nid_objs[48]),/* "emailAddress" */
2556&(nid_objs[632]),/* "encrypted track 2" */
2030&(nid_objs[56]),/* "extendedCertificateAttributes" */ 2557&(nid_objs[56]),/* "extendedCertificateAttributes" */
2031&(nid_objs[462]),/* "favouriteDrink" */ 2558&(nid_objs[462]),/* "favouriteDrink" */
2032&(nid_objs[453]),/* "friendlyCountry" */ 2559&(nid_objs[453]),/* "friendlyCountry" */
2033&(nid_objs[490]),/* "friendlyCountryName" */ 2560&(nid_objs[490]),/* "friendlyCountryName" */
2034&(nid_objs[156]),/* "friendlyName" */ 2561&(nid_objs[156]),/* "friendlyName" */
2562&(nid_objs[631]),/* "generate cryptogram" */
2035&(nid_objs[509]),/* "generationQualifier" */ 2563&(nid_objs[509]),/* "generationQualifier" */
2564&(nid_objs[601]),/* "generic cryptogram" */
2036&(nid_objs[99]),/* "givenName" */ 2565&(nid_objs[99]),/* "givenName" */
2037&(nid_objs[163]),/* "hmacWithSHA1" */ 2566&(nid_objs[163]),/* "hmacWithSHA1" */
2038&(nid_objs[486]),/* "homePostalAddress" */ 2567&(nid_objs[486]),/* "homePostalAddress" */
@@ -2214,6 +2743,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2214&(nid_objs[461]),/* "info" */ 2743&(nid_objs[461]),/* "info" */
2215&(nid_objs[101]),/* "initials" */ 2744&(nid_objs[101]),/* "initials" */
2216&(nid_objs[181]),/* "iso" */ 2745&(nid_objs[181]),/* "iso" */
2746&(nid_objs[623]),/* "issuer capabilities" */
2217&(nid_objs[492]),/* "janetMailbox" */ 2747&(nid_objs[492]),/* "janetMailbox" */
2218&(nid_objs[393]),/* "joint-iso-ccitt" */ 2748&(nid_objs[393]),/* "joint-iso-ccitt" */
2219&(nid_objs[150]),/* "keyBag" */ 2749&(nid_objs[150]),/* "keyBag" */
@@ -2234,6 +2764,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2234&(nid_objs[ 8]),/* "md5WithRSAEncryption" */ 2764&(nid_objs[ 8]),/* "md5WithRSAEncryption" */
2235&(nid_objs[95]),/* "mdc2" */ 2765&(nid_objs[95]),/* "mdc2" */
2236&(nid_objs[96]),/* "mdc2WithRSA" */ 2766&(nid_objs[96]),/* "mdc2WithRSA" */
2767&(nid_objs[602]),/* "merchant initiated auth" */
2768&(nid_objs[514]),/* "message extensions" */
2237&(nid_objs[51]),/* "messageDigest" */ 2769&(nid_objs[51]),/* "messageDigest" */
2238&(nid_objs[506]),/* "mime-mhs-bodies" */ 2770&(nid_objs[506]),/* "mime-mhs-bodies" */
2239&(nid_objs[505]),/* "mime-mhs-headings" */ 2771&(nid_objs[505]),/* "mime-mhs-headings" */
@@ -2247,6 +2779,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2247&(nid_objs[475]),/* "otherMailbox" */ 2779&(nid_objs[475]),/* "otherMailbox" */
2248&(nid_objs[489]),/* "pagerTelephoneNumber" */ 2780&(nid_objs[489]),/* "pagerTelephoneNumber" */
2249&(nid_objs[374]),/* "path" */ 2781&(nid_objs[374]),/* "path" */
2782&(nid_objs[621]),/* "payment gateway capabilities" */
2250&(nid_objs[ 9]),/* "pbeWithMD2AndDES-CBC" */ 2783&(nid_objs[ 9]),/* "pbeWithMD2AndDES-CBC" */
2251&(nid_objs[168]),/* "pbeWithMD2AndRC2-CBC" */ 2784&(nid_objs[168]),/* "pbeWithMD2AndRC2-CBC" */
2252&(nid_objs[112]),/* "pbeWithMD5AndCast5CBC" */ 2785&(nid_objs[112]),/* "pbeWithMD5AndCast5CBC" */
@@ -2293,6 +2826,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2293&(nid_objs[413]),/* "prime239v2" */ 2826&(nid_objs[413]),/* "prime239v2" */
2294&(nid_objs[414]),/* "prime239v3" */ 2827&(nid_objs[414]),/* "prime239v3" */
2295&(nid_objs[415]),/* "prime256v1" */ 2828&(nid_objs[415]),/* "prime256v1" */
2829&(nid_objs[510]),/* "pseudonym" */
2296&(nid_objs[435]),/* "pss" */ 2830&(nid_objs[435]),/* "pss" */
2297&(nid_objs[286]),/* "qcStatements" */ 2831&(nid_objs[286]),/* "qcStatements" */
2298&(nid_objs[457]),/* "qualityLabelledData" */ 2832&(nid_objs[457]),/* "qualityLabelledData" */
@@ -2317,6 +2851,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2317&(nid_objs[463]),/* "roomNumber" */ 2851&(nid_objs[463]),/* "roomNumber" */
2318&(nid_objs[19]),/* "rsa" */ 2852&(nid_objs[19]),/* "rsa" */
2319&(nid_objs[ 6]),/* "rsaEncryption" */ 2853&(nid_objs[ 6]),/* "rsaEncryption" */
2854&(nid_objs[644]),/* "rsaOAEPEncryptionSET" */
2320&(nid_objs[377]),/* "rsaSignature" */ 2855&(nid_objs[377]),/* "rsaSignature" */
2321&(nid_objs[124]),/* "run length compression" */ 2856&(nid_objs[124]),/* "run length compression" */
2322&(nid_objs[482]),/* "sOARecord" */ 2857&(nid_objs[482]),/* "sOARecord" */
@@ -2327,7 +2862,125 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2327&(nid_objs[159]),/* "sdsiCertificate" */ 2862&(nid_objs[159]),/* "sdsiCertificate" */
2328&(nid_objs[154]),/* "secretBag" */ 2863&(nid_objs[154]),/* "secretBag" */
2329&(nid_objs[474]),/* "secretary" */ 2864&(nid_objs[474]),/* "secretary" */
2865&(nid_objs[635]),/* "secure device signature" */
2330&(nid_objs[105]),/* "serialNumber" */ 2866&(nid_objs[105]),/* "serialNumber" */
2867&(nid_objs[625]),/* "set-addPolicy" */
2868&(nid_objs[515]),/* "set-attr" */
2869&(nid_objs[518]),/* "set-brand" */
2870&(nid_objs[638]),/* "set-brand-AmericanExpress" */
2871&(nid_objs[637]),/* "set-brand-Diners" */
2872&(nid_objs[636]),/* "set-brand-IATA-ATA" */
2873&(nid_objs[639]),/* "set-brand-JCB" */
2874&(nid_objs[641]),/* "set-brand-MasterCard" */
2875&(nid_objs[642]),/* "set-brand-Novus" */
2876&(nid_objs[640]),/* "set-brand-Visa" */
2877&(nid_objs[516]),/* "set-policy" */
2878&(nid_objs[607]),/* "set-policy-root" */
2879&(nid_objs[624]),/* "set-rootKeyThumb" */
2880&(nid_objs[620]),/* "setAttr-Cert" */
2881&(nid_objs[628]),/* "setAttr-IssCap-CVM" */
2882&(nid_objs[630]),/* "setAttr-IssCap-Sig" */
2883&(nid_objs[629]),/* "setAttr-IssCap-T2" */
2884&(nid_objs[627]),/* "setAttr-Token-B0Prime" */
2885&(nid_objs[626]),/* "setAttr-Token-EMV" */
2886&(nid_objs[622]),/* "setAttr-TokenType" */
2887&(nid_objs[619]),/* "setCext-IssuerCapabilities" */
2888&(nid_objs[615]),/* "setCext-PGWYcapabilities" */
2889&(nid_objs[616]),/* "setCext-TokenIdentifier" */
2890&(nid_objs[618]),/* "setCext-TokenType" */
2891&(nid_objs[617]),/* "setCext-Track2Data" */
2892&(nid_objs[611]),/* "setCext-cCertRequired" */
2893&(nid_objs[609]),/* "setCext-certType" */
2894&(nid_objs[608]),/* "setCext-hashedRoot" */
2895&(nid_objs[610]),/* "setCext-merchData" */
2896&(nid_objs[613]),/* "setCext-setExt" */
2897&(nid_objs[614]),/* "setCext-setQualf" */
2898&(nid_objs[612]),/* "setCext-tunneling" */
2899&(nid_objs[540]),/* "setct-AcqCardCodeMsg" */
2900&(nid_objs[576]),/* "setct-AcqCardCodeMsgTBE" */
2901&(nid_objs[570]),/* "setct-AuthReqTBE" */
2902&(nid_objs[534]),/* "setct-AuthReqTBS" */
2903&(nid_objs[527]),/* "setct-AuthResBaggage" */
2904&(nid_objs[571]),/* "setct-AuthResTBE" */
2905&(nid_objs[572]),/* "setct-AuthResTBEX" */
2906&(nid_objs[535]),/* "setct-AuthResTBS" */
2907&(nid_objs[536]),/* "setct-AuthResTBSX" */
2908&(nid_objs[528]),/* "setct-AuthRevReqBaggage" */
2909&(nid_objs[577]),/* "setct-AuthRevReqTBE" */
2910&(nid_objs[541]),/* "setct-AuthRevReqTBS" */
2911&(nid_objs[529]),/* "setct-AuthRevResBaggage" */
2912&(nid_objs[542]),/* "setct-AuthRevResData" */
2913&(nid_objs[578]),/* "setct-AuthRevResTBE" */
2914&(nid_objs[579]),/* "setct-AuthRevResTBEB" */
2915&(nid_objs[543]),/* "setct-AuthRevResTBS" */
2916&(nid_objs[573]),/* "setct-AuthTokenTBE" */
2917&(nid_objs[537]),/* "setct-AuthTokenTBS" */
2918&(nid_objs[600]),/* "setct-BCIDistributionTBS" */
2919&(nid_objs[558]),/* "setct-BatchAdminReqData" */
2920&(nid_objs[592]),/* "setct-BatchAdminReqTBE" */
2921&(nid_objs[559]),/* "setct-BatchAdminResData" */
2922&(nid_objs[593]),/* "setct-BatchAdminResTBE" */
2923&(nid_objs[599]),/* "setct-CRLNotificationResTBS" */
2924&(nid_objs[598]),/* "setct-CRLNotificationTBS" */
2925&(nid_objs[580]),/* "setct-CapReqTBE" */
2926&(nid_objs[581]),/* "setct-CapReqTBEX" */
2927&(nid_objs[544]),/* "setct-CapReqTBS" */
2928&(nid_objs[545]),/* "setct-CapReqTBSX" */
2929&(nid_objs[546]),/* "setct-CapResData" */
2930&(nid_objs[582]),/* "setct-CapResTBE" */
2931&(nid_objs[583]),/* "setct-CapRevReqTBE" */
2932&(nid_objs[584]),/* "setct-CapRevReqTBEX" */
2933&(nid_objs[547]),/* "setct-CapRevReqTBS" */
2934&(nid_objs[548]),/* "setct-CapRevReqTBSX" */
2935&(nid_objs[549]),/* "setct-CapRevResData" */
2936&(nid_objs[585]),/* "setct-CapRevResTBE" */
2937&(nid_objs[538]),/* "setct-CapTokenData" */
2938&(nid_objs[530]),/* "setct-CapTokenSeq" */
2939&(nid_objs[574]),/* "setct-CapTokenTBE" */
2940&(nid_objs[575]),/* "setct-CapTokenTBEX" */
2941&(nid_objs[539]),/* "setct-CapTokenTBS" */
2942&(nid_objs[560]),/* "setct-CardCInitResTBS" */
2943&(nid_objs[566]),/* "setct-CertInqReqTBS" */
2944&(nid_objs[563]),/* "setct-CertReqData" */
2945&(nid_objs[595]),/* "setct-CertReqTBE" */
2946&(nid_objs[596]),/* "setct-CertReqTBEX" */
2947&(nid_objs[564]),/* "setct-CertReqTBS" */
2948&(nid_objs[565]),/* "setct-CertResData" */
2949&(nid_objs[597]),/* "setct-CertResTBE" */
2950&(nid_objs[586]),/* "setct-CredReqTBE" */
2951&(nid_objs[587]),/* "setct-CredReqTBEX" */
2952&(nid_objs[550]),/* "setct-CredReqTBS" */
2953&(nid_objs[551]),/* "setct-CredReqTBSX" */
2954&(nid_objs[552]),/* "setct-CredResData" */
2955&(nid_objs[588]),/* "setct-CredResTBE" */
2956&(nid_objs[589]),/* "setct-CredRevReqTBE" */
2957&(nid_objs[590]),/* "setct-CredRevReqTBEX" */
2958&(nid_objs[553]),/* "setct-CredRevReqTBS" */
2959&(nid_objs[554]),/* "setct-CredRevReqTBSX" */
2960&(nid_objs[555]),/* "setct-CredRevResData" */
2961&(nid_objs[591]),/* "setct-CredRevResTBE" */
2962&(nid_objs[567]),/* "setct-ErrorTBS" */
2963&(nid_objs[526]),/* "setct-HODInput" */
2964&(nid_objs[561]),/* "setct-MeAqCInitResTBS" */
2965&(nid_objs[522]),/* "setct-OIData" */
2966&(nid_objs[519]),/* "setct-PANData" */
2967&(nid_objs[521]),/* "setct-PANOnly" */
2968&(nid_objs[520]),/* "setct-PANToken" */
2969&(nid_objs[556]),/* "setct-PCertReqData" */
2970&(nid_objs[557]),/* "setct-PCertResTBS" */
2971&(nid_objs[523]),/* "setct-PI" */
2972&(nid_objs[532]),/* "setct-PI-TBS" */
2973&(nid_objs[524]),/* "setct-PIData" */
2974&(nid_objs[525]),/* "setct-PIDataUnsigned" */
2975&(nid_objs[568]),/* "setct-PIDualSignedTBE" */
2976&(nid_objs[569]),/* "setct-PIUnsignedTBE" */
2977&(nid_objs[531]),/* "setct-PInitResData" */
2978&(nid_objs[533]),/* "setct-PResData" */
2979&(nid_objs[594]),/* "setct-RegFormReqTBE" */
2980&(nid_objs[562]),/* "setct-RegFormResTBS" */
2981&(nid_objs[604]),/* "setext-pinAny" */
2982&(nid_objs[603]),/* "setext-pinSecure" */
2983&(nid_objs[605]),/* "setext-track2" */
2331&(nid_objs[41]),/* "sha" */ 2984&(nid_objs[41]),/* "sha" */
2332&(nid_objs[64]),/* "sha1" */ 2985&(nid_objs[64]),/* "sha1" */
2333&(nid_objs[115]),/* "sha1WithRSA" */ 2986&(nid_objs[115]),/* "sha1WithRSA" */
@@ -2369,6 +3022,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2369&(nid_objs[12]),/* OBJ_X509 2 5 4 */ 3022&(nid_objs[12]),/* OBJ_X509 2 5 4 */
2370&(nid_objs[378]),/* OBJ_X500algorithms 2 5 8 */ 3023&(nid_objs[378]),/* OBJ_X500algorithms 2 5 8 */
2371&(nid_objs[81]),/* OBJ_id_ce 2 5 29 */ 3024&(nid_objs[81]),/* OBJ_id_ce 2 5 29 */
3025&(nid_objs[512]),/* OBJ_id_set 2 23 42 */
2372&(nid_objs[435]),/* OBJ_pss 0 9 2342 */ 3026&(nid_objs[435]),/* OBJ_pss 0 9 2342 */
2373&(nid_objs[183]),/* OBJ_ISO_US 1 2 840 */ 3027&(nid_objs[183]),/* OBJ_ISO_US 1 2 840 */
2374&(nid_objs[381]),/* OBJ_iana 1 3 6 1 */ 3028&(nid_objs[381]),/* OBJ_iana 1 3 6 1 */
@@ -2389,6 +3043,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2389&(nid_objs[509]),/* OBJ_generationQualifier 2 5 4 44 */ 3043&(nid_objs[509]),/* OBJ_generationQualifier 2 5 4 44 */
2390&(nid_objs[503]),/* OBJ_x500UniqueIdentifier 2 5 4 45 */ 3044&(nid_objs[503]),/* OBJ_x500UniqueIdentifier 2 5 4 45 */
2391&(nid_objs[174]),/* OBJ_dnQualifier 2 5 4 46 */ 3045&(nid_objs[174]),/* OBJ_dnQualifier 2 5 4 46 */
3046&(nid_objs[510]),/* OBJ_pseudonym 2 5 4 65 */
2392&(nid_objs[400]),/* OBJ_role 2 5 4 72 */ 3047&(nid_objs[400]),/* OBJ_role 2 5 4 72 */
2393&(nid_objs[82]),/* OBJ_subject_key_identifier 2 5 29 14 */ 3048&(nid_objs[82]),/* OBJ_subject_key_identifier 2 5 29 14 */
2394&(nid_objs[83]),/* OBJ_key_usage 2 5 29 15 */ 3049&(nid_objs[83]),/* OBJ_key_usage 2 5 29 15 */
@@ -2408,6 +3063,12 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2408&(nid_objs[126]),/* OBJ_ext_key_usage 2 5 29 37 */ 3063&(nid_objs[126]),/* OBJ_ext_key_usage 2 5 29 37 */
2409&(nid_objs[402]),/* OBJ_target_information 2 5 29 55 */ 3064&(nid_objs[402]),/* OBJ_target_information 2 5 29 55 */
2410&(nid_objs[403]),/* OBJ_no_rev_avail 2 5 29 56 */ 3065&(nid_objs[403]),/* OBJ_no_rev_avail 2 5 29 56 */
3066&(nid_objs[513]),/* OBJ_set_ctype 2 23 42 0 */
3067&(nid_objs[514]),/* OBJ_set_msgExt 2 23 42 1 */
3068&(nid_objs[515]),/* OBJ_set_attr 2 23 42 3 */
3069&(nid_objs[516]),/* OBJ_set_policy 2 23 42 5 */
3070&(nid_objs[517]),/* OBJ_set_certExt 2 23 42 7 */
3071&(nid_objs[518]),/* OBJ_set_brand 2 23 42 8 */
2411&(nid_objs[382]),/* OBJ_Directory 1 3 6 1 1 */ 3072&(nid_objs[382]),/* OBJ_Directory 1 3 6 1 1 */
2412&(nid_objs[383]),/* OBJ_Management 1 3 6 1 2 */ 3073&(nid_objs[383]),/* OBJ_Management 1 3 6 1 2 */
2413&(nid_objs[384]),/* OBJ_Experimental 1 3 6 1 3 */ 3074&(nid_objs[384]),/* OBJ_Experimental 1 3 6 1 3 */
@@ -2420,6 +3081,117 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2420&(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */ 3081&(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */
2421&(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */ 3082&(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */
2422&(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */ 3083&(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */
3084&(nid_objs[519]),/* OBJ_setct_PANData 2 23 42 0 0 */
3085&(nid_objs[520]),/* OBJ_setct_PANToken 2 23 42 0 1 */
3086&(nid_objs[521]),/* OBJ_setct_PANOnly 2 23 42 0 2 */
3087&(nid_objs[522]),/* OBJ_setct_OIData 2 23 42 0 3 */
3088&(nid_objs[523]),/* OBJ_setct_PI 2 23 42 0 4 */
3089&(nid_objs[524]),/* OBJ_setct_PIData 2 23 42 0 5 */
3090&(nid_objs[525]),/* OBJ_setct_PIDataUnsigned 2 23 42 0 6 */
3091&(nid_objs[526]),/* OBJ_setct_HODInput 2 23 42 0 7 */
3092&(nid_objs[527]),/* OBJ_setct_AuthResBaggage 2 23 42 0 8 */
3093&(nid_objs[528]),/* OBJ_setct_AuthRevReqBaggage 2 23 42 0 9 */
3094&(nid_objs[529]),/* OBJ_setct_AuthRevResBaggage 2 23 42 0 10 */
3095&(nid_objs[530]),/* OBJ_setct_CapTokenSeq 2 23 42 0 11 */
3096&(nid_objs[531]),/* OBJ_setct_PInitResData 2 23 42 0 12 */
3097&(nid_objs[532]),/* OBJ_setct_PI_TBS 2 23 42 0 13 */
3098&(nid_objs[533]),/* OBJ_setct_PResData 2 23 42 0 14 */
3099&(nid_objs[534]),/* OBJ_setct_AuthReqTBS 2 23 42 0 16 */
3100&(nid_objs[535]),/* OBJ_setct_AuthResTBS 2 23 42 0 17 */
3101&(nid_objs[536]),/* OBJ_setct_AuthResTBSX 2 23 42 0 18 */
3102&(nid_objs[537]),/* OBJ_setct_AuthTokenTBS 2 23 42 0 19 */
3103&(nid_objs[538]),/* OBJ_setct_CapTokenData 2 23 42 0 20 */
3104&(nid_objs[539]),/* OBJ_setct_CapTokenTBS 2 23 42 0 21 */
3105&(nid_objs[540]),/* OBJ_setct_AcqCardCodeMsg 2 23 42 0 22 */
3106&(nid_objs[541]),/* OBJ_setct_AuthRevReqTBS 2 23 42 0 23 */
3107&(nid_objs[542]),/* OBJ_setct_AuthRevResData 2 23 42 0 24 */
3108&(nid_objs[543]),/* OBJ_setct_AuthRevResTBS 2 23 42 0 25 */
3109&(nid_objs[544]),/* OBJ_setct_CapReqTBS 2 23 42 0 26 */
3110&(nid_objs[545]),/* OBJ_setct_CapReqTBSX 2 23 42 0 27 */
3111&(nid_objs[546]),/* OBJ_setct_CapResData 2 23 42 0 28 */
3112&(nid_objs[547]),/* OBJ_setct_CapRevReqTBS 2 23 42 0 29 */
3113&(nid_objs[548]),/* OBJ_setct_CapRevReqTBSX 2 23 42 0 30 */
3114&(nid_objs[549]),/* OBJ_setct_CapRevResData 2 23 42 0 31 */
3115&(nid_objs[550]),/* OBJ_setct_CredReqTBS 2 23 42 0 32 */
3116&(nid_objs[551]),/* OBJ_setct_CredReqTBSX 2 23 42 0 33 */
3117&(nid_objs[552]),/* OBJ_setct_CredResData 2 23 42 0 34 */
3118&(nid_objs[553]),/* OBJ_setct_CredRevReqTBS 2 23 42 0 35 */
3119&(nid_objs[554]),/* OBJ_setct_CredRevReqTBSX 2 23 42 0 36 */
3120&(nid_objs[555]),/* OBJ_setct_CredRevResData 2 23 42 0 37 */
3121&(nid_objs[556]),/* OBJ_setct_PCertReqData 2 23 42 0 38 */
3122&(nid_objs[557]),/* OBJ_setct_PCertResTBS 2 23 42 0 39 */
3123&(nid_objs[558]),/* OBJ_setct_BatchAdminReqData 2 23 42 0 40 */
3124&(nid_objs[559]),/* OBJ_setct_BatchAdminResData 2 23 42 0 41 */
3125&(nid_objs[560]),/* OBJ_setct_CardCInitResTBS 2 23 42 0 42 */
3126&(nid_objs[561]),/* OBJ_setct_MeAqCInitResTBS 2 23 42 0 43 */
3127&(nid_objs[562]),/* OBJ_setct_RegFormResTBS 2 23 42 0 44 */
3128&(nid_objs[563]),/* OBJ_setct_CertReqData 2 23 42 0 45 */
3129&(nid_objs[564]),/* OBJ_setct_CertReqTBS 2 23 42 0 46 */
3130&(nid_objs[565]),/* OBJ_setct_CertResData 2 23 42 0 47 */
3131&(nid_objs[566]),/* OBJ_setct_CertInqReqTBS 2 23 42 0 48 */
3132&(nid_objs[567]),/* OBJ_setct_ErrorTBS 2 23 42 0 49 */
3133&(nid_objs[568]),/* OBJ_setct_PIDualSignedTBE 2 23 42 0 50 */
3134&(nid_objs[569]),/* OBJ_setct_PIUnsignedTBE 2 23 42 0 51 */
3135&(nid_objs[570]),/* OBJ_setct_AuthReqTBE 2 23 42 0 52 */
3136&(nid_objs[571]),/* OBJ_setct_AuthResTBE 2 23 42 0 53 */
3137&(nid_objs[572]),/* OBJ_setct_AuthResTBEX 2 23 42 0 54 */
3138&(nid_objs[573]),/* OBJ_setct_AuthTokenTBE 2 23 42 0 55 */
3139&(nid_objs[574]),/* OBJ_setct_CapTokenTBE 2 23 42 0 56 */
3140&(nid_objs[575]),/* OBJ_setct_CapTokenTBEX 2 23 42 0 57 */
3141&(nid_objs[576]),/* OBJ_setct_AcqCardCodeMsgTBE 2 23 42 0 58 */
3142&(nid_objs[577]),/* OBJ_setct_AuthRevReqTBE 2 23 42 0 59 */
3143&(nid_objs[578]),/* OBJ_setct_AuthRevResTBE 2 23 42 0 60 */
3144&(nid_objs[579]),/* OBJ_setct_AuthRevResTBEB 2 23 42 0 61 */
3145&(nid_objs[580]),/* OBJ_setct_CapReqTBE 2 23 42 0 62 */
3146&(nid_objs[581]),/* OBJ_setct_CapReqTBEX 2 23 42 0 63 */
3147&(nid_objs[582]),/* OBJ_setct_CapResTBE 2 23 42 0 64 */
3148&(nid_objs[583]),/* OBJ_setct_CapRevReqTBE 2 23 42 0 65 */
3149&(nid_objs[584]),/* OBJ_setct_CapRevReqTBEX 2 23 42 0 66 */
3150&(nid_objs[585]),/* OBJ_setct_CapRevResTBE 2 23 42 0 67 */
3151&(nid_objs[586]),/* OBJ_setct_CredReqTBE 2 23 42 0 68 */
3152&(nid_objs[587]),/* OBJ_setct_CredReqTBEX 2 23 42 0 69 */
3153&(nid_objs[588]),/* OBJ_setct_CredResTBE 2 23 42 0 70 */
3154&(nid_objs[589]),/* OBJ_setct_CredRevReqTBE 2 23 42 0 71 */
3155&(nid_objs[590]),/* OBJ_setct_CredRevReqTBEX 2 23 42 0 72 */
3156&(nid_objs[591]),/* OBJ_setct_CredRevResTBE 2 23 42 0 73 */
3157&(nid_objs[592]),/* OBJ_setct_BatchAdminReqTBE 2 23 42 0 74 */
3158&(nid_objs[593]),/* OBJ_setct_BatchAdminResTBE 2 23 42 0 75 */
3159&(nid_objs[594]),/* OBJ_setct_RegFormReqTBE 2 23 42 0 76 */
3160&(nid_objs[595]),/* OBJ_setct_CertReqTBE 2 23 42 0 77 */
3161&(nid_objs[596]),/* OBJ_setct_CertReqTBEX 2 23 42 0 78 */
3162&(nid_objs[597]),/* OBJ_setct_CertResTBE 2 23 42 0 79 */
3163&(nid_objs[598]),/* OBJ_setct_CRLNotificationTBS 2 23 42 0 80 */
3164&(nid_objs[599]),/* OBJ_setct_CRLNotificationResTBS 2 23 42 0 81 */
3165&(nid_objs[600]),/* OBJ_setct_BCIDistributionTBS 2 23 42 0 82 */
3166&(nid_objs[601]),/* OBJ_setext_genCrypt 2 23 42 1 1 */
3167&(nid_objs[602]),/* OBJ_setext_miAuth 2 23 42 1 3 */
3168&(nid_objs[603]),/* OBJ_setext_pinSecure 2 23 42 1 4 */
3169&(nid_objs[604]),/* OBJ_setext_pinAny 2 23 42 1 5 */
3170&(nid_objs[605]),/* OBJ_setext_track2 2 23 42 1 7 */
3171&(nid_objs[606]),/* OBJ_setext_cv 2 23 42 1 8 */
3172&(nid_objs[620]),/* OBJ_setAttr_Cert 2 23 42 3 0 */
3173&(nid_objs[621]),/* OBJ_setAttr_PGWYcap 2 23 42 3 1 */
3174&(nid_objs[622]),/* OBJ_setAttr_TokenType 2 23 42 3 2 */
3175&(nid_objs[623]),/* OBJ_setAttr_IssCap 2 23 42 3 3 */
3176&(nid_objs[607]),/* OBJ_set_policy_root 2 23 42 5 0 */
3177&(nid_objs[608]),/* OBJ_setCext_hashedRoot 2 23 42 7 0 */
3178&(nid_objs[609]),/* OBJ_setCext_certType 2 23 42 7 1 */
3179&(nid_objs[610]),/* OBJ_setCext_merchData 2 23 42 7 2 */
3180&(nid_objs[611]),/* OBJ_setCext_cCertRequired 2 23 42 7 3 */
3181&(nid_objs[612]),/* OBJ_setCext_tunneling 2 23 42 7 4 */
3182&(nid_objs[613]),/* OBJ_setCext_setExt 2 23 42 7 5 */
3183&(nid_objs[614]),/* OBJ_setCext_setQualf 2 23 42 7 6 */
3184&(nid_objs[615]),/* OBJ_setCext_PGWYcapabilities 2 23 42 7 7 */
3185&(nid_objs[616]),/* OBJ_setCext_TokenIdentifier 2 23 42 7 8 */
3186&(nid_objs[617]),/* OBJ_setCext_Track2Data 2 23 42 7 9 */
3187&(nid_objs[618]),/* OBJ_setCext_TokenType 2 23 42 7 10 */
3188&(nid_objs[619]),/* OBJ_setCext_IssuerCapabilities 2 23 42 7 11 */
3189&(nid_objs[636]),/* OBJ_set_brand_IATA_ATA 2 23 42 8 1 */
3190&(nid_objs[640]),/* OBJ_set_brand_Visa 2 23 42 8 4 */
3191&(nid_objs[641]),/* OBJ_set_brand_MasterCard 2 23 42 8 5 */
3192&(nid_objs[637]),/* OBJ_set_brand_Diners 2 23 42 8 30 */
3193&(nid_objs[638]),/* OBJ_set_brand_AmericanExpress 2 23 42 8 34 */
3194&(nid_objs[639]),/* OBJ_set_brand_JCB 2 23 42 8 35 */
2423&(nid_objs[184]),/* OBJ_X9_57 1 2 840 10040 */ 3195&(nid_objs[184]),/* OBJ_X9_57 1 2 840 10040 */
2424&(nid_objs[405]),/* OBJ_ansi_X9_62 1 2 840 10045 */ 3196&(nid_objs[405]),/* OBJ_ansi_X9_62 1 2 840 10045 */
2425&(nid_objs[389]),/* OBJ_Enterprises 1 3 6 1 4 1 */ 3197&(nid_objs[389]),/* OBJ_Enterprises 1 3 6 1 4 1 */
@@ -2440,6 +3212,14 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2440&(nid_objs[115]),/* OBJ_sha1WithRSA 1 3 14 3 2 29 */ 3212&(nid_objs[115]),/* OBJ_sha1WithRSA 1 3 14 3 2 29 */
2441&(nid_objs[117]),/* OBJ_ripemd160 1 3 36 3 2 1 */ 3213&(nid_objs[117]),/* OBJ_ripemd160 1 3 36 3 2 1 */
2442&(nid_objs[143]),/* OBJ_sxnet 1 3 101 1 4 1 */ 3214&(nid_objs[143]),/* OBJ_sxnet 1 3 101 1 4 1 */
3215&(nid_objs[624]),/* OBJ_set_rootKeyThumb 2 23 42 3 0 0 */
3216&(nid_objs[625]),/* OBJ_set_addPolicy 2 23 42 3 0 1 */
3217&(nid_objs[626]),/* OBJ_setAttr_Token_EMV 2 23 42 3 2 1 */
3218&(nid_objs[627]),/* OBJ_setAttr_Token_B0Prime 2 23 42 3 2 2 */
3219&(nid_objs[628]),/* OBJ_setAttr_IssCap_CVM 2 23 42 3 3 3 */
3220&(nid_objs[629]),/* OBJ_setAttr_IssCap_T2 2 23 42 3 3 4 */
3221&(nid_objs[630]),/* OBJ_setAttr_IssCap_Sig 2 23 42 3 3 5 */
3222&(nid_objs[642]),/* OBJ_set_brand_Novus 2 23 42 8 6011 */
2443&(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666 1 */ 3223&(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666 1 */
2444&(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666 2 */ 3224&(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666 2 */
2445&(nid_objs[ 1]),/* OBJ_rsadsi 1 2 840 113549 */ 3225&(nid_objs[ 1]),/* OBJ_rsadsi 1 2 840 113549 */
@@ -2448,6 +3228,11 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2448&(nid_objs[505]),/* OBJ_mime_mhs_headings 1 3 6 1 7 1 1 */ 3228&(nid_objs[505]),/* OBJ_mime_mhs_headings 1 3 6 1 7 1 1 */
2449&(nid_objs[506]),/* OBJ_mime_mhs_bodies 1 3 6 1 7 1 2 */ 3229&(nid_objs[506]),/* OBJ_mime_mhs_bodies 1 3 6 1 7 1 2 */
2450&(nid_objs[119]),/* OBJ_ripemd160WithRSA 1 3 36 3 3 1 2 */ 3230&(nid_objs[119]),/* OBJ_ripemd160WithRSA 1 3 36 3 3 1 2 */
3231&(nid_objs[631]),/* OBJ_setAttr_GenCryptgrm 2 23 42 3 3 3 1 */
3232&(nid_objs[632]),/* OBJ_setAttr_T2Enc 2 23 42 3 3 4 1 */
3233&(nid_objs[633]),/* OBJ_setAttr_T2cleartxt 2 23 42 3 3 4 2 */
3234&(nid_objs[634]),/* OBJ_setAttr_TokICCsig 2 23 42 3 3 5 1 */
3235&(nid_objs[635]),/* OBJ_setAttr_SecDevSig 2 23 42 3 3 5 2 */
2451&(nid_objs[436]),/* OBJ_ucl 0 9 2342 19200300 */ 3236&(nid_objs[436]),/* OBJ_ucl 0 9 2342 19200300 */
2452&(nid_objs[ 2]),/* OBJ_pkcs 1 2 840 113549 1 */ 3237&(nid_objs[ 2]),/* OBJ_pkcs 1 2 840 113549 1 */
2453&(nid_objs[431]),/* OBJ_hold_instruction_none 1 2 840 10040 2 1 */ 3238&(nid_objs[431]),/* OBJ_hold_instruction_none 1 2 840 10040 2 1 */
@@ -2490,6 +3275,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2490&(nid_objs[ 5]),/* OBJ_rc4 1 2 840 113549 3 4 */ 3275&(nid_objs[ 5]),/* OBJ_rc4 1 2 840 113549 3 4 */
2491&(nid_objs[44]),/* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */ 3276&(nid_objs[44]),/* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */
2492&(nid_objs[120]),/* OBJ_rc5_cbc 1 2 840 113549 3 8 */ 3277&(nid_objs[120]),/* OBJ_rc5_cbc 1 2 840 113549 3 8 */
3278&(nid_objs[643]),/* OBJ_des_cdmf 1 2 840 113549 3 10 */
2493&(nid_objs[409]),/* OBJ_X9_62_prime192v1 1 2 840 10045 3 1 1 */ 3279&(nid_objs[409]),/* OBJ_X9_62_prime192v1 1 2 840 10045 3 1 1 */
2494&(nid_objs[410]),/* OBJ_X9_62_prime192v2 1 2 840 10045 3 1 2 */ 3280&(nid_objs[410]),/* OBJ_X9_62_prime192v2 1 2 840 10045 3 1 2 */
2495&(nid_objs[411]),/* OBJ_X9_62_prime192v3 1 2 840 10045 3 1 3 */ 3281&(nid_objs[411]),/* OBJ_X9_62_prime192v3 1 2 840 10045 3 1 3 */
@@ -2611,6 +3397,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
2611&(nid_objs[396]),/* OBJ_md4WithRSAEncryption 1 2 840 113549 1 1 3 */ 3397&(nid_objs[396]),/* OBJ_md4WithRSAEncryption 1 2 840 113549 1 1 3 */
2612&(nid_objs[ 8]),/* OBJ_md5WithRSAEncryption 1 2 840 113549 1 1 4 */ 3398&(nid_objs[ 8]),/* OBJ_md5WithRSAEncryption 1 2 840 113549 1 1 4 */
2613&(nid_objs[65]),/* OBJ_sha1WithRSAEncryption 1 2 840 113549 1 1 5 */ 3399&(nid_objs[65]),/* OBJ_sha1WithRSAEncryption 1 2 840 113549 1 1 5 */
3400&(nid_objs[644]),/* OBJ_rsaOAEPEncryptionSET 1 2 840 113549 1 1 6 */
2614&(nid_objs[28]),/* OBJ_dhKeyAgreement 1 2 840 113549 1 3 1 */ 3401&(nid_objs[28]),/* OBJ_dhKeyAgreement 1 2 840 113549 1 3 1 */
2615&(nid_objs[ 9]),/* OBJ_pbeWithMD2AndDES_CBC 1 2 840 113549 1 5 1 */ 3402&(nid_objs[ 9]),/* OBJ_pbeWithMD2AndDES_CBC 1 2 840 113549 1 5 1 */
2616&(nid_objs[10]),/* OBJ_pbeWithMD5AndDES_CBC 1 2 840 113549 1 5 3 */ 3403&(nid_objs[10]),/* OBJ_pbeWithMD5AndDES_CBC 1 2 840 113549 1 5 3 */
diff --git a/src/lib/libcrypto/objects/obj_mac.h b/src/lib/libcrypto/objects/obj_mac.h
index 6d77fcba3f..899db8325c 100644
--- a/src/lib/libcrypto/objects/obj_mac.h
+++ b/src/lib/libcrypto/objects/obj_mac.h
@@ -1654,6 +1654,10 @@
1654#define NID_dnQualifier 174 1654#define NID_dnQualifier 174
1655#define OBJ_dnQualifier OBJ_X509,46L 1655#define OBJ_dnQualifier OBJ_X509,46L
1656 1656
1657#define LN_pseudonym "pseudonym"
1658#define NID_pseudonym 510
1659#define OBJ_pseudonym OBJ_X509,65L
1660
1657#define SN_role "role" 1661#define SN_role "role"
1658#define LN_role "role" 1662#define LN_role "role"
1659#define NID_role 400 1663#define NID_role 400
@@ -2305,3 +2309,550 @@
2305#define NID_documentPublisher 502 2309#define NID_documentPublisher 502
2306#define OBJ_documentPublisher OBJ_pilotAttributeType,56L 2310#define OBJ_documentPublisher OBJ_pilotAttributeType,56L
2307 2311
2312#define SN_id_set "id-set"
2313#define LN_id_set "Secure Electronic Transactions"
2314#define NID_id_set 512
2315#define OBJ_id_set 2L,23L,42L
2316
2317#define SN_set_ctype "set-ctype"
2318#define LN_set_ctype "content types"
2319#define NID_set_ctype 513
2320#define OBJ_set_ctype OBJ_id_set,0L
2321
2322#define SN_set_msgExt "set-msgExt"
2323#define LN_set_msgExt "message extensions"
2324#define NID_set_msgExt 514
2325#define OBJ_set_msgExt OBJ_id_set,1L
2326
2327#define SN_set_attr "set-attr"
2328#define NID_set_attr 515
2329#define OBJ_set_attr OBJ_id_set,3L
2330
2331#define SN_set_policy "set-policy"
2332#define NID_set_policy 516
2333#define OBJ_set_policy OBJ_id_set,5L
2334
2335#define SN_set_certExt "set-certExt"
2336#define LN_set_certExt "certificate extensions"
2337#define NID_set_certExt 517
2338#define OBJ_set_certExt OBJ_id_set,7L
2339
2340#define SN_set_brand "set-brand"
2341#define NID_set_brand 518
2342#define OBJ_set_brand OBJ_id_set,8L
2343
2344#define SN_setct_PANData "setct-PANData"
2345#define NID_setct_PANData 519
2346#define OBJ_setct_PANData OBJ_set_ctype,0L
2347
2348#define SN_setct_PANToken "setct-PANToken"
2349#define NID_setct_PANToken 520
2350#define OBJ_setct_PANToken OBJ_set_ctype,1L
2351
2352#define SN_setct_PANOnly "setct-PANOnly"
2353#define NID_setct_PANOnly 521
2354#define OBJ_setct_PANOnly OBJ_set_ctype,2L
2355
2356#define SN_setct_OIData "setct-OIData"
2357#define NID_setct_OIData 522
2358#define OBJ_setct_OIData OBJ_set_ctype,3L
2359
2360#define SN_setct_PI "setct-PI"
2361#define NID_setct_PI 523
2362#define OBJ_setct_PI OBJ_set_ctype,4L
2363
2364#define SN_setct_PIData "setct-PIData"
2365#define NID_setct_PIData 524
2366#define OBJ_setct_PIData OBJ_set_ctype,5L
2367
2368#define SN_setct_PIDataUnsigned "setct-PIDataUnsigned"
2369#define NID_setct_PIDataUnsigned 525
2370#define OBJ_setct_PIDataUnsigned OBJ_set_ctype,6L
2371
2372#define SN_setct_HODInput "setct-HODInput"
2373#define NID_setct_HODInput 526
2374#define OBJ_setct_HODInput OBJ_set_ctype,7L
2375
2376#define SN_setct_AuthResBaggage "setct-AuthResBaggage"
2377#define NID_setct_AuthResBaggage 527
2378#define OBJ_setct_AuthResBaggage OBJ_set_ctype,8L
2379
2380#define SN_setct_AuthRevReqBaggage "setct-AuthRevReqBaggage"
2381#define NID_setct_AuthRevReqBaggage 528
2382#define OBJ_setct_AuthRevReqBaggage OBJ_set_ctype,9L
2383
2384#define SN_setct_AuthRevResBaggage "setct-AuthRevResBaggage"
2385#define NID_setct_AuthRevResBaggage 529
2386#define OBJ_setct_AuthRevResBaggage OBJ_set_ctype,10L
2387
2388#define SN_setct_CapTokenSeq "setct-CapTokenSeq"
2389#define NID_setct_CapTokenSeq 530
2390#define OBJ_setct_CapTokenSeq OBJ_set_ctype,11L
2391
2392#define SN_setct_PInitResData "setct-PInitResData"
2393#define NID_setct_PInitResData 531
2394#define OBJ_setct_PInitResData OBJ_set_ctype,12L
2395
2396#define SN_setct_PI_TBS "setct-PI-TBS"
2397#define NID_setct_PI_TBS 532
2398#define OBJ_setct_PI_TBS OBJ_set_ctype,13L
2399
2400#define SN_setct_PResData "setct-PResData"
2401#define NID_setct_PResData 533
2402#define OBJ_setct_PResData OBJ_set_ctype,14L
2403
2404#define SN_setct_AuthReqTBS "setct-AuthReqTBS"
2405#define NID_setct_AuthReqTBS 534
2406#define OBJ_setct_AuthReqTBS OBJ_set_ctype,16L
2407
2408#define SN_setct_AuthResTBS "setct-AuthResTBS"
2409#define NID_setct_AuthResTBS 535
2410#define OBJ_setct_AuthResTBS OBJ_set_ctype,17L
2411
2412#define SN_setct_AuthResTBSX "setct-AuthResTBSX"
2413#define NID_setct_AuthResTBSX 536
2414#define OBJ_setct_AuthResTBSX OBJ_set_ctype,18L
2415
2416#define SN_setct_AuthTokenTBS "setct-AuthTokenTBS"
2417#define NID_setct_AuthTokenTBS 537
2418#define OBJ_setct_AuthTokenTBS OBJ_set_ctype,19L
2419
2420#define SN_setct_CapTokenData "setct-CapTokenData"
2421#define NID_setct_CapTokenData 538
2422#define OBJ_setct_CapTokenData OBJ_set_ctype,20L
2423
2424#define SN_setct_CapTokenTBS "setct-CapTokenTBS"
2425#define NID_setct_CapTokenTBS 539
2426#define OBJ_setct_CapTokenTBS OBJ_set_ctype,21L
2427
2428#define SN_setct_AcqCardCodeMsg "setct-AcqCardCodeMsg"
2429#define NID_setct_AcqCardCodeMsg 540
2430#define OBJ_setct_AcqCardCodeMsg OBJ_set_ctype,22L
2431
2432#define SN_setct_AuthRevReqTBS "setct-AuthRevReqTBS"
2433#define NID_setct_AuthRevReqTBS 541
2434#define OBJ_setct_AuthRevReqTBS OBJ_set_ctype,23L
2435
2436#define SN_setct_AuthRevResData "setct-AuthRevResData"
2437#define NID_setct_AuthRevResData 542
2438#define OBJ_setct_AuthRevResData OBJ_set_ctype,24L
2439
2440#define SN_setct_AuthRevResTBS "setct-AuthRevResTBS"
2441#define NID_setct_AuthRevResTBS 543
2442#define OBJ_setct_AuthRevResTBS OBJ_set_ctype,25L
2443
2444#define SN_setct_CapReqTBS "setct-CapReqTBS"
2445#define NID_setct_CapReqTBS 544
2446#define OBJ_setct_CapReqTBS OBJ_set_ctype,26L
2447
2448#define SN_setct_CapReqTBSX "setct-CapReqTBSX"
2449#define NID_setct_CapReqTBSX 545
2450#define OBJ_setct_CapReqTBSX OBJ_set_ctype,27L
2451
2452#define SN_setct_CapResData "setct-CapResData"
2453#define NID_setct_CapResData 546
2454#define OBJ_setct_CapResData OBJ_set_ctype,28L
2455
2456#define SN_setct_CapRevReqTBS "setct-CapRevReqTBS"
2457#define NID_setct_CapRevReqTBS 547
2458#define OBJ_setct_CapRevReqTBS OBJ_set_ctype,29L
2459
2460#define SN_setct_CapRevReqTBSX "setct-CapRevReqTBSX"
2461#define NID_setct_CapRevReqTBSX 548
2462#define OBJ_setct_CapRevReqTBSX OBJ_set_ctype,30L
2463
2464#define SN_setct_CapRevResData "setct-CapRevResData"
2465#define NID_setct_CapRevResData 549
2466#define OBJ_setct_CapRevResData OBJ_set_ctype,31L
2467
2468#define SN_setct_CredReqTBS "setct-CredReqTBS"
2469#define NID_setct_CredReqTBS 550
2470#define OBJ_setct_CredReqTBS OBJ_set_ctype,32L
2471
2472#define SN_setct_CredReqTBSX "setct-CredReqTBSX"
2473#define NID_setct_CredReqTBSX 551
2474#define OBJ_setct_CredReqTBSX OBJ_set_ctype,33L
2475
2476#define SN_setct_CredResData "setct-CredResData"
2477#define NID_setct_CredResData 552
2478#define OBJ_setct_CredResData OBJ_set_ctype,34L
2479
2480#define SN_setct_CredRevReqTBS "setct-CredRevReqTBS"
2481#define NID_setct_CredRevReqTBS 553
2482#define OBJ_setct_CredRevReqTBS OBJ_set_ctype,35L
2483
2484#define SN_setct_CredRevReqTBSX "setct-CredRevReqTBSX"
2485#define NID_setct_CredRevReqTBSX 554
2486#define OBJ_setct_CredRevReqTBSX OBJ_set_ctype,36L
2487
2488#define SN_setct_CredRevResData "setct-CredRevResData"
2489#define NID_setct_CredRevResData 555
2490#define OBJ_setct_CredRevResData OBJ_set_ctype,37L
2491
2492#define SN_setct_PCertReqData "setct-PCertReqData"
2493#define NID_setct_PCertReqData 556
2494#define OBJ_setct_PCertReqData OBJ_set_ctype,38L
2495
2496#define SN_setct_PCertResTBS "setct-PCertResTBS"
2497#define NID_setct_PCertResTBS 557
2498#define OBJ_setct_PCertResTBS OBJ_set_ctype,39L
2499
2500#define SN_setct_BatchAdminReqData "setct-BatchAdminReqData"
2501#define NID_setct_BatchAdminReqData 558
2502#define OBJ_setct_BatchAdminReqData OBJ_set_ctype,40L
2503
2504#define SN_setct_BatchAdminResData "setct-BatchAdminResData"
2505#define NID_setct_BatchAdminResData 559
2506#define OBJ_setct_BatchAdminResData OBJ_set_ctype,41L
2507
2508#define SN_setct_CardCInitResTBS "setct-CardCInitResTBS"
2509#define NID_setct_CardCInitResTBS 560
2510#define OBJ_setct_CardCInitResTBS OBJ_set_ctype,42L
2511
2512#define SN_setct_MeAqCInitResTBS "setct-MeAqCInitResTBS"
2513#define NID_setct_MeAqCInitResTBS 561
2514#define OBJ_setct_MeAqCInitResTBS OBJ_set_ctype,43L
2515
2516#define SN_setct_RegFormResTBS "setct-RegFormResTBS"
2517#define NID_setct_RegFormResTBS 562
2518#define OBJ_setct_RegFormResTBS OBJ_set_ctype,44L
2519
2520#define SN_setct_CertReqData "setct-CertReqData"
2521#define NID_setct_CertReqData 563
2522#define OBJ_setct_CertReqData OBJ_set_ctype,45L
2523
2524#define SN_setct_CertReqTBS "setct-CertReqTBS"
2525#define NID_setct_CertReqTBS 564
2526#define OBJ_setct_CertReqTBS OBJ_set_ctype,46L
2527
2528#define SN_setct_CertResData "setct-CertResData"
2529#define NID_setct_CertResData 565
2530#define OBJ_setct_CertResData OBJ_set_ctype,47L
2531
2532#define SN_setct_CertInqReqTBS "setct-CertInqReqTBS"
2533#define NID_setct_CertInqReqTBS 566
2534#define OBJ_setct_CertInqReqTBS OBJ_set_ctype,48L
2535
2536#define SN_setct_ErrorTBS "setct-ErrorTBS"
2537#define NID_setct_ErrorTBS 567
2538#define OBJ_setct_ErrorTBS OBJ_set_ctype,49L
2539
2540#define SN_setct_PIDualSignedTBE "setct-PIDualSignedTBE"
2541#define NID_setct_PIDualSignedTBE 568
2542#define OBJ_setct_PIDualSignedTBE OBJ_set_ctype,50L
2543
2544#define SN_setct_PIUnsignedTBE "setct-PIUnsignedTBE"
2545#define NID_setct_PIUnsignedTBE 569
2546#define OBJ_setct_PIUnsignedTBE OBJ_set_ctype,51L
2547
2548#define SN_setct_AuthReqTBE "setct-AuthReqTBE"
2549#define NID_setct_AuthReqTBE 570
2550#define OBJ_setct_AuthReqTBE OBJ_set_ctype,52L
2551
2552#define SN_setct_AuthResTBE "setct-AuthResTBE"
2553#define NID_setct_AuthResTBE 571
2554#define OBJ_setct_AuthResTBE OBJ_set_ctype,53L
2555
2556#define SN_setct_AuthResTBEX "setct-AuthResTBEX"
2557#define NID_setct_AuthResTBEX 572
2558#define OBJ_setct_AuthResTBEX OBJ_set_ctype,54L
2559
2560#define SN_setct_AuthTokenTBE "setct-AuthTokenTBE"
2561#define NID_setct_AuthTokenTBE 573
2562#define OBJ_setct_AuthTokenTBE OBJ_set_ctype,55L
2563
2564#define SN_setct_CapTokenTBE "setct-CapTokenTBE"
2565#define NID_setct_CapTokenTBE 574
2566#define OBJ_setct_CapTokenTBE OBJ_set_ctype,56L
2567
2568#define SN_setct_CapTokenTBEX "setct-CapTokenTBEX"
2569#define NID_setct_CapTokenTBEX 575
2570#define OBJ_setct_CapTokenTBEX OBJ_set_ctype,57L
2571
2572#define SN_setct_AcqCardCodeMsgTBE "setct-AcqCardCodeMsgTBE"
2573#define NID_setct_AcqCardCodeMsgTBE 576
2574#define OBJ_setct_AcqCardCodeMsgTBE OBJ_set_ctype,58L
2575
2576#define SN_setct_AuthRevReqTBE "setct-AuthRevReqTBE"
2577#define NID_setct_AuthRevReqTBE 577
2578#define OBJ_setct_AuthRevReqTBE OBJ_set_ctype,59L
2579
2580#define SN_setct_AuthRevResTBE "setct-AuthRevResTBE"
2581#define NID_setct_AuthRevResTBE 578
2582#define OBJ_setct_AuthRevResTBE OBJ_set_ctype,60L
2583
2584#define SN_setct_AuthRevResTBEB "setct-AuthRevResTBEB"
2585#define NID_setct_AuthRevResTBEB 579
2586#define OBJ_setct_AuthRevResTBEB OBJ_set_ctype,61L
2587
2588#define SN_setct_CapReqTBE "setct-CapReqTBE"
2589#define NID_setct_CapReqTBE 580
2590#define OBJ_setct_CapReqTBE OBJ_set_ctype,62L
2591
2592#define SN_setct_CapReqTBEX "setct-CapReqTBEX"
2593#define NID_setct_CapReqTBEX 581
2594#define OBJ_setct_CapReqTBEX OBJ_set_ctype,63L
2595
2596#define SN_setct_CapResTBE "setct-CapResTBE"
2597#define NID_setct_CapResTBE 582
2598#define OBJ_setct_CapResTBE OBJ_set_ctype,64L
2599
2600#define SN_setct_CapRevReqTBE "setct-CapRevReqTBE"
2601#define NID_setct_CapRevReqTBE 583
2602#define OBJ_setct_CapRevReqTBE OBJ_set_ctype,65L
2603
2604#define SN_setct_CapRevReqTBEX "setct-CapRevReqTBEX"
2605#define NID_setct_CapRevReqTBEX 584
2606#define OBJ_setct_CapRevReqTBEX OBJ_set_ctype,66L
2607
2608#define SN_setct_CapRevResTBE "setct-CapRevResTBE"
2609#define NID_setct_CapRevResTBE 585
2610#define OBJ_setct_CapRevResTBE OBJ_set_ctype,67L
2611
2612#define SN_setct_CredReqTBE "setct-CredReqTBE"
2613#define NID_setct_CredReqTBE 586
2614#define OBJ_setct_CredReqTBE OBJ_set_ctype,68L
2615
2616#define SN_setct_CredReqTBEX "setct-CredReqTBEX"
2617#define NID_setct_CredReqTBEX 587
2618#define OBJ_setct_CredReqTBEX OBJ_set_ctype,69L
2619
2620#define SN_setct_CredResTBE "setct-CredResTBE"
2621#define NID_setct_CredResTBE 588
2622#define OBJ_setct_CredResTBE OBJ_set_ctype,70L
2623
2624#define SN_setct_CredRevReqTBE "setct-CredRevReqTBE"
2625#define NID_setct_CredRevReqTBE 589
2626#define OBJ_setct_CredRevReqTBE OBJ_set_ctype,71L
2627
2628#define SN_setct_CredRevReqTBEX "setct-CredRevReqTBEX"
2629#define NID_setct_CredRevReqTBEX 590
2630#define OBJ_setct_CredRevReqTBEX OBJ_set_ctype,72L
2631
2632#define SN_setct_CredRevResTBE "setct-CredRevResTBE"
2633#define NID_setct_CredRevResTBE 591
2634#define OBJ_setct_CredRevResTBE OBJ_set_ctype,73L
2635
2636#define SN_setct_BatchAdminReqTBE "setct-BatchAdminReqTBE"
2637#define NID_setct_BatchAdminReqTBE 592
2638#define OBJ_setct_BatchAdminReqTBE OBJ_set_ctype,74L
2639
2640#define SN_setct_BatchAdminResTBE "setct-BatchAdminResTBE"
2641#define NID_setct_BatchAdminResTBE 593
2642#define OBJ_setct_BatchAdminResTBE OBJ_set_ctype,75L
2643
2644#define SN_setct_RegFormReqTBE "setct-RegFormReqTBE"
2645#define NID_setct_RegFormReqTBE 594
2646#define OBJ_setct_RegFormReqTBE OBJ_set_ctype,76L
2647
2648#define SN_setct_CertReqTBE "setct-CertReqTBE"
2649#define NID_setct_CertReqTBE 595
2650#define OBJ_setct_CertReqTBE OBJ_set_ctype,77L
2651
2652#define SN_setct_CertReqTBEX "setct-CertReqTBEX"
2653#define NID_setct_CertReqTBEX 596
2654#define OBJ_setct_CertReqTBEX OBJ_set_ctype,78L
2655
2656#define SN_setct_CertResTBE "setct-CertResTBE"
2657#define NID_setct_CertResTBE 597
2658#define OBJ_setct_CertResTBE OBJ_set_ctype,79L
2659
2660#define SN_setct_CRLNotificationTBS "setct-CRLNotificationTBS"
2661#define NID_setct_CRLNotificationTBS 598
2662#define OBJ_setct_CRLNotificationTBS OBJ_set_ctype,80L
2663
2664#define SN_setct_CRLNotificationResTBS "setct-CRLNotificationResTBS"
2665#define NID_setct_CRLNotificationResTBS 599
2666#define OBJ_setct_CRLNotificationResTBS OBJ_set_ctype,81L
2667
2668#define SN_setct_BCIDistributionTBS "setct-BCIDistributionTBS"
2669#define NID_setct_BCIDistributionTBS 600
2670#define OBJ_setct_BCIDistributionTBS OBJ_set_ctype,82L
2671
2672#define SN_setext_genCrypt "setext-genCrypt"
2673#define LN_setext_genCrypt "generic cryptogram"
2674#define NID_setext_genCrypt 601
2675#define OBJ_setext_genCrypt OBJ_set_msgExt,1L
2676
2677#define SN_setext_miAuth "setext-miAuth"
2678#define LN_setext_miAuth "merchant initiated auth"
2679#define NID_setext_miAuth 602
2680#define OBJ_setext_miAuth OBJ_set_msgExt,3L
2681
2682#define SN_setext_pinSecure "setext-pinSecure"
2683#define NID_setext_pinSecure 603
2684#define OBJ_setext_pinSecure OBJ_set_msgExt,4L
2685
2686#define SN_setext_pinAny "setext-pinAny"
2687#define NID_setext_pinAny 604
2688#define OBJ_setext_pinAny OBJ_set_msgExt,5L
2689
2690#define SN_setext_track2 "setext-track2"
2691#define NID_setext_track2 605
2692#define OBJ_setext_track2 OBJ_set_msgExt,7L
2693
2694#define SN_setext_cv "setext-cv"
2695#define LN_setext_cv "additional verification"
2696#define NID_setext_cv 606
2697#define OBJ_setext_cv OBJ_set_msgExt,8L
2698
2699#define SN_set_policy_root "set-policy-root"
2700#define NID_set_policy_root 607
2701#define OBJ_set_policy_root OBJ_set_policy,0L
2702
2703#define SN_setCext_hashedRoot "setCext-hashedRoot"
2704#define NID_setCext_hashedRoot 608
2705#define OBJ_setCext_hashedRoot OBJ_set_certExt,0L
2706
2707#define SN_setCext_certType "setCext-certType"
2708#define NID_setCext_certType 609
2709#define OBJ_setCext_certType OBJ_set_certExt,1L
2710
2711#define SN_setCext_merchData "setCext-merchData"
2712#define NID_setCext_merchData 610
2713#define OBJ_setCext_merchData OBJ_set_certExt,2L
2714
2715#define SN_setCext_cCertRequired "setCext-cCertRequired"
2716#define NID_setCext_cCertRequired 611
2717#define OBJ_setCext_cCertRequired OBJ_set_certExt,3L
2718
2719#define SN_setCext_tunneling "setCext-tunneling"
2720#define NID_setCext_tunneling 612
2721#define OBJ_setCext_tunneling OBJ_set_certExt,4L
2722
2723#define SN_setCext_setExt "setCext-setExt"
2724#define NID_setCext_setExt 613
2725#define OBJ_setCext_setExt OBJ_set_certExt,5L
2726
2727#define SN_setCext_setQualf "setCext-setQualf"
2728#define NID_setCext_setQualf 614
2729#define OBJ_setCext_setQualf OBJ_set_certExt,6L
2730
2731#define SN_setCext_PGWYcapabilities "setCext-PGWYcapabilities"
2732#define NID_setCext_PGWYcapabilities 615
2733#define OBJ_setCext_PGWYcapabilities OBJ_set_certExt,7L
2734
2735#define SN_setCext_TokenIdentifier "setCext-TokenIdentifier"
2736#define NID_setCext_TokenIdentifier 616
2737#define OBJ_setCext_TokenIdentifier OBJ_set_certExt,8L
2738
2739#define SN_setCext_Track2Data "setCext-Track2Data"
2740#define NID_setCext_Track2Data 617
2741#define OBJ_setCext_Track2Data OBJ_set_certExt,9L
2742
2743#define SN_setCext_TokenType "setCext-TokenType"
2744#define NID_setCext_TokenType 618
2745#define OBJ_setCext_TokenType OBJ_set_certExt,10L
2746
2747#define SN_setCext_IssuerCapabilities "setCext-IssuerCapabilities"
2748#define NID_setCext_IssuerCapabilities 619
2749#define OBJ_setCext_IssuerCapabilities OBJ_set_certExt,11L
2750
2751#define SN_setAttr_Cert "setAttr-Cert"
2752#define NID_setAttr_Cert 620
2753#define OBJ_setAttr_Cert OBJ_set_attr,0L
2754
2755#define SN_setAttr_PGWYcap "setAttr-PGWYcap"
2756#define LN_setAttr_PGWYcap "payment gateway capabilities"
2757#define NID_setAttr_PGWYcap 621
2758#define OBJ_setAttr_PGWYcap OBJ_set_attr,1L
2759
2760#define SN_setAttr_TokenType "setAttr-TokenType"
2761#define NID_setAttr_TokenType 622
2762#define OBJ_setAttr_TokenType OBJ_set_attr,2L
2763
2764#define SN_setAttr_IssCap "setAttr-IssCap"
2765#define LN_setAttr_IssCap "issuer capabilities"
2766#define NID_setAttr_IssCap 623
2767#define OBJ_setAttr_IssCap OBJ_set_attr,3L
2768
2769#define SN_set_rootKeyThumb "set-rootKeyThumb"
2770#define NID_set_rootKeyThumb 624
2771#define OBJ_set_rootKeyThumb OBJ_setAttr_Cert,0L
2772
2773#define SN_set_addPolicy "set-addPolicy"
2774#define NID_set_addPolicy 625
2775#define OBJ_set_addPolicy OBJ_setAttr_Cert,1L
2776
2777#define SN_setAttr_Token_EMV "setAttr-Token-EMV"
2778#define NID_setAttr_Token_EMV 626
2779#define OBJ_setAttr_Token_EMV OBJ_setAttr_TokenType,1L
2780
2781#define SN_setAttr_Token_B0Prime "setAttr-Token-B0Prime"
2782#define NID_setAttr_Token_B0Prime 627
2783#define OBJ_setAttr_Token_B0Prime OBJ_setAttr_TokenType,2L
2784
2785#define SN_setAttr_IssCap_CVM "setAttr-IssCap-CVM"
2786#define NID_setAttr_IssCap_CVM 628
2787#define OBJ_setAttr_IssCap_CVM OBJ_setAttr_IssCap,3L
2788
2789#define SN_setAttr_IssCap_T2 "setAttr-IssCap-T2"
2790#define NID_setAttr_IssCap_T2 629
2791#define OBJ_setAttr_IssCap_T2 OBJ_setAttr_IssCap,4L
2792
2793#define SN_setAttr_IssCap_Sig "setAttr-IssCap-Sig"
2794#define NID_setAttr_IssCap_Sig 630
2795#define OBJ_setAttr_IssCap_Sig OBJ_setAttr_IssCap,5L
2796
2797#define SN_setAttr_GenCryptgrm "setAttr-GenCryptgrm"
2798#define LN_setAttr_GenCryptgrm "generate cryptogram"
2799#define NID_setAttr_GenCryptgrm 631
2800#define OBJ_setAttr_GenCryptgrm OBJ_setAttr_IssCap_CVM,1L
2801
2802#define SN_setAttr_T2Enc "setAttr-T2Enc"
2803#define LN_setAttr_T2Enc "encrypted track 2"
2804#define NID_setAttr_T2Enc 632
2805#define OBJ_setAttr_T2Enc OBJ_setAttr_IssCap_T2,1L
2806
2807#define SN_setAttr_T2cleartxt "setAttr-T2cleartxt"
2808#define LN_setAttr_T2cleartxt "cleartext track 2"
2809#define NID_setAttr_T2cleartxt 633
2810#define OBJ_setAttr_T2cleartxt OBJ_setAttr_IssCap_T2,2L
2811
2812#define SN_setAttr_TokICCsig "setAttr-TokICCsig"
2813#define LN_setAttr_TokICCsig "ICC or token signature"
2814#define NID_setAttr_TokICCsig 634
2815#define OBJ_setAttr_TokICCsig OBJ_setAttr_IssCap_Sig,1L
2816
2817#define SN_setAttr_SecDevSig "setAttr-SecDevSig"
2818#define LN_setAttr_SecDevSig "secure device signature"
2819#define NID_setAttr_SecDevSig 635
2820#define OBJ_setAttr_SecDevSig OBJ_setAttr_IssCap_Sig,2L
2821
2822#define SN_set_brand_IATA_ATA "set-brand-IATA-ATA"
2823#define NID_set_brand_IATA_ATA 636
2824#define OBJ_set_brand_IATA_ATA OBJ_set_brand,1L
2825
2826#define SN_set_brand_Diners "set-brand-Diners"
2827#define NID_set_brand_Diners 637
2828#define OBJ_set_brand_Diners OBJ_set_brand,30L
2829
2830#define SN_set_brand_AmericanExpress "set-brand-AmericanExpress"
2831#define NID_set_brand_AmericanExpress 638
2832#define OBJ_set_brand_AmericanExpress OBJ_set_brand,34L
2833
2834#define SN_set_brand_JCB "set-brand-JCB"
2835#define NID_set_brand_JCB 639
2836#define OBJ_set_brand_JCB OBJ_set_brand,35L
2837
2838#define SN_set_brand_Visa "set-brand-Visa"
2839#define NID_set_brand_Visa 640
2840#define OBJ_set_brand_Visa OBJ_set_brand,4L
2841
2842#define SN_set_brand_MasterCard "set-brand-MasterCard"
2843#define NID_set_brand_MasterCard 641
2844#define OBJ_set_brand_MasterCard OBJ_set_brand,5L
2845
2846#define SN_set_brand_Novus "set-brand-Novus"
2847#define NID_set_brand_Novus 642
2848#define OBJ_set_brand_Novus OBJ_set_brand,6011L
2849
2850#define SN_des_cdmf "DES-CDMF"
2851#define LN_des_cdmf "des-cdmf"
2852#define NID_des_cdmf 643
2853#define OBJ_des_cdmf OBJ_rsadsi,3L,10L
2854
2855#define SN_rsaOAEPEncryptionSET "rsaOAEPEncryptionSET"
2856#define NID_rsaOAEPEncryptionSET 644
2857#define OBJ_rsaOAEPEncryptionSET OBJ_rsadsi,1L,1L,6L
2858
diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl
index b4da364bbf..519d8a5867 100644
--- a/src/lib/libcrypto/perlasm/x86nasm.pl
+++ b/src/lib/libcrypto/perlasm/x86nasm.pl
@@ -209,7 +209,7 @@ sub using486
209 209
210sub main'file 210sub main'file
211 { 211 {
212 push(@out, "segment .text\n"); 212 push(@out, "segment .text use32\n");
213 } 213 }
214 214
215sub main'function_begin 215sub main'function_begin
diff --git a/src/lib/libcrypto/pkcs7/verify.c b/src/lib/libcrypto/pkcs7/verify.c
index 5f7afe8933..b40f26032e 100644
--- a/src/lib/libcrypto/pkcs7/verify.c
+++ b/src/lib/libcrypto/pkcs7/verify.c
@@ -179,10 +179,11 @@ char *argv[];
179 { 179 {
180 ASN1_UTCTIME *tm; 180 ASN1_UTCTIME *tm;
181 char *str1,*str2; 181 char *str1,*str2;
182 int rc;
182 183
183 si=sk_PKCS7_SIGNER_INFO_value(sk,i); 184 si=sk_PKCS7_SIGNER_INFO_value(sk,i);
184 i=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si); 185 rc=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
185 if (i <= 0) 186 if (rc <= 0)
186 goto err; 187 goto err;
187 printf("signer info\n"); 188 printf("signer info\n");
188 if ((tm=get_signed_time(si)) != NULL) 189 if ((tm=get_signed_time(si)) != NULL)
diff --git a/src/lib/libcrypto/rand/rand_egd.c b/src/lib/libcrypto/rand/rand_egd.c
index 97ed12cf67..abc3ac27d5 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(OPENSSL_SYS_VMS) 97#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(__DJGPP__)
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/rand/rand_unix.c b/src/lib/libcrypto/rand/rand_unix.c
index 5a78009e9a..ec09d74603 100644
--- a/src/lib/libcrypto/rand/rand_unix.c
+++ b/src/lib/libcrypto/rand/rand_unix.c
@@ -109,6 +109,8 @@
109 * 109 *
110 */ 110 */
111 111
112#define USE_SOCKETS
113#include "e_os.h"
112#include "cryptlib.h" 114#include "cryptlib.h"
113#include <openssl/rand.h> 115#include <openssl/rand.h>
114#include "rand_lcl.h" 116#include "rand_lcl.h"
diff --git a/src/lib/libcrypto/symhacks.h b/src/lib/libcrypto/symhacks.h
index de0f452b47..774162fec9 100644
--- a/src/lib/libcrypto/symhacks.h
+++ b/src/lib/libcrypto/symhacks.h
@@ -247,7 +247,7 @@
247 247
248 248
249/* Case insensiteve linking causes problems.... */ 249/* Case insensiteve linking causes problems.... */
250#if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_VMS) 250#if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2)
251#undef ERR_load_CRYPTO_strings 251#undef ERR_load_CRYPTO_strings
252#define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings 252#define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings
253#undef OCSP_crlID_new 253#undef OCSP_crlID_new
diff --git a/src/lib/libcrypto/util/dirname.pl b/src/lib/libcrypto/util/dirname.pl
new file mode 100644
index 0000000000..d7a66d96ac
--- /dev/null
+++ b/src/lib/libcrypto/util/dirname.pl
@@ -0,0 +1,18 @@
1#!/usr/local/bin/perl
2
3if ($#ARGV < 0) {
4 die "dirname.pl: too few arguments\n";
5} elsif ($#ARGV > 0) {
6 die "dirname.pl: too many arguments\n";
7}
8
9my $d = $ARGV[0];
10
11if ($d =~ m|.*/.*|) {
12 $d =~ s|/[^/]*$||;
13} else {
14 $d = ".";
15}
16
17print $d,"\n";
18exit(0);
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..512185e257 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -701,7 +701,7 @@ bn_mul_words 707 EXIST::FUNCTION:
701BN_uadd 708 EXIST::FUNCTION: 701BN_uadd 708 EXIST::FUNCTION:
702BN_usub 709 EXIST::FUNCTION: 702BN_usub 709 EXIST::FUNCTION:
703bn_sqr_words 710 EXIST::FUNCTION: 703bn_sqr_words 710 EXIST::FUNCTION:
704_ossl_old_crypt 711 EXIST:!NeXT,!PERL5,!__FreeBSD__:FUNCTION:DES 704_ossl_old_crypt 711 EXIST:!NeXT,!PERL5:FUNCTION:DES
705d2i_ASN1_BIT_STRING 712 EXIST::FUNCTION: 705d2i_ASN1_BIT_STRING 712 EXIST::FUNCTION:
706d2i_ASN1_BOOLEAN 713 EXIST::FUNCTION: 706d2i_ASN1_BOOLEAN 713 EXIST::FUNCTION:
707d2i_ASN1_HEADER 714 EXIST::FUNCTION: 707d2i_ASN1_HEADER 714 EXIST::FUNCTION:
@@ -984,8 +984,8 @@ BIO_ghbn_ctrl 1003 EXIST::FUNCTION:
984CRYPTO_free_ex_data 1004 EXIST::FUNCTION: 984CRYPTO_free_ex_data 1004 EXIST::FUNCTION:
985CRYPTO_get_ex_data 1005 EXIST::FUNCTION: 985CRYPTO_get_ex_data 1005 EXIST::FUNCTION:
986CRYPTO_set_ex_data 1007 EXIST::FUNCTION: 986CRYPTO_set_ex_data 1007 EXIST::FUNCTION:
987ERR_load_CRYPTO_strings 1009 EXIST:!VMS,!WIN16:FUNCTION: 987ERR_load_CRYPTO_strings 1009 EXIST:!OS2,!VMS,!WIN16:FUNCTION:
988ERR_load_CRYPTOlib_strings 1009 EXIST:VMS,WIN16:FUNCTION: 988ERR_load_CRYPTOlib_strings 1009 EXIST:OS2,VMS,WIN16:FUNCTION:
989EVP_PKEY_bits 1010 EXIST::FUNCTION: 989EVP_PKEY_bits 1010 EXIST::FUNCTION:
990MD5_Transform 1011 EXIST::FUNCTION:MD5 990MD5_Transform 1011 EXIST::FUNCTION:MD5
991SHA1_Transform 1012 EXIST::FUNCTION:SHA,SHA1 991SHA1_Transform 1012 EXIST::FUNCTION:SHA,SHA1
@@ -1216,7 +1216,7 @@ name_cmp 1239 EXIST::FUNCTION:
1216str_dup 1240 NOEXIST::FUNCTION: 1216str_dup 1240 NOEXIST::FUNCTION:
1217i2s_ASN1_ENUMERATED 1241 EXIST::FUNCTION: 1217i2s_ASN1_ENUMERATED 1241 EXIST::FUNCTION:
1218i2s_ASN1_ENUMERATED_TABLE 1242 EXIST::FUNCTION: 1218i2s_ASN1_ENUMERATED_TABLE 1242 EXIST::FUNCTION:
1219BIO_s_log 1243 EXIST:!WIN16,!WIN32,!macintosh:FUNCTION: 1219BIO_s_log 1243 EXIST:!OS2,!WIN16,!WIN32,!macintosh:FUNCTION:
1220BIO_f_reliable 1244 EXIST::FUNCTION:BIO 1220BIO_f_reliable 1244 EXIST::FUNCTION:BIO
1221PKCS7_dataFinal 1245 EXIST::FUNCTION: 1221PKCS7_dataFinal 1245 EXIST::FUNCTION:
1222PKCS7_dataDecode 1246 EXIST::FUNCTION: 1222PKCS7_dataDecode 1246 EXIST::FUNCTION:
@@ -2732,8 +2732,8 @@ EC_POINT_point2oct 3178 EXIST::FUNCTION:EC
2732KRB5_APREQ_free 3179 EXIST::FUNCTION: 2732KRB5_APREQ_free 3179 EXIST::FUNCTION:
2733ASN1_OBJECT_it 3180 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2733ASN1_OBJECT_it 3180 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2734ASN1_OBJECT_it 3180 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2734ASN1_OBJECT_it 3180 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2735OCSP_crlID_new 3181 EXIST:!VMS,!WIN16:FUNCTION: 2735OCSP_crlID_new 3181 EXIST:!OS2,!VMS,!WIN16:FUNCTION:
2736OCSP_crlID2_new 3181 EXIST:VMS,WIN16:FUNCTION: 2736OCSP_crlID2_new 3181 EXIST:OS2,VMS,WIN16:FUNCTION:
2737CONF_modules_load_file 3182 EXIST::FUNCTION: 2737CONF_modules_load_file 3182 EXIST::FUNCTION:
2738CONF_imodule_set_usr_data 3183 EXIST::FUNCTION: 2738CONF_imodule_set_usr_data 3183 EXIST::FUNCTION:
2739ENGINE_set_default_string 3184 EXIST::FUNCTION: 2739ENGINE_set_default_string 3184 EXIST::FUNCTION:
@@ -2774,3 +2774,21 @@ 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
2783CONF_modules_free 3226 EXIST::FUNCTION:
2784NCONF_default 3227 EXIST::FUNCTION:
2785OPENSSL_no_config 3228 EXIST::FUNCTION:
2786NCONF_WIN32 3229 EXIST::FUNCTION:
2787ASN1_UNIVERSALSTRING_new 3230 EXIST::FUNCTION:
2788EVP_des_ede_ecb 3231 EXIST::FUNCTION:DES
2789i2d_ASN1_UNIVERSALSTRING 3232 EXIST::FUNCTION:
2790ASN1_UNIVERSALSTRING_free 3233 EXIST::FUNCTION:
2791ASN1_UNIVERSALSTRING_it 3234 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2792ASN1_UNIVERSALSTRING_it 3234 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2793d2i_ASN1_UNIVERSALSTRING 3235 EXIST::FUNCTION:
2794EVP_des_ede3_ecb 3236 EXIST::FUNCTION:DES
diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl
index 8b6b2e668a..c9271bbffe 100644
--- a/src/lib/libcrypto/util/mk1mf.pl
+++ b/src/lib/libcrypto/util/mk1mf.pl
@@ -100,7 +100,7 @@ $out_def="out";
100$inc_def="outinc"; 100$inc_def="outinc";
101$tmp_def="tmp"; 101$tmp_def="tmp";
102 102
103$mkdir="mkdir"; 103$mkdir="-mkdir";
104 104
105($ssl,$crypto)=("ssl","crypto"); 105($ssl,$crypto)=("ssl","crypto");
106$ranlib="echo ranlib"; 106$ranlib="echo ranlib";
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl
index 071036a6d2..adfd447dd3 100644
--- a/src/lib/libcrypto/util/mkdef.pl
+++ b/src/lib/libcrypto/util/mkdef.pl
@@ -43,8 +43,8 @@
43# EXPORT_VAR_AS_FUNCTION). This script assumes renaming of symbols is found 43# EXPORT_VAR_AS_FUNCTION). This script assumes renaming of symbols is found
44# in the file crypto/symhacks.h. 44# in the file crypto/symhacks.h.
45# The semantics for the platforms is that every item is checked against the 45# The semantics for the platforms is that every item is checked against the
46# enviroment. For the negative items ("!FOO"), if any of them is false 46# environment. For the negative items ("!FOO"), if any of them is false
47# (i.e. "FOO" is true) in the enviroment, the corresponding symbol can't be 47# (i.e. "FOO" is true) in the environment, the corresponding symbol can't be
48# used. For the positive itms, if all of them are false in the environment, 48# used. For the positive itms, if all of them are false in the environment,
49# the corresponding symbol can't be used. Any combination of positive and 49# the corresponding symbol can't be used. Any combination of positive and
50# negative items are possible, and of course leave room for some redundancy. 50# negative items are possible, and of course leave room for some redundancy.
@@ -58,6 +58,7 @@ my $debug=0;
58 58
59my $crypto_num= "util/libeay.num"; 59my $crypto_num= "util/libeay.num";
60my $ssl_num= "util/ssleay.num"; 60my $ssl_num= "util/ssleay.num";
61my $libname;
61 62
62my $do_update = 0; 63my $do_update = 0;
63my $do_rewrite = 1; 64my $do_rewrite = 1;
@@ -73,12 +74,13 @@ my $VMS=0;
73my $W32=0; 74my $W32=0;
74my $W16=0; 75my $W16=0;
75my $NT=0; 76my $NT=0;
77my $OS2=0;
76# Set this to make typesafe STACK definitions appear in DEF 78# Set this to make typesafe STACK definitions appear in DEF
77my $safe_stack_def = 0; 79my $safe_stack_def = 0;
78 80
79my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", 81my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
80 "EXPORT_VAR_AS_FUNCTION" ); 82 "EXPORT_VAR_AS_FUNCTION" );
81my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT" ); 83my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
82my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", 84my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
83 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", 85 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
84 "RIPEMD", 86 "RIPEMD",
@@ -126,11 +128,18 @@ foreach (@ARGV, split(/ /, $options))
126 $VMSAlpha=1; 128 $VMSAlpha=1;
127 } 129 }
128 $VMS=1 if $_ eq "VMS"; 130 $VMS=1 if $_ eq "VMS";
131 $OS2=1 if $_ eq "OS2";
129 132
130 $do_ssl=1 if $_ eq "ssleay"; 133 $do_ssl=1 if $_ eq "ssleay";
131 $do_ssl=1 if $_ eq "ssl"; 134 if ($_ eq "ssl") {
135 $do_ssl=1;
136 $libname=$_
137 }
132 $do_crypto=1 if $_ eq "libeay"; 138 $do_crypto=1 if $_ eq "libeay";
133 $do_crypto=1 if $_ eq "crypto"; 139 if ($_ eq "crypto") {
140 $do_crypto=1;
141 $libname=$_;
142 }
134 $do_update=1 if $_ eq "update"; 143 $do_update=1 if $_ eq "update";
135 $do_rewrite=1 if $_ eq "rewrite"; 144 $do_rewrite=1 if $_ eq "rewrite";
136 $do_ctest=1 if $_ eq "ctest"; 145 $do_ctest=1 if $_ eq "ctest";
@@ -170,8 +179,17 @@ foreach (@ARGV, split(/ /, $options))
170 } 179 }
171 180
172 181
182if (!$libname) {
183 if ($do_ssl) {
184 $libname="SSLEAY";
185 }
186 if ($do_crypto) {
187 $libname="LIBEAY";
188 }
189}
190
173# If no platform is given, assume WIN32 191# If no platform is given, assume WIN32
174if ($W32 + $W16 + $VMS == 0) { 192if ($W32 + $W16 + $VMS + $OS2 == 0) {
175 $W32 = 1; 193 $W32 = 1;
176} 194}
177 195
@@ -182,7 +200,7 @@ if ($W16) {
182 200
183if (!$do_ssl && !$do_crypto) 201if (!$do_ssl && !$do_crypto)
184 { 202 {
185 print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT ]\n"; 203 print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT | OS2 ]\n";
186 exit(1); 204 exit(1);
187 } 205 }
188 206
@@ -305,10 +323,10 @@ EOF
305 323
306} else { 324} else {
307 325
308 &print_def_file(*STDOUT,"SSLEAY",*ssl_list,@ssl_symbols) 326 &print_def_file(*STDOUT,$libname,*ssl_list,@ssl_symbols)
309 if $do_ssl == 1; 327 if $do_ssl == 1;
310 328
311 &print_def_file(*STDOUT,"LIBEAY",*crypto_list,@crypto_symbols) 329 &print_def_file(*STDOUT,$libname,*crypto_list,@crypto_symbols)
312 if $do_crypto == 1; 330 if $do_crypto == 1;
313 331
314} 332}
@@ -995,6 +1013,7 @@ sub is_valid
995 if ($keyword eq "WIN32" && $W32) { return 1; } 1013 if ($keyword eq "WIN32" && $W32) { return 1; }
996 if ($keyword eq "WIN16" && $W16) { return 1; } 1014 if ($keyword eq "WIN16" && $W16) { return 1; }
997 if ($keyword eq "WINNT" && $NT) { return 1; } 1015 if ($keyword eq "WINNT" && $NT) { return 1; }
1016 if ($keyword eq "OS2" && $OS2) { return 1; }
998 # Special platforms: 1017 # Special platforms:
999 # EXPORT_VAR_AS_FUNCTION means that global variables 1018 # EXPORT_VAR_AS_FUNCTION means that global variables
1000 # will be represented as functions. This currently 1019 # will be represented as functions. This currently
@@ -1092,24 +1111,27 @@ sub print_def_file
1092{ 1111{
1093 (*OUT,my $name,*nums,my @symbols)=@_; 1112 (*OUT,my $name,*nums,my @symbols)=@_;
1094 my $n = 1; my @e; my @r; my @v; my $prev=""; 1113 my $n = 1; my @e; my @r; my @v; my $prev="";
1114 my $liboptions="";
1095 1115
1096 if ($W32) 1116 if ($W32)
1097 { $name.="32"; } 1117 { $name.="32"; }
1098 else 1118 elsif ($W16)
1099 { $name.="16"; } 1119 { $name.="16"; }
1120 elsif ($OS2)
1121 { $liboptions = "INITINSTANCE\nDATA NONSHARED"; }
1100 1122
1101 print OUT <<"EOF"; 1123 print OUT <<"EOF";
1102; 1124;
1103; Definition file for the DLL version of the $name library from OpenSSL 1125; Definition file for the DLL version of the $name library from OpenSSL
1104; 1126;
1105 1127
1106LIBRARY $name 1128LIBRARY $name $liboptions
1107 1129
1108DESCRIPTION 'OpenSSL $name - http://www.openssl.org/' 1130DESCRIPTION 'OpenSSL $name - http://www.openssl.org/'
1109 1131
1110EOF 1132EOF
1111 1133
1112 if (!$W32) { 1134 if ($W16) {
1113 print <<"EOF"; 1135 print <<"EOF";
1114CODE PRELOAD MOVEABLE 1136CODE PRELOAD MOVEABLE
1115DATA PRELOAD MOVEABLE SINGLE 1137DATA PRELOAD MOVEABLE SINGLE
@@ -1148,10 +1170,10 @@ EOF
1148 print STDERR "Warning: Symbol '",$s2,"' redefined. old=",($nums{$prev} =~ /^(.*?)\\/,$1),", new=",($nums{$s2} =~ /^(.*?)\\/,$1),"\n"; 1170 print STDERR "Warning: Symbol '",$s2,"' redefined. old=",($nums{$prev} =~ /^(.*?)\\/,$1),", new=",($nums{$s2} =~ /^(.*?)\\/,$1),"\n";
1149 } 1171 }
1150 $prev = $s2; # To warn about duplicates... 1172 $prev = $s2; # To warn about duplicates...
1151 if($v) { 1173 if($v && !$OS2) {
1152 printf OUT " %s%-39s @%-8d DATA\n",($W32)?"":"_",$s2,$n; 1174 printf OUT " %s%-39s @%-8d DATA\n",($W32)?"":"_",$s2,$n;
1153 } else { 1175 } else {
1154 printf OUT " %s%-39s @%d\n",($W32)?"":"_",$s2,$n; 1176 printf OUT " %s%-39s @%d\n",($W32||$OS2)?"":"_",$s2,$n;
1155 } 1177 }
1156 } 1178 }
1157 } 1179 }
diff --git a/src/lib/libcrypto/util/mklink.pl b/src/lib/libcrypto/util/mklink.pl
index 9e9c9a5146..9386da7aa4 100644
--- a/src/lib/libcrypto/util/mklink.pl
+++ b/src/lib/libcrypto/util/mklink.pl
@@ -18,10 +18,10 @@
18my $from = shift; 18my $from = shift;
19my @files = @ARGV; 19my @files = @ARGV;
20 20
21my @from_path = split(/\//, $from); 21my @from_path = split(/[\\\/]/, $from);
22my $pwd = `pwd`; 22my $pwd = `pwd`;
23chop($pwd); 23chop($pwd);
24my @pwd_path = split(/\//, $pwd); 24my @pwd_path = split(/[\\\/]/, $pwd);
25 25
26my @to_path = (); 26my @to_path = ();
27 27
@@ -54,7 +54,16 @@ foreach $file (@files) {
54 if ($symlink_exists) { 54 if ($symlink_exists) {
55 symlink("$to/$file", "$from/$file") or $err = " [$!]"; 55 symlink("$to/$file", "$from/$file") or $err = " [$!]";
56 } else { 56 } else {
57 system ("cp", "$file", "$from/$file") and $err = " [$!]"; 57 unlink "$from/$file";
58 open (OLD, "<$file") or die "Can't open $file: $!";
59 open (NEW, ">$from/$file") or die "Can't open $from/$file: $!";
60 binmode(OLD);
61 binmode(NEW);
62 while (<OLD>) {
63 print NEW $_;
64 }
65 close (OLD) or die "Can't close $file: $!";
66 close (NEW) or die "Can't close $from/$file: $!";
58 } 67 }
59 print $file . " => $from/$file$err\n"; 68 print $file . " => $from/$file$err\n";
60} 69}
diff --git a/src/lib/libcrypto/util/pl/BC-32.pl b/src/lib/libcrypto/util/pl/BC-32.pl
index 78d60616a6..bd7a9d9301 100644
--- a/src/lib/libcrypto/util/pl/BC-32.pl
+++ b/src/lib/libcrypto/util/pl/BC-32.pl
@@ -18,7 +18,7 @@ $out_def="out32";
18$tmp_def="tmp32"; 18$tmp_def="tmp32";
19$inc_def="inc32"; 19$inc_def="inc32";
20#enable max error messages, disable most common warnings 20#enable max error messages, disable most common warnings
21$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 "; 21$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp ";
22if ($debug) 22if ($debug)
23{ 23{
24 $cflags.="-Od -y -v -vi- -D_DEBUG"; 24 $cflags.="-Od -y -v -vi- -D_DEBUG";
@@ -51,9 +51,9 @@ $lfile='';
51$shlib_ex_obj=""; 51$shlib_ex_obj="";
52$app_ex_obj="c0x32.obj"; 52$app_ex_obj="c0x32.obj";
53 53
54$asm='n_o_T_a_s_m'; 54$asm='nasmw';
55$asm.=" /Zi" if $debug; 55$asm.=" /Zi" if $debug;
56$afile='/Fo'; 56$afile='-f obj -o';
57 57
58$bn_mulw_obj=''; 58$bn_mulw_obj='';
59$bn_mulw_src=''; 59$bn_mulw_src='';
@@ -64,24 +64,24 @@ $bf_enc_src='';
64 64
65if (!$no_asm) 65if (!$no_asm)
66 { 66 {
67 $bn_mulw_obj='crypto\bn\asm\bn-win32.obj'; 67 $bn_mulw_obj='crypto\bn\asm\bn_win32.obj';
68 $bn_mulw_src='crypto\bn\asm\bn-win32.asm'; 68 $bn_mulw_src='crypto\bn\asm\bn_win32.asm';
69 $des_enc_obj='crypto\des\asm\d-win32.obj crypto\des\asm\y-win32.obj'; 69 $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';
70 $des_enc_src='crypto\des\asm\d-win32.asm crypto\des\asm\y-win32.asm'; 70 $des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';
71 $bf_enc_obj='crypto\bf\asm\b-win32.obj'; 71 $bf_enc_obj='crypto\bf\asm\b_win32.obj';
72 $bf_enc_src='crypto\bf\asm\b-win32.asm'; 72 $bf_enc_src='crypto\bf\asm\b_win32.asm';
73 $cast_enc_obj='crypto\cast\asm\c-win32.obj'; 73 $cast_enc_obj='crypto\cast\asm\c_win32.obj';
74 $cast_enc_src='crypto\cast\asm\c-win32.asm'; 74 $cast_enc_src='crypto\cast\asm\c_win32.asm';
75 $rc4_enc_obj='crypto\rc4\asm\r4-win32.obj'; 75 $rc4_enc_obj='crypto\rc4\asm\r4_win32.obj';
76 $rc4_enc_src='crypto\rc4\asm\r4-win32.asm'; 76 $rc4_enc_src='crypto\rc4\asm\r4_win32.asm';
77 $rc5_enc_obj='crypto\rc5\asm\r5-win32.obj'; 77 $rc5_enc_obj='crypto\rc5\asm\r5_win32.obj';
78 $rc5_enc_src='crypto\rc5\asm\r5-win32.asm'; 78 $rc5_enc_src='crypto\rc5\asm\r5_win32.asm';
79 $md5_asm_obj='crypto\md5\asm\m5-win32.obj'; 79 $md5_asm_obj='crypto\md5\asm\m5_win32.obj';
80 $md5_asm_src='crypto\md5\asm\m5-win32.asm'; 80 $md5_asm_src='crypto\md5\asm\m5_win32.asm';
81 $sha1_asm_obj='crypto\sha\asm\s1-win32.obj'; 81 $sha1_asm_obj='crypto\sha\asm\s1_win32.obj';
82 $sha1_asm_src='crypto\sha\asm\s1-win32.asm'; 82 $sha1_asm_src='crypto\sha\asm\s1_win32.asm';
83 $rmd160_asm_obj='crypto\ripemd\asm\rm-win32.obj'; 83 $rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';
84 $rmd160_asm_src='crypto\ripemd\asm\rm-win32.asm'; 84 $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';
85 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; 85 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
86 } 86 }
87 87
diff --git a/src/lib/libcrypto/util/pl/OS2-EMX.pl b/src/lib/libcrypto/util/pl/OS2-EMX.pl
index 57180556ca..d695dda623 100644
--- a/src/lib/libcrypto/util/pl/OS2-EMX.pl
+++ b/src/lib/libcrypto/util/pl/OS2-EMX.pl
@@ -10,18 +10,20 @@ $rm='rm -f';
10# C compiler stuff 10# C compiler stuff
11 11
12$cc='gcc'; 12$cc='gcc';
13$cflags="-DL_ENDIAN -O3 -fomit-frame-pointer -m486 -Zmt -Wall "; 13$cflags="-DL_ENDIAN -O3 -fomit-frame-pointer -m486 -Zmtd -Wall ";
14$cflags.="-Zomf " if $shlib;
15$shl_cflag="-Zdll";
14 16
15if ($debug) { 17if ($debug) {
16 $cflags.="-g "; 18 $cflags.="-g ";
17} 19}
18 20
19$obj='.o'; 21$obj=$shlib ? '.obj' : '.o';
20$ofile='-o '; 22$ofile='-o ';
21 23
22# EXE linking stuff 24# EXE linking stuff
23$link='${CC}'; 25$link='${CC}';
24$lflags='${CFLAGS} -Zbsd-signals'; 26$lflags='${CFLAGS} -Zbsd-signals -s';
25$efile='-o '; 27$efile='-o ';
26$exep='.exe'; 28$exep='.exe';
27$ex_libs="-lsocket"; 29$ex_libs="-lsocket";
@@ -30,12 +32,12 @@ $ex_libs="-lsocket";
30$mklib='ar r'; 32$mklib='ar r';
31$mlflags=''; 33$mlflags='';
32$ranlib="ar s"; 34$ranlib="ar s";
33$plib='lib'; 35$plib='';
34$libp=".a"; 36$libp=$shlib ? ".lib" : ".a";
35$shlibp=".a"; 37$shlibp=$shlib ? ".dll" : ".a";
36$lfile=''; 38$lfile='';
37 39
38$asm='as'; 40$asm=$shlib ? 'as -Zomf' : 'as';
39$afile='-o '; 41$afile='-o ';
40$bn_asm_obj=""; 42$bn_asm_obj="";
41$bn_asm_src=""; 43$bn_asm_src="";
@@ -46,24 +48,32 @@ $bf_enc_src="";
46 48
47if (!$no_asm) 49if (!$no_asm)
48 { 50 {
49 $bn_asm_obj='crypto\bn\asm\bn-os2.o crypto\bn\asm\co-os2.o'; 51 $bn_asm_obj="crypto\\bn\\asm\\bn-os2$obj crypto\\bn\\asm\\co-os2$obj";
50 $bn_asm_src='crypto\bn\asm\bn-os2.asm crypto\bn\asm\co-os2.asm'; 52 $bn_asm_src="crypto\\bn\\asm\\bn-os2.asm crypto\\bn\\asm\\co-os2.asm";
51 $des_enc_obj='crypto\des\asm\d-os2.o crypto\des\asm\y-os2.o'; 53 $des_enc_obj="crypto\\des\\asm\\d-os2$obj crypto\\des\\asm\\y-os2$obj";
52 $des_enc_src='crypto\des\asm\d-os2.asm crypto\des\asm\y-os2.asm'; 54 $des_enc_src="crypto\\des\\asm\\d-os2.asm crypto\\des\\asm\\y-os2.asm";
53 $bf_enc_obj='crypto\bf\asm\b-os2.o'; 55 $bf_enc_obj="crypto\\bf\\asm\\b-os2$obj";
54 $bf_enc_src='crypto\bf\asm\b-os2.asm'; 56 $bf_enc_src="crypto\\bf\\asm\\b-os2.asm";
55 $cast_enc_obj='crypto\cast\asm\c-os2.o'; 57 $cast_enc_obj="crypto\\cast\\asm\\c-os2$obj";
56 $cast_enc_src='crypto\cast\asm\c-os2.asm'; 58 $cast_enc_src="crypto\\cast\\asm\\c-os2.asm";
57 $rc4_enc_obj='crypto\rc4\asm\r4-os2.o'; 59 $rc4_enc_obj="crypto\\rc4\\asm\\r4-os2$obj";
58 $rc4_enc_src='crypto\rc4\asm\r4-os2.asm'; 60 $rc4_enc_src="crypto\\rc4\\asm\\r4-os2.asm";
59 $rc5_enc_obj='crypto\rc5\asm\r5-os2.o'; 61 $rc5_enc_obj="crypto\\rc5\\asm\\r5-os2$obj";
60 $rc5_enc_src='crypto\rc5\asm\r5-os2.asm'; 62 $rc5_enc_src="crypto\\rc5\\asm\\r5-os2.asm";
61 $md5_asm_obj='crypto\md5\asm\m5-os2.o'; 63 $md5_asm_obj="crypto\\md5\\asm\\m5-os2$obj";
62 $md5_asm_src='crypto\md5\asm\m5-os2.asm'; 64 $md5_asm_src="crypto\\md5\\asm\\m5-os2.asm";
63 $sha1_asm_obj='crypto\sha\asm\s1-os2.o'; 65 $sha1_asm_obj="crypto\\sha\\asm\\s1-os2$obj";
64 $sha1_asm_src='crypto\sha\asm\s1-os2.asm'; 66 $sha1_asm_src="crypto\\sha\\asm\\s1-os2.asm";
65 $rmd160_asm_obj='crypto\ripemd\asm\rm-os2.o'; 67 $rmd160_asm_obj="crypto\\ripemd\\asm\\rm-os2$obj";
66 $rmd160_asm_src='crypto\ripemd\asm\rm-os2.asm'; 68 $rmd160_asm_src="crypto\\ripemd\\asm\\rm-os2.asm";
69 }
70
71if ($shlib)
72 {
73 $mlflags.=" $lflags -Zdll";
74 $lib_cflag=" -D_DLL";
75 $out_def="out_dll";
76 $tmp_def="tmp_dll";
67 } 77 }
68 78
69sub do_lib_rule 79sub do_lib_rule
@@ -76,9 +86,20 @@ sub do_lib_rule
76 ($Name=$name) =~ tr/a-z/A-Z/; 86 ($Name=$name) =~ tr/a-z/A-Z/;
77 87
78 $ret.="$target: \$(${Name}OBJ)\n"; 88 $ret.="$target: \$(${Name}OBJ)\n";
79 $ret.="\t\$(RM) $target\n"; 89 if (!$shlib)
80 $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n"; 90 {
81 $ret.="\t\$(RANLIB) $target\n\n"; 91 $ret.="\t\$(RM) $target\n";
92 $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
93 $ret.="\t\$(RANLIB) $target\n\n";
94 }
95 else
96 {
97 local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
98 $ex.=' -lsocket';
99 $ret.="\t\$(LINK) \$(SHLIB_CFLAGS) \$(MLFLAGS) $efile$target \$(SHLIB_EX_OBJ) \$(${Name}OBJ) $ex os2/${Name}.def\n";
100 $ret.="\temximp -o $out_def/$name.a os2/${Name}.def\n";
101 $ret.="\temximp -o $out_def/$name.lib os2/${Name}.def\n\n";
102 }
82 } 103 }
83 104
84sub do_link_rule 105sub do_link_rule
@@ -89,7 +110,7 @@ sub do_link_rule
89 $file =~ s/\//$o/g if $o ne '/'; 110 $file =~ s/\//$o/g if $o ne '/';
90 $n=&bname($target); 111 $n=&bname($target);
91 $ret.="$target: $files $dep_libs\n"; 112 $ret.="$target: $files $dep_libs\n";
92 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n"; 113 $ret.="\t\$(LINK) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n\n";
93 return($ret); 114 return($ret);
94 } 115 }
95 116
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl
index 50bfb34385..d6e3a11530 100644
--- a/src/lib/libcrypto/util/pl/VC-32.pl
+++ b/src/lib/libcrypto/util/pl/VC-32.pl
@@ -66,24 +66,24 @@ $bf_enc_src='';
66 66
67if (!$no_asm) 67if (!$no_asm)
68 { 68 {
69 $bn_asm_obj='crypto\bn\asm\bn-win32.obj'; 69 $bn_asm_obj='crypto\bn\asm\bn_win32.obj';
70 $bn_asm_src='crypto\bn\asm\bn-win32.asm'; 70 $bn_asm_src='crypto\bn\asm\bn_win32.asm';
71 $des_enc_obj='crypto\des\asm\d-win32.obj crypto\des\asm\y-win32.obj'; 71 $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';
72 $des_enc_src='crypto\des\asm\d-win32.asm crypto\des\asm\y-win32.asm'; 72 $des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';
73 $bf_enc_obj='crypto\bf\asm\b-win32.obj'; 73 $bf_enc_obj='crypto\bf\asm\b_win32.obj';
74 $bf_enc_src='crypto\bf\asm\b-win32.asm'; 74 $bf_enc_src='crypto\bf\asm\b_win32.asm';
75 $cast_enc_obj='crypto\cast\asm\c-win32.obj'; 75 $cast_enc_obj='crypto\cast\asm\c_win32.obj';
76 $cast_enc_src='crypto\cast\asm\c-win32.asm'; 76 $cast_enc_src='crypto\cast\asm\c_win32.asm';
77 $rc4_enc_obj='crypto\rc4\asm\r4-win32.obj'; 77 $rc4_enc_obj='crypto\rc4\asm\r4_win32.obj';
78 $rc4_enc_src='crypto\rc4\asm\r4-win32.asm'; 78 $rc4_enc_src='crypto\rc4\asm\r4_win32.asm';
79 $rc5_enc_obj='crypto\rc5\asm\r5-win32.obj'; 79 $rc5_enc_obj='crypto\rc5\asm\r5_win32.obj';
80 $rc5_enc_src='crypto\rc5\asm\r5-win32.asm'; 80 $rc5_enc_src='crypto\rc5\asm\r5_win32.asm';
81 $md5_asm_obj='crypto\md5\asm\m5-win32.obj'; 81 $md5_asm_obj='crypto\md5\asm\m5_win32.obj';
82 $md5_asm_src='crypto\md5\asm\m5-win32.asm'; 82 $md5_asm_src='crypto\md5\asm\m5_win32.asm';
83 $sha1_asm_obj='crypto\sha\asm\s1-win32.obj'; 83 $sha1_asm_obj='crypto\sha\asm\s1_win32.obj';
84 $sha1_asm_src='crypto\sha\asm\s1-win32.asm'; 84 $sha1_asm_src='crypto\sha\asm\s1_win32.asm';
85 $rmd160_asm_obj='crypto\ripemd\asm\rm-win32.obj'; 85 $rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';
86 $rmd160_asm_src='crypto\ripemd\asm\rm-win32.asm'; 86 $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';
87 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; 87 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
88 } 88 }
89 89
diff --git a/src/lib/libcrypto/util/pod2mantest b/src/lib/libcrypto/util/pod2mantest
index 79aefafac0..e01c6192a7 100644
--- a/src/lib/libcrypto/util/pod2mantest
+++ b/src/lib/libcrypto/util/pod2mantest
@@ -11,9 +11,10 @@
11 11
12 12
13IFS=: 13IFS=:
14try_without_dir=true 14if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
15try_without_dir=false
15# First we try "pod2man", then "$dir/pod2man" for each item in $PATH. 16# First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
16for dir in dummy:$PATH; do 17for dir in dummy${IFS}$PATH; do
17 if [ "$try_without_dir" = true ]; then 18 if [ "$try_without_dir" = true ]; then
18 # first iteration 19 # first iteration
19 pod2man=pod2man 20 pod2man=pod2man
@@ -47,7 +48,7 @@ done
47echo "No working pod2man found. Consider installing a new version." >&2 48echo "No working pod2man found. Consider installing a new version." >&2
48if [ "$1" = ignore ]; then 49if [ "$1" = ignore ]; then
49 echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2 50 echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2
50 echo "util/pod2man.pl" 51 echo "../../util/pod2man.pl"
51 exit 0 52 exit 0
52fi 53fi
53exit 1 54exit 1
diff --git a/src/lib/libcrypto/util/point.sh b/src/lib/libcrypto/util/point.sh
index 47543c88e2..ce7dcc56df 100644
--- a/src/lib/libcrypto/util/point.sh
+++ b/src/lib/libcrypto/util/point.sh
@@ -1,6 +1,10 @@
1#!/bin/sh 1#!/bin/sh
2 2
3rm -f $2 3rm -f $2
4ln -s $1 $2 4if test "$OSTYPE" = msdosdjgpp; then
5 cp $1 $2
6else
7 ln -s $1 $2
8fi
5echo "$2 => $1" 9echo "$2 => $1"
6 10
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-03 23:24:15 +0000