kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use new DES_ methods instead of the long deprecated des_ methods.

Browse source 
PR:		198366
Submitted by:	Bernard Spil <spil.oss gmail com>
This commit is contained in:
Xin LI 2015-05-22 07:10:00 +00:00
parent dd5bb00341
commit 4d6a5b28b4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=386986
2 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/sectok/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= sectok
PORTVERSION= 20030825
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.citi.umich.edu/projects/smartcard/
EXTRACT_SUFX= .tgz

48
security/sectok/files/patch-cyberflex.c
View file

@ -1,5 +1,5 @@
--- cyberflex.c.orig Thu Jun 19 23:37:35 2003
+++ cyberflex.c Mon Sep 29 00:58:56 2003
--- cyberflex.c.orig 2003-06-20 00:37:35.000000000 +0200
+++ cyberflex.c 2015-02-28 15:57:55.093727371 +0100
@@ -48,7 +48,13 @@
#define SHA1Init SHA1_Init
#define SHA1Update SHA1_Update
@ -15,3 +15,47 @@
#include <sha1.h>
#endif
#else
@@ -69,7 +75,7 @@
#include "sc.h"
#ifdef __sun
-#define des_set_key(key, schedule) des_key_sched(key, schedule)
+#define DES_set_key(key, &schedule) DES_key_sched(key, &schedule)
#endif
#define JDIRSIZE 40
@@ -91,7 +97,7 @@
#ifndef __palmos__
/* default signed applet key of Cyberflex Access */
-static des_cblock app_key = {0x6A, 0x21, 0x36, 0xF5, 0xD8, 0x0C, 0x47, 0x83};
+static DES_cblock app_key = {0x6A, 0x21, 0x36, 0xF5, 0xD8, 0x0C, 0x47, 0x83};
#endif
static int
@@ -663,8 +669,8 @@
unsigned char aid[16], app_data[MAX_APP_SIZE], data[MAX_BUF_SIZE];
int i, j, vflag = 0, gotprog = 0, gotcont = 0, fd_app, size, aidlen = 0, sw;
int cont_size = 1152, inst_size = 1024;
- des_cblock tmp;
- des_key_schedule schedule;
+ DES_cblock tmp;
+ DES_key_schedule schedule;
static unsigned char acl[] = {0x81, 0, 0, 0xff, 0, 0, 0, 0};
optind = optreset = 1;
@@ -777,12 +783,12 @@
/* chain. DES encrypt one block, XOR the cyphertext with the next block,
... continues until the end of the buffer */
- des_set_key (&app_key, schedule);
+ DES_set_key (&app_key, &schedule);
for (i = 0; i < size/BLOCK_SIZE; i++) {
for (j = 0; j < BLOCK_SIZE; j++)
tmp[j] = tmp[j] ^ app_data[i*BLOCK_SIZE + j];
- des_ecb_encrypt (&tmp, &tmp, schedule, DES_ENCRYPT);
+ DES_ecb_encrypt (&tmp, &tmp, &schedule, DES_ENCRYPT);
}
if (vflag) {