diff options
Diffstat (limited to 'src/lib/libcrypto/engine')
-rw-r--r-- | src/lib/libcrypto/engine/hw_4758_cca.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/hw_ubsec.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/engine/hw_4758_cca.c b/src/lib/libcrypto/engine/hw_4758_cca.c index f404b1a3b8..6d41b9ed2a 100644 --- a/src/lib/libcrypto/engine/hw_4758_cca.c +++ b/src/lib/libcrypto/engine/hw_4758_cca.c | |||
@@ -953,7 +953,7 @@ static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, int idx, | |||
953 | #ifdef ENGINE_DYNAMIC_SUPPORT | 953 | #ifdef ENGINE_DYNAMIC_SUPPORT |
954 | static int bind_fn(ENGINE *e, const char *id) | 954 | static int bind_fn(ENGINE *e, const char *id) |
955 | { | 955 | { |
956 | if(id && (strcmp(id, engine_cswift_id) != 0)) | 956 | if(id && (strcmp(id, engine_4758_cca_id) != 0)) |
957 | return 0; | 957 | return 0; |
958 | if(!bind_helper(e)) | 958 | if(!bind_helper(e)) |
959 | return 0; | 959 | return 0; |
diff --git a/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c b/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c index f946389b8a..b8aab545db 100644 --- a/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c +++ b/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c | |||
@@ -408,7 +408,7 @@ static int do_digest(int ses,unsigned char *md,const void *data,int len) | |||
408 | cryp.op=COP_ENCRYPT;/* required to do the MAC rather than check it */ | 408 | cryp.op=COP_ENCRYPT;/* required to do the MAC rather than check it */ |
409 | cryp.len=len; | 409 | cryp.len=len; |
410 | cryp.src=(caddr_t)data; | 410 | cryp.src=(caddr_t)data; |
411 | cryp.dst=(caddr_t)data; // FIXME!!! | 411 | cryp.dst=(caddr_t)data; /* FIXME!!! */ |
412 | cryp.mac=(caddr_t)md; | 412 | cryp.mac=(caddr_t)md; |
413 | 413 | ||
414 | if(ioctl(fd, CIOCCRYPT, &cryp) == -1) | 414 | if(ioctl(fd, CIOCCRYPT, &cryp) == -1) |
@@ -420,7 +420,7 @@ static int do_digest(int ses,unsigned char *md,const void *data,int len) | |||
420 | dcopy=OPENSSL_malloc(len); | 420 | dcopy=OPENSSL_malloc(len); |
421 | memcpy(dcopy,data,len); | 421 | memcpy(dcopy,data,len); |
422 | cryp.src=dcopy; | 422 | cryp.src=dcopy; |
423 | cryp.dst=cryp.src; // FIXME!!! | 423 | cryp.dst=cryp.src; /* FIXME!!! */ |
424 | 424 | ||
425 | if(ioctl(fd, CIOCCRYPT, &cryp) == -1) | 425 | if(ioctl(fd, CIOCCRYPT, &cryp) == -1) |
426 | { | 426 | { |
@@ -437,7 +437,7 @@ static int do_digest(int ses,unsigned char *md,const void *data,int len) | |||
437 | return 0; | 437 | return 0; |
438 | } | 438 | } |
439 | } | 439 | } |
440 | // printf("done\n"); | 440 | /* printf("done\n"); */ |
441 | 441 | ||
442 | return 1; | 442 | return 1; |
443 | } | 443 | } |
@@ -483,7 +483,7 @@ static int dev_crypto_md5_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from) | |||
483 | const MD_DATA *from_md=from->md_data; | 483 | const MD_DATA *from_md=from->md_data; |
484 | MD_DATA *to_md=to->md_data; | 484 | MD_DATA *to_md=to->md_data; |
485 | 485 | ||
486 | // How do we copy sessions? | 486 | /* How do we copy sessions? */ |
487 | assert(from->digest->flags&EVP_MD_FLAG_ONESHOT); | 487 | assert(from->digest->flags&EVP_MD_FLAG_ONESHOT); |
488 | 488 | ||
489 | to_md->data=OPENSSL_malloc(from_md->len); | 489 | to_md->data=OPENSSL_malloc(from_md->len); |
@@ -530,7 +530,7 @@ static const EVP_MD md5_md= | |||
530 | NID_md5, | 530 | NID_md5, |
531 | NID_md5WithRSAEncryption, | 531 | NID_md5WithRSAEncryption, |
532 | MD5_DIGEST_LENGTH, | 532 | MD5_DIGEST_LENGTH, |
533 | EVP_MD_FLAG_ONESHOT, // XXX: set according to device info... | 533 | EVP_MD_FLAG_ONESHOT, /* XXX: set according to device info... */ |
534 | dev_crypto_md5_init, | 534 | dev_crypto_md5_init, |
535 | dev_crypto_md5_update, | 535 | dev_crypto_md5_update, |
536 | dev_crypto_md5_final, | 536 | dev_crypto_md5_final, |
diff --git a/src/lib/libcrypto/engine/hw_ubsec.c b/src/lib/libcrypto/engine/hw_ubsec.c index 63397f868c..ed8401ec16 100644 --- a/src/lib/libcrypto/engine/hw_ubsec.c +++ b/src/lib/libcrypto/engine/hw_ubsec.c | |||
@@ -93,7 +93,7 @@ static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa); | |||
93 | static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, | 93 | static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, |
94 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); | 94 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); |
95 | #ifndef OPENSSL_NO_DSA | 95 | #ifndef OPENSSL_NO_DSA |
96 | #if NOT_USED | 96 | #ifdef NOT_USED |
97 | static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, | 97 | static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, |
98 | BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, | 98 | BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, |
99 | BN_CTX *ctx, BN_MONT_CTX *in_mont); | 99 | BN_CTX *ctx, BN_MONT_CTX *in_mont); |
@@ -113,7 +113,7 @@ static int ubsec_dh_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh) | |||
113 | static int ubsec_dh_generate_key(DH *dh); | 113 | static int ubsec_dh_generate_key(DH *dh); |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | #if NOT_USED | 116 | #ifdef NOT_USED |
117 | static int ubsec_rand_bytes(unsigned char *buf, int num); | 117 | static int ubsec_rand_bytes(unsigned char *buf, int num); |
118 | static int ubsec_rand_status(void); | 118 | static int ubsec_rand_status(void); |
119 | #endif | 119 | #endif |
@@ -663,7 +663,7 @@ static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, | |||
663 | } | 663 | } |
664 | 664 | ||
665 | #ifndef OPENSSL_NO_DSA | 665 | #ifndef OPENSSL_NO_DSA |
666 | #if NOT_USED | 666 | #ifdef NOT_USED |
667 | static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, | 667 | static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, |
668 | BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, | 668 | BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, |
669 | BN_CTX *ctx, BN_MONT_CTX *in_mont) | 669 | BN_CTX *ctx, BN_MONT_CTX *in_mont) |
@@ -987,7 +987,7 @@ err: | |||
987 | } | 987 | } |
988 | #endif | 988 | #endif |
989 | 989 | ||
990 | #if NOT_USED | 990 | #ifdef NOT_USED |
991 | static int ubsec_rand_bytes(unsigned char * buf, | 991 | static int ubsec_rand_bytes(unsigned char * buf, |
992 | int num) | 992 | int num) |
993 | { | 993 | { |