Commit 6dc78bf7 authored by Richard Levitte's avatar Richard Levitte
Browse files

make update

parent ce4f169f

TABLE

+53 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ $arflags = 


*** Cygwin

$cc           = gcc

$cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=486 -Wall

$cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall

$unistd       = 

$thread_cflag = 

$sys_id       = CYGWIN32
@@ -1652,7 +1652,32 @@ $arflags = 


*** debug-levitte-linux-elf

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wid-clash-31 -Wcast-align -Wconversion -Wno-long-long -pipe

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$bn_obj       = asm/bn86-elf.o asm/co86-elf.o

$des_obj      = asm/dx86-elf.o asm/yx86-elf.o

$bf_obj       = asm/bx86-elf.o

$md5_obj      = asm/mx86-elf.o

$sha1_obj     = asm/sx86-elf.o

$cast_obj     = asm/cx86-elf.o

$rc4_obj      = asm/rx86-elf.o

$rmd160_obj   = asm/rm86-elf.o

$rc5_obj      = asm/r586-elf.o

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 



*** debug-levitte-linux-elf-extreme

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -1677,7 +1702,32 @@ $arflags = 


*** debug-levitte-linux-noasm

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wid-clash-31 -Wcast-align -Wconversion -Wno-long-long -pipe

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 



*** debug-levitte-linux-noasm-extreme

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =

crypto/objects/obj_dat.h

+17 −5
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ 
 * [including the GNU Public Licence.]

 */



#define NUM_NID 716

#define NUM_SN 711

#define NUM_LN 711

#define NUM_OBJ 685

#define NUM_NID 718

#define NUM_SN 713

#define NUM_LN 713

#define NUM_OBJ 687



static unsigned char lvalues[4849]={

static unsigned char lvalues[4869]={

0x00,                                        /* [  0] OBJ_undef */

0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */

0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -753,6 +753,8 @@ static unsigned char lvalues[4849]={ 
0x67,0x2B,0x0D,0x04,0x0A,                    /* [4833] OBJ_wap_wsg_idm_ecid_wtls10 */

0x67,0x2B,0x0D,0x04,0x0B,                    /* [4838] OBJ_wap_wsg_idm_ecid_wtls11 */

0x67,0x2B,0x0D,0x04,0x0C,                    /* [4843] OBJ_wap_wsg_idm_ecid_wtls12 */

0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4848] OBJ_ms_smartcard_login */

0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4858] OBJ_ms_upn */

};



static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -1873,6 +1875,10 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ 
	NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4838]),0},

{"wap-wsg-idm-ecid-wtls12","wap-wsg-idm-ecid-wtls12",

	NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4843]),0},

{"msSmartcardLogin","Microsoft Smartcardlogin",NID_ms_smartcard_login,

	10,&(lvalues[4848]),0},

{"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10,

	&(lvalues[4858]),0},

};



static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -2304,6 +2310,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ 
&(nid_objs[138]),/* "msEFS" */

&(nid_objs[171]),/* "msExtReq" */

&(nid_objs[137]),/* "msSGC" */

&(nid_objs[716]),/* "msSmartcardLogin" */

&(nid_objs[717]),/* "msUPN" */

&(nid_objs[481]),/* "nSRecord" */

&(nid_objs[173]),/* "name" */

&(nid_objs[369]),/* "noCheck" */
@@ -2625,7 +2633,9 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ 
&(nid_objs[171]),/* "Microsoft Extension Request" */

&(nid_objs[134]),/* "Microsoft Individual Code Signing" */

&(nid_objs[137]),/* "Microsoft Server Gated Crypto" */

&(nid_objs[716]),/* "Microsoft Smartcardlogin" */

&(nid_objs[136]),/* "Microsoft Trust List Signing" */

&(nid_objs[717]),/* "Microsoft Universal Principal Name" */

&(nid_objs[72]),/* "Netscape Base Url" */

&(nid_objs[76]),/* "Netscape CA Policy Url" */

&(nid_objs[74]),/* "Netscape CA Revocation Url" */
@@ -3921,6 +3931,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ 
&(nid_objs[136]),/* OBJ_ms_ctl_sign                  1 3 6 1 4 1 311 10 3 1 */

&(nid_objs[137]),/* OBJ_ms_sgc                       1 3 6 1 4 1 311 10 3 3 */

&(nid_objs[138]),/* OBJ_ms_efs                       1 3 6 1 4 1 311 10 3 4 */

&(nid_objs[716]),/* OBJ_ms_smartcard_login           1 3 6 1 4 1 311 20 2 2 */

&(nid_objs[717]),/* OBJ_ms_upn                       1 3 6 1 4 1 311 20 2 3 */

&(nid_objs[196]),/* OBJ_id_smime_mod_cms             1 2 840 113549 1 9 16 0 1 */

&(nid_objs[197]),/* OBJ_id_smime_mod_ess             1 2 840 113549 1 9 16 0 2 */

&(nid_objs[198]),/* OBJ_id_smime_mod_oid             1 2 840 113549 1 9 16 0 3 */

crypto/objects/obj_mac.h

+10 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,16 @@ 
#define NID_ms_efs		138

#define OBJ_ms_efs		1L,3L,6L,1L,4L,1L,311L,10L,3L,4L



#define SN_ms_smartcard_login		"msSmartcardLogin"

#define LN_ms_smartcard_login		"Microsoft Smartcardlogin"

#define NID_ms_smartcard_login		716

#define OBJ_ms_smartcard_login		1L,3L,6L,1L,4L,1L,311L,20L,2L,2L



#define SN_ms_upn		"msUPN"

#define LN_ms_upn		"Microsoft Universal Principal Name"

#define NID_ms_upn		717

#define OBJ_ms_upn		1L,3L,6L,1L,4L,1L,311L,20L,2L,3L



#define SN_idea_cbc		"IDEA-CBC"

#define LN_idea_cbc		"idea-cbc"

#define NID_idea_cbc		34

crypto/objects/obj_mac.num

+2 −0
Original line number Diff line number Diff line
@@ -713,3 +713,5 @@ wap_wsg_idm_ecid_wtls7 712 
wap_wsg_idm_ecid_wtls10		713

wap_wsg_idm_ecid_wtls11		714

wap_wsg_idm_ecid_wtls12		715

ms_smartcard_login		716

ms_upn		717