From c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 14:43:31 +0100 Subject: Upgraded to openssl-1.0.2 --- openssl/demos/asn1/ocsp.c | 405 ++- openssl/demos/b64.c | 379 ++- openssl/demos/bio/Makefile | 10 +- openssl/demos/bio/README | 4 + openssl/demos/bio/accept.cnf | 13 + openssl/demos/bio/client-arg.c | 111 + openssl/demos/bio/client-conf.c | 120 + openssl/demos/bio/connect.cnf | 9 + openssl/demos/bio/saccept.c | 173 +- openssl/demos/bio/sconnect.c | 190 +- openssl/demos/bio/server-arg.c | 144 + openssl/demos/bio/server-conf.c | 138 + openssl/demos/bio/server.pem | 78 +- openssl/demos/cms/cms_comp.c | 79 +- openssl/demos/cms/cms_ddec.c | 120 +- openssl/demos/cms/cms_dec.c | 103 +- openssl/demos/cms/cms_denc.c | 133 +- openssl/demos/cms/cms_enc.c | 126 +- openssl/demos/cms/cms_sign.c | 119 +- openssl/demos/cms/cms_sign2.c | 129 +- openssl/demos/cms/cms_uncomp.c | 69 +- openssl/demos/cms/cms_ver.c | 110 +- openssl/demos/easy_tls/easy-tls.c | 1242 +++++---- openssl/demos/easy_tls/easy-tls.h | 39 +- openssl/demos/easy_tls/test.c | 356 +-- openssl/demos/easy_tls/test.h | 1 - openssl/demos/engines/cluster_labs/cluster_labs.h | 46 +- .../demos/engines/cluster_labs/hw_cluster_labs.c | 1127 ++++---- .../engines/cluster_labs/hw_cluster_labs_err.c | 127 +- .../engines/cluster_labs/hw_cluster_labs_err.h | 47 +- openssl/demos/engines/ibmca/hw_ibmca.c | 1820 ++++++------- openssl/demos/engines/ibmca/hw_ibmca_err.c | 127 +- openssl/demos/engines/ibmca/hw_ibmca_err.h | 53 +- openssl/demos/engines/ibmca/ica_openssl_api.h | 248 +- openssl/demos/engines/rsaref/rsaref.c | 1050 +++---- openssl/demos/engines/rsaref/rsaref_err.c | 143 +- openssl/demos/engines/rsaref/rsaref_err.h | 67 +- openssl/demos/engines/zencod/hw_zencod.c | 2854 ++++++++++---------- openssl/demos/engines/zencod/hw_zencod.h | 257 +- openssl/demos/engines/zencod/hw_zencod_err.c | 122 +- openssl/demos/engines/zencod/hw_zencod_err.h | 47 +- openssl/demos/pkcs12/pkread.c | 96 +- openssl/demos/pkcs12/pkwrite.c | 66 +- openssl/demos/prime/prime.c | 81 +- openssl/demos/selfsign.c | 268 +- openssl/demos/sign/sign.c | 175 +- openssl/demos/smime/smdec.c | 107 +- openssl/demos/smime/smenc.c | 126 +- openssl/demos/smime/smsign.c | 119 +- openssl/demos/smime/smsign2.c | 133 +- openssl/demos/smime/smver.c | 110 +- openssl/demos/spkigen.c | 281 +- openssl/demos/state_machine/state_machine.c | 501 ++-- openssl/demos/tunala/breakage.c | 106 +- openssl/demos/tunala/buffer.c | 409 +-- openssl/demos/tunala/cb.c | 239 +- openssl/demos/tunala/ip.c | 221 +- openssl/demos/tunala/sm.c | 255 +- openssl/demos/tunala/tunala.c | 1928 ++++++------- openssl/demos/tunala/tunala.h | 363 +-- openssl/demos/x509/mkcert.c | 271 +- openssl/demos/x509/mkreq.c | 232 +- 62 files changed, 9715 insertions(+), 8907 deletions(-) create mode 100755 openssl/demos/bio/accept.cnf create mode 100755 openssl/demos/bio/client-arg.c create mode 100755 openssl/demos/bio/client-conf.c create mode 100755 openssl/demos/bio/connect.cnf create mode 100755 openssl/demos/bio/server-arg.c create mode 100755 openssl/demos/bio/server-conf.c (limited to 'openssl/demos') diff --git a/openssl/demos/asn1/ocsp.c b/openssl/demos/asn1/ocsp.c index e89f1f72a..db4071989 100644 --- a/openssl/demos/asn1/ocsp.c +++ b/openssl/demos/asn1/ocsp.c @@ -1,6 +1,7 @@ /* ocsp.c */ -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL - * project 2000. +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project + * 2000. */ /* ==================================================================== * Copyright (c) 2000 The OpenSSL Project. All rights reserved. @@ -10,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -59,113 +60,111 @@ #include #include - - - -/* Example of new ASN1 code, OCSP request - - OCSPRequest ::= SEQUENCE { - tbsRequest TBSRequest, - optionalSignature [0] EXPLICIT Signature OPTIONAL } - - TBSRequest ::= SEQUENCE { - version [0] EXPLICIT Version DEFAULT v1, - requestorName [1] EXPLICIT GeneralName OPTIONAL, - requestList SEQUENCE OF Request, - requestExtensions [2] EXPLICIT Extensions OPTIONAL } - - Signature ::= SEQUENCE { - signatureAlgorithm AlgorithmIdentifier, - signature BIT STRING, - certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } - - Version ::= INTEGER { v1(0) } - - Request ::= SEQUENCE { - reqCert CertID, - singleRequestExtensions [0] EXPLICIT Extensions OPTIONAL } - - CertID ::= SEQUENCE { - hashAlgorithm AlgorithmIdentifier, - issuerNameHash OCTET STRING, -- Hash of Issuer's DN - issuerKeyHash OCTET STRING, -- Hash of Issuers public key - serialNumber CertificateSerialNumber } - - OCSPResponse ::= SEQUENCE { - responseStatus OCSPResponseStatus, - responseBytes [0] EXPLICIT ResponseBytes OPTIONAL } - - OCSPResponseStatus ::= ENUMERATED { - successful (0), --Response has valid confirmations - malformedRequest (1), --Illegal confirmation request - internalError (2), --Internal error in issuer - tryLater (3), --Try again later - --(4) is not used - sigRequired (5), --Must sign the request - unauthorized (6) --Request unauthorized - } - - ResponseBytes ::= SEQUENCE { - responseType OBJECT IDENTIFIER, - response OCTET STRING } - - BasicOCSPResponse ::= SEQUENCE { - tbsResponseData ResponseData, - signatureAlgorithm AlgorithmIdentifier, - signature BIT STRING, - certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } - - ResponseData ::= SEQUENCE { - version [0] EXPLICIT Version DEFAULT v1, - responderID ResponderID, - producedAt GeneralizedTime, - responses SEQUENCE OF SingleResponse, - responseExtensions [1] EXPLICIT Extensions OPTIONAL } - - ResponderID ::= CHOICE { - byName [1] Name, --EXPLICIT - byKey [2] KeyHash } - - KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key - --(excluding the tag and length fields) - - SingleResponse ::= SEQUENCE { - certID CertID, - certStatus CertStatus, - thisUpdate GeneralizedTime, - nextUpdate [0] EXPLICIT GeneralizedTime OPTIONAL, - singleExtensions [1] EXPLICIT Extensions OPTIONAL } - - CertStatus ::= CHOICE { - good [0] IMPLICIT NULL, - revoked [1] IMPLICIT RevokedInfo, - unknown [2] IMPLICIT UnknownInfo } - - RevokedInfo ::= SEQUENCE { - revocationTime GeneralizedTime, - revocationReason [0] EXPLICIT CRLReason OPTIONAL } - - UnknownInfo ::= NULL -- this can be replaced with an enumeration - - ArchiveCutoff ::= GeneralizedTime - - AcceptableResponses ::= SEQUENCE OF OBJECT IDENTIFIER - - ServiceLocator ::= SEQUENCE { - issuer Name, - locator AuthorityInfoAccessSyntax } - - -- Object Identifiers - - id-kp-OCSPSigning OBJECT IDENTIFIER ::= { id-kp 9 } - id-pkix-ocsp OBJECT IDENTIFIER ::= { id-ad-ocsp } - id-pkix-ocsp-basic OBJECT IDENTIFIER ::= { id-pkix-ocsp 1 } - id-pkix-ocsp-nonce OBJECT IDENTIFIER ::= { id-pkix-ocsp 2 } - id-pkix-ocsp-crl OBJECT IDENTIFIER ::= { id-pkix-ocsp 3 } - id-pkix-ocsp-response OBJECT IDENTIFIER ::= { id-pkix-ocsp 4 } - id-pkix-ocsp-nocheck OBJECT IDENTIFIER ::= { id-pkix-ocsp 5 } - id-pkix-ocsp-archive-cutoff OBJECT IDENTIFIER ::= { id-pkix-ocsp 6 } - id-pkix-ocsp-service-locator OBJECT IDENTIFIER ::= { id-pkix-ocsp 7 } +/*- + Example of new ASN1 code, OCSP request + + OCSPRequest ::= SEQUENCE { + tbsRequest TBSRequest, + optionalSignature [0] EXPLICIT Signature OPTIONAL } + + TBSRequest ::= SEQUENCE { + version [0] EXPLICIT Version DEFAULT v1, + requestorName [1] EXPLICIT GeneralName OPTIONAL, + requestList SEQUENCE OF Request, + requestExtensions [2] EXPLICIT Extensions OPTIONAL } + + Signature ::= SEQUENCE { + signatureAlgorithm AlgorithmIdentifier, + signature BIT STRING, + certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } + + Version ::= INTEGER { v1(0) } + + Request ::= SEQUENCE { + reqCert CertID, + singleRequestExtensions [0] EXPLICIT Extensions OPTIONAL } + + CertID ::= SEQUENCE { + hashAlgorithm AlgorithmIdentifier, + issuerNameHash OCTET STRING, -- Hash of Issuer's DN + issuerKeyHash OCTET STRING, -- Hash of Issuers public key + serialNumber CertificateSerialNumber } + + OCSPResponse ::= SEQUENCE { + responseStatus OCSPResponseStatus, + responseBytes [0] EXPLICIT ResponseBytes OPTIONAL } + + OCSPResponseStatus ::= ENUMERATED { + successful (0), --Response has valid confirmations + malformedRequest (1), --Illegal confirmation request + internalError (2), --Internal error in issuer + tryLater (3), --Try again later + --(4) is not used + sigRequired (5), --Must sign the request + unauthorized (6) --Request unauthorized + } + + ResponseBytes ::= SEQUENCE { + responseType OBJECT IDENTIFIER, + response OCTET STRING } + + BasicOCSPResponse ::= SEQUENCE { + tbsResponseData ResponseData, + signatureAlgorithm AlgorithmIdentifier, + signature BIT STRING, + certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } + + ResponseData ::= SEQUENCE { + version [0] EXPLICIT Version DEFAULT v1, + responderID ResponderID, + producedAt GeneralizedTime, + responses SEQUENCE OF SingleResponse, + responseExtensions [1] EXPLICIT Extensions OPTIONAL } + + ResponderID ::= CHOICE { + byName [1] Name, --EXPLICIT + byKey [2] KeyHash } + + KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key + --(excluding the tag and length fields) + + SingleResponse ::= SEQUENCE { + certID CertID, + certStatus CertStatus, + thisUpdate GeneralizedTime, + nextUpdate [0] EXPLICIT GeneralizedTime OPTIONAL, + singleExtensions [1] EXPLICIT Extensions OPTIONAL } + + CertStatus ::= CHOICE { + good [0] IMPLICIT NULL, + revoked [1] IMPLICIT RevokedInfo, + unknown [2] IMPLICIT UnknownInfo } + + RevokedInfo ::= SEQUENCE { + revocationTime GeneralizedTime, + revocationReason [0] EXPLICIT CRLReason OPTIONAL } + + UnknownInfo ::= NULL -- this can be replaced with an enumeration + + ArchiveCutoff ::= GeneralizedTime + + AcceptableResponses ::= SEQUENCE OF OBJECT IDENTIFIER + + ServiceLocator ::= SEQUENCE { + issuer Name, + locator AuthorityInfoAccessSyntax } + + -- Object Identifiers + + id-kp-OCSPSigning OBJECT IDENTIFIER ::= { id-kp 9 } + id-pkix-ocsp OBJECT IDENTIFIER ::= { id-ad-ocsp } + id-pkix-ocsp-basic OBJECT IDENTIFIER ::= { id-pkix-ocsp 1 } + id-pkix-ocsp-nonce OBJECT IDENTIFIER ::= { id-pkix-ocsp 2 } + id-pkix-ocsp-crl OBJECT IDENTIFIER ::= { id-pkix-ocsp 3 } + id-pkix-ocsp-response OBJECT IDENTIFIER ::= { id-pkix-ocsp 4 } + id-pkix-ocsp-nocheck OBJECT IDENTIFIER ::= { id-pkix-ocsp 5 } + id-pkix-ocsp-archive-cutoff OBJECT IDENTIFIER ::= { id-pkix-ocsp 6 } + id-pkix-ocsp-service-locator OBJECT IDENTIFIER ::= { id-pkix-ocsp 7 } */ @@ -174,193 +173,189 @@ DECLARE_STACK_OF(Request) typedef struct { - ASN1_INTEGER *version; - GENERAL_NAME *requestorName; - STACK_OF(Request) *requestList; - STACK_OF(X509_EXTENSION) *requestExtensions; + ASN1_INTEGER *version; + GENERAL_NAME *requestorName; + STACK_OF(Request) *requestList; + STACK_OF(X509_EXTENSION) *requestExtensions; } TBSRequest; typedef struct { - X509_ALGOR *signatureAlgorithm; - ASN1_BIT_STRING *signature; - STACK_OF(X509) *certs; + X509_ALGOR *signatureAlgorithm; + ASN1_BIT_STRING *signature; + STACK_OF(X509) *certs; } Signature; typedef struct { - TBSRequest *tbsRequest; - Signature *optionalSignature; + TBSRequest *tbsRequest; + Signature *optionalSignature; } OCSPRequest; typedef struct { - X509_ALGOR *hashAlgorithm; - ASN1_OCTET_STRING *issuerNameHash; - ASN1_OCTET_STRING *issuerKeyHash; - ASN1_INTEGER *certificateSerialNumber; + X509_ALGOR *hashAlgorithm; + ASN1_OCTET_STRING *issuerNameHash; + ASN1_OCTET_STRING *issuerKeyHash; + ASN1_INTEGER *certificateSerialNumber; } CertID; typedef struct { - CertID *reqCert; - STACK_OF(X509_EXTENSION) *singleRequestExtensions; + CertID *reqCert; + STACK_OF(X509_EXTENSION) *singleRequestExtensions; } Request; /* Response structures */ typedef struct { - ASN1_OBJECT *responseType; - ASN1_OCTET_STRING *response; + ASN1_OBJECT *responseType; + ASN1_OCTET_STRING *response; } ResponseBytes; typedef struct { - ASN1_ENUMERATED *responseStatus; - ResponseBytes *responseBytes; + ASN1_ENUMERATED *responseStatus; + ResponseBytes *responseBytes; } OCSPResponse; typedef struct { - int type; - union { - X509_NAME *byName; - ASN1_OCTET_STRING *byKey; - }d; + int type; + union { + X509_NAME *byName; + ASN1_OCTET_STRING *byKey; + } d; } ResponderID; typedef struct { - ASN1_INTEGER *version; - ResponderID *responderID; - ASN1_GENERALIZEDTIME *producedAt; - STACK_OF(SingleResponse) *responses; - STACK_OF(X509_EXTENSION) *responseExtensions; + ASN1_INTEGER *version; + ResponderID *responderID; + ASN1_GENERALIZEDTIME *producedAt; + STACK_OF(SingleResponse) *responses; + STACK_OF(X509_EXTENSION) *responseExtensions; } ResponseData; typedef struct { - ResponseData *tbsResponseData; - X509_ALGOR *signatureAlgorithm; - ASN1_BIT_STRING *signature; - STACK_OF(X509) *certs; + ResponseData *tbsResponseData; + X509_ALGOR *signatureAlgorithm; + ASN1_BIT_STRING *signature; + STACK_OF(X509) *certs; } BasicOCSPResponse; typedef struct { - ASN1_GENERALIZEDTIME *revocationTime; - ASN1_ENUMERATED * revocationReason; + ASN1_GENERALIZEDTIME *revocationTime; + ASN1_ENUMERATED *revocationReason; } RevokedInfo; typedef struct { - int type; - union { - ASN1_NULL *good; - RevokedInfo *revoked; - ASN1_NULL *unknown; - } d; + int type; + union { + ASN1_NULL *good; + RevokedInfo *revoked; + ASN1_NULL *unknown; + } d; } CertStatus; typedef struct { - CertID *certID; - CertStatus *certStatus; - ASN1_GENERALIZEDTIME *thisUpdate; - ASN1_GENERALIZEDTIME *nextUpdate; - STACK_OF(X509_EXTENSION) *singleExtensions; + CertID *certID; + CertStatus *certStatus; + ASN1_GENERALIZEDTIME *thisUpdate; + ASN1_GENERALIZEDTIME *nextUpdate; + STACK_OF(X509_EXTENSION) *singleExtensions; } SingleResponse; - typedef struct { X509_NAME *issuer; STACK_OF(ACCESS_DESCRIPTION) *locator; } ServiceLocator; - /* Now the ASN1 templates */ IMPLEMENT_COMPAT_ASN1(X509); IMPLEMENT_COMPAT_ASN1(X509_ALGOR); -//IMPLEMENT_COMPAT_ASN1(X509_EXTENSION); +// IMPLEMENT_COMPAT_ASN1(X509_EXTENSION); IMPLEMENT_COMPAT_ASN1(GENERAL_NAME); IMPLEMENT_COMPAT_ASN1(X509_NAME); ASN1_SEQUENCE(X509_EXTENSION) = { - ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT), - ASN1_OPT(X509_EXTENSION, critical, ASN1_BOOLEAN), - ASN1_SIMPLE(X509_EXTENSION, value, ASN1_OCTET_STRING) + ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT), + ASN1_OPT(X509_EXTENSION, critical, ASN1_BOOLEAN), + ASN1_SIMPLE(X509_EXTENSION, value, ASN1_OCTET_STRING) } ASN1_SEQUENCE_END(X509_EXTENSION); - + ASN1_SEQUENCE(Signature) = { - ASN1_SIMPLE(Signature, signatureAlgorithm, X509_ALGOR), - ASN1_SIMPLE(Signature, signature, ASN1_BIT_STRING), - ASN1_SEQUENCE_OF(Signature, certs, X509) + ASN1_SIMPLE(Signature, signatureAlgorithm, X509_ALGOR), + ASN1_SIMPLE(Signature, signature, ASN1_BIT_STRING), + ASN1_SEQUENCE_OF(Signature, certs, X509) } ASN1_SEQUENCE_END(Signature); ASN1_SEQUENCE(CertID) = { - ASN1_SIMPLE(CertID, hashAlgorithm, X509_ALGOR), - ASN1_SIMPLE(CertID, issuerNameHash, ASN1_OCTET_STRING), - ASN1_SIMPLE(CertID, issuerKeyHash, ASN1_OCTET_STRING), - ASN1_SIMPLE(CertID, certificateSerialNumber, ASN1_INTEGER) + ASN1_SIMPLE(CertID, hashAlgorithm, X509_ALGOR), + ASN1_SIMPLE(CertID, issuerNameHash, ASN1_OCTET_STRING), + ASN1_SIMPLE(CertID, issuerKeyHash, ASN1_OCTET_STRING), + ASN1_SIMPLE(CertID, certificateSerialNumber, ASN1_INTEGER) } ASN1_SEQUENCE_END(CertID); ASN1_SEQUENCE(Request) = { - ASN1_SIMPLE(Request, reqCert, CertID), - ASN1_EXP_SEQUENCE_OF_OPT(Request, singleRequestExtensions, X509_EXTENSION, 0) + ASN1_SIMPLE(Request, reqCert, CertID), + ASN1_EXP_SEQUENCE_OF_OPT(Request, singleRequestExtensions, X509_EXTENSION, 0) } ASN1_SEQUENCE_END(Request); ASN1_SEQUENCE(TBSRequest) = { - ASN1_EXP_OPT(TBSRequest, version, ASN1_INTEGER, 0), - ASN1_EXP_OPT(TBSRequest, requestorName, GENERAL_NAME, 1), - ASN1_SEQUENCE_OF(TBSRequest, requestList, Request), - ASN1_EXP_SEQUENCE_OF_OPT(TBSRequest, requestExtensions, X509_EXTENSION, 2) + ASN1_EXP_OPT(TBSRequest, version, ASN1_INTEGER, 0), + ASN1_EXP_OPT(TBSRequest, requestorName, GENERAL_NAME, 1), + ASN1_SEQUENCE_OF(TBSRequest, requestList, Request), + ASN1_EXP_SEQUENCE_OF_OPT(TBSRequest, requestExtensions, X509_EXTENSION, 2) } ASN1_SEQUENCE_END(TBSRequest); ASN1_SEQUENCE(OCSPRequest) = { - ASN1_SIMPLE(OCSPRequest, tbsRequest, TBSRequest), - ASN1_EXP_OPT(OCSPRequest, optionalSignature, Signature, 0) + ASN1_SIMPLE(OCSPRequest, tbsRequest, TBSRequest), + ASN1_EXP_OPT(OCSPRequest, optionalSignature, Signature, 0) } ASN1_SEQUENCE_END(OCSPRequest); - /* Response templates */ ASN1_SEQUENCE(ResponseBytes) = { - ASN1_SIMPLE(ResponseBytes, responseType, ASN1_OBJECT), - ASN1_SIMPLE(ResponseBytes, response, ASN1_OCTET_STRING) + ASN1_SIMPLE(ResponseBytes, responseType, ASN1_OBJECT), + ASN1_SIMPLE(ResponseBytes, response, ASN1_OCTET_STRING) } ASN1_SEQUENCE_END(ResponseBytes); ASN1_SEQUENCE(OCSPResponse) = { - ASN1_SIMPLE(OCSPResponse, responseStatus, ASN1_ENUMERATED), - ASN1_EXP_OPT(OCSPResponse, responseBytes, ResponseBytes, 0) + ASN1_SIMPLE(OCSPResponse, responseStatus, ASN1_ENUMERATED), + ASN1_EXP_OPT(OCSPResponse, responseBytes, ResponseBytes, 0) } ASN1_SEQUENCE_END(OCSPResponse); ASN1_CHOICE(ResponderID) = { - ASN1_EXP(ResponderID, d.byName, X509_NAME, 1), - ASN1_IMP(ResponderID, d.byKey, ASN1_OCTET_STRING, 2) + ASN1_EXP(ResponderID, d.byName, X509_NAME, 1), + ASN1_IMP(ResponderID, d.byKey, ASN1_OCTET_STRING, 2) } ASN1_CHOICE_END(ResponderID); ASN1_SEQUENCE(RevokedInfo) = { - ASN1_SIMPLE(RevokedInfo, revocationTime, ASN1_GENERALIZEDTIME), - ASN1_EXP_OPT(RevokedInfo, revocationReason, ASN1_ENUMERATED, 0) + ASN1_SIMPLE(RevokedInfo, revocationTime, ASN1_GENERALIZEDTIME), + ASN1_EXP_OPT(RevokedInfo, revocationReason, ASN1_ENUMERATED, 0) } ASN1_SEQUENCE_END(RevokedInfo); ASN1_CHOICE(CertStatus) = { - ASN1_IMP(CertStatus, d.good, ASN1_NULL, 0), - ASN1_IMP(CertStatus, d.revoked, RevokedInfo, 1), - ASN1_IMP(CertStatus, d.unknown, ASN1_NULL, 2) + ASN1_IMP(CertStatus, d.good, ASN1_NULL, 0), + ASN1_IMP(CertStatus, d.revoked, RevokedInfo, 1), + ASN1_IMP(CertStatus, d.unknown, ASN1_NULL, 2) } ASN1_CHOICE_END(CertStatus); ASN1_SEQUENCE(SingleResponse) = { - ASN1_SIMPLE(SingleResponse, certID, CertID), - ASN1_SIMPLE(SingleResponse, certStatus, CertStatus), - ASN1_SIMPLE(SingleResponse, thisUpdate, ASN1_GENERALIZEDTIME), - ASN1_EXP_OPT(SingleResponse, nextUpdate, ASN1_GENERALIZEDTIME, 0), - ASN1_EXP_SEQUENCE_OF_OPT(SingleResponse, singleExtensions, X509_EXTENSION, 1) + ASN1_SIMPLE(SingleResponse, certID, CertID), + ASN1_SIMPLE(SingleResponse, certStatus, CertStatus), + ASN1_SIMPLE(SingleResponse, thisUpdate, ASN1_GENERALIZEDTIME), + ASN1_EXP_OPT(SingleResponse, nextUpdate, ASN1_GENERALIZEDTIME, 0), + ASN1_EXP_SEQUENCE_OF_OPT(SingleResponse, singleExtensions, X509_EXTENSION, 1) } ASN1_SEQUENCE_END(SingleResponse); ASN1_SEQUENCE(ResponseData) = { - ASN1_EXP_OPT(ResponseData, version, ASN1_INTEGER, 0), - ASN1_SIMPLE(ResponseData, responderID, ResponderID), - ASN1_SIMPLE(ResponseData, producedAt, ASN1_GENERALIZEDTIME), - ASN1_SEQUENCE_OF(ResponseData, responses, SingleResponse), - ASN1_EXP_SEQUENCE_OF_OPT(ResponseData, responseExtensions, X509_EXTENSION, 1) + ASN1_EXP_OPT(ResponseData, version, ASN1_INTEGER, 0), + ASN1_SIMPLE(ResponseData, responderID, ResponderID), + ASN1_SIMPLE(ResponseData, producedAt, ASN1_GENERALIZEDTIME), + ASN1_SEQUENCE_OF(ResponseData, responses, SingleResponse), + ASN1_EXP_SEQUENCE_OF_OPT(ResponseData, responseExtensions, X509_EXTENSION, 1) } ASN1_SEQUENCE_END(ResponseData); ASN1_SEQUENCE(BasicOCSPResponse) = { - ASN1_SIMPLE(BasicOCSPResponse, tbsResponseData, ResponseData), - ASN1_SIMPLE(BasicOCSPResponse, signatureAlgorithm, X509_ALGOR), - ASN1_SIMPLE(BasicOCSPResponse, signature, ASN1_BIT_STRING), - ASN1_EXP_SEQUENCE_OF_OPT(BasicOCSPResponse, certs, X509, 0) + ASN1_SIMPLE(BasicOCSPResponse, tbsResponseData, ResponseData), + ASN1_SIMPLE(BasicOCSPResponse, signatureAlgorithm, X509_ALGOR), + ASN1_SIMPLE(BasicOCSPResponse, signature, ASN1_BIT_STRING), + ASN1_EXP_SEQUENCE_OF_OPT(BasicOCSPResponse, certs, X509, 0) } ASN1_SEQUENCE_END(BasicOCSPResponse); - diff --git a/openssl/demos/b64.c b/openssl/demos/b64.c index efdd44457..d8ed2a6a0 100644 --- a/openssl/demos/b64.c +++ b/openssl/demos/b64.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -71,198 +71,185 @@ #undef BSIZE #undef PROG -#define SIZE (512) -#define BSIZE (8*1024) -#define PROG enc_main +#define SIZE (512) +#define BSIZE (8*1024) +#define PROG enc_main -int main(argc,argv) +int main(argc, argv) int argc; char **argv; - { - char *strbuf=NULL; - unsigned char *buff=NULL,*bufsize=NULL; - int bsize=BSIZE,verbose=0; - int ret=1,inl; - char *str=NULL; - char *hkey=NULL,*hiv=NULL; - int enc=1,printkey=0,i,base64=0; - int debug=0; - EVP_CIPHER *cipher=NULL,*c; - char *inf=NULL,*outf=NULL; - BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL; +{ + char *strbuf = NULL; + unsigned char *buff = NULL, *bufsize = NULL; + int bsize = BSIZE, verbose = 0; + int ret = 1, inl; + char *str = NULL; + char *hkey = NULL, *hiv = NULL; + int enc = 1, printkey = 0, i, base64 = 0; + int debug = 0; + EVP_CIPHER *cipher = NULL, *c; + char *inf = NULL, *outf = NULL; + BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio = + NULL, *wbio = NULL; #define PROG_NAME_SIZE 39 - - apps_startup(); - - if (bio_err == NULL) - if ((bio_err=BIO_new(BIO_s_file())) != NULL) - BIO_set_fp(bio_err,stderr,BIO_NOCLOSE); - - base64=1; - - argc--; - argv++; - while (argc >= 1) - { - if (strcmp(*argv,"-e") == 0) - enc=1; - if (strcmp(*argv,"-in") == 0) - { - if (--argc < 1) goto bad; - inf= *(++argv); - } - else if (strcmp(*argv,"-out") == 0) - { - if (--argc < 1) goto bad; - outf= *(++argv); - } - else if (strcmp(*argv,"-d") == 0) - enc=0; - else if (strcmp(*argv,"-v") == 0) - verbose=1; - else if (strcmp(*argv,"-debug") == 0) - debug=1; - else if (strcmp(*argv,"-bufsize") == 0) - { - if (--argc < 1) goto bad; - bufsize=(unsigned char *)*(++argv); - } - else - { - BIO_printf(bio_err,"unknown option '%s'\n",*argv); -bad: - BIO_printf(bio_err,"options are\n"); - BIO_printf(bio_err,"%-14s input file\n","-in "); - BIO_printf(bio_err,"%-14s output file\n","-out "); - BIO_printf(bio_err,"%-14s encode\n","-e"); - BIO_printf(bio_err,"%-14s decode\n","-d"); - BIO_printf(bio_err,"%-14s buffer size\n","-bufsize "); - - goto end; - } - argc--; - argv++; - } - - if (bufsize != NULL) - { - int i; - unsigned long n; - - for (n=0; *bufsize; bufsize++) - { - i= *bufsize; - if ((i <= '9') && (i >= '0')) - n=n*10+i-'0'; - else if (i == 'k') - { - n*=1024; - bufsize++; - break; - } - } - if (*bufsize != '\0') - { - BIO_printf(bio_err,"invalid 'bufsize' specified.\n"); - goto end; - } - - /* It must be large enough for a base64 encoded line */ - if (n < 80) n=80; - - bsize=(int)n; - if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize); - } - - strbuf=OPENSSL_malloc(SIZE); - buff=(unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize)); - if ((buff == NULL) || (strbuf == NULL)) - { - BIO_printf(bio_err,"OPENSSL_malloc failure\n"); - goto end; - } - - in=BIO_new(BIO_s_file()); - out=BIO_new(BIO_s_file()); - if ((in == NULL) || (out == NULL)) - { - ERR_print_errors(bio_err); - goto end; - } - if (debug) - { - BIO_set_callback(in,BIO_debug_callback); - BIO_set_callback(out,BIO_debug_callback); - BIO_set_callback_arg(in,bio_err); - BIO_set_callback_arg(out,bio_err); - } - - if (inf == NULL) - BIO_set_fp(in,stdin,BIO_NOCLOSE); - else - { - if (BIO_read_filename(in,inf) <= 0) - { - perror(inf); - goto end; - } - } - - if (outf == NULL) - BIO_set_fp(out,stdout,BIO_NOCLOSE); - else - { - if (BIO_write_filename(out,outf) <= 0) - { - perror(outf); - goto end; - } - } - - rbio=in; - wbio=out; - - if (base64) - { - if ((b64=BIO_new(BIO_f_base64())) == NULL) - goto end; - if (debug) - { - BIO_set_callback(b64,BIO_debug_callback); - BIO_set_callback_arg(b64,bio_err); - } - if (enc) - wbio=BIO_push(b64,wbio); - else - rbio=BIO_push(b64,rbio); - } - - for (;;) - { - inl=BIO_read(rbio,(char *)buff,bsize); - if (inl <= 0) break; - if (BIO_write(wbio,(char *)buff,inl) != inl) - { - BIO_printf(bio_err,"error writing output file\n"); - goto end; - } - } - BIO_flush(wbio); - - ret=0; - if (verbose) - { - BIO_printf(bio_err,"bytes read :%8ld\n",BIO_number_read(in)); - BIO_printf(bio_err,"bytes written:%8ld\n",BIO_number_written(out)); - } -end: - if (strbuf != NULL) OPENSSL_free(strbuf); - if (buff != NULL) OPENSSL_free(buff); - if (in != NULL) BIO_free(in); - if (out != NULL) BIO_free(out); - if (benc != NULL) BIO_free(benc); - if (b64 != NULL) BIO_free(b64); - EXIT(ret); - } - + apps_startup(); + + if (bio_err == NULL) + if ((bio_err = BIO_new(BIO_s_file())) != NULL) + BIO_set_fp(bio_err, stderr, BIO_NOCLOSE); + + base64 = 1; + + argc--; + argv++; + while (argc >= 1) { + if (strcmp(*argv, "-e") == 0) + enc = 1; + if (strcmp(*argv, "-in") == 0) { + if (--argc < 1) + goto bad; + inf = *(++argv); + } else if (strcmp(*argv, "-out") == 0) { + if (--argc < 1) + goto bad; + outf = *(++argv); + } else if (strcmp(*argv, "-d") == 0) + enc = 0; + else if (strcmp(*argv, "-v") == 0) + verbose = 1; + else if (strcmp(*argv, "-debug") == 0) + debug = 1; + else if (strcmp(*argv, "-bufsize") == 0) { + if (--argc < 1) + goto bad; + bufsize = (unsigned char *)*(++argv); + } else { + BIO_printf(bio_err, "unknown option '%s'\n", *argv); + bad: + BIO_printf(bio_err, "options are\n"); + BIO_printf(bio_err, "%-14s input file\n", "-in "); + BIO_printf(bio_err, "%-14s output file\n", "-out "); + BIO_printf(bio_err, "%-14s encode\n", "-e"); + BIO_printf(bio_err, "%-14s decode\n", "-d"); + BIO_printf(bio_err, "%-14s buffer size\n", "-bufsize "); + + goto end; + } + argc--; + argv++; + } + + if (bufsize != NULL) { + int i; + unsigned long n; + + for (n = 0; *bufsize; bufsize++) { + i = *bufsize; + if ((i <= '9') && (i >= '0')) + n = n * 10 + i - '0'; + else if (i == 'k') { + n *= 1024; + bufsize++; + break; + } + } + if (*bufsize != '\0') { + BIO_printf(bio_err, "invalid 'bufsize' specified.\n"); + goto end; + } + + /* It must be large enough for a base64 encoded line */ + if (n < 80) + n = 80; + + bsize = (int)n; + if (verbose) + BIO_printf(bio_err, "bufsize=%d\n", bsize); + } + + strbuf = OPENSSL_malloc(SIZE); + buff = (unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize)); + if ((buff == NULL) || (strbuf == NULL)) { + BIO_printf(bio_err, "OPENSSL_malloc failure\n"); + goto end; + } + + in = BIO_new(BIO_s_file()); + out = BIO_new(BIO_s_file()); + if ((in == NULL) || (out == NULL)) { + ERR_print_errors(bio_err); + goto end; + } + if (debug) { + BIO_set_callback(in, BIO_debug_callback); + BIO_set_callback(out, BIO_debug_callback); + BIO_set_callback_arg(in, bio_err); + BIO_set_callback_arg(out, bio_err); + } + + if (inf == NULL) + BIO_set_fp(in, stdin, BIO_NOCLOSE); + else { + if (BIO_read_filename(in, inf) <= 0) { + perror(inf); + goto end; + } + } + + if (outf == NULL) + BIO_set_fp(out, stdout, BIO_NOCLOSE); + else { + if (BIO_write_filename(out, outf) <= 0) { + perror(outf); + goto end; + } + } + + rbio = in; + wbio = out; + + if (base64) { + if ((b64 = BIO_new(BIO_f_base64())) == NULL) + goto end; + if (debug) { + BIO_set_callback(b64, BIO_debug_callback); + BIO_set_callback_arg(b64, bio_err); + } + if (enc) + wbio = BIO_push(b64, wbio); + else + rbio = BIO_push(b64, rbio); + } + + for (;;) { + inl = BIO_read(rbio, (char *)buff, bsize); + if (inl <= 0) + break; + if (BIO_write(wbio, (char *)buff, inl) != inl) { + BIO_printf(bio_err, "error writing output file\n"); + goto end; + } + } + BIO_flush(wbio); + + ret = 0; + if (verbose) { + BIO_printf(bio_err, "bytes read :%8ld\n", BIO_number_read(in)); + BIO_printf(bio_err, "bytes written:%8ld\n", BIO_number_written(out)); + } + end: + if (strbuf != NULL) + OPENSSL_free(strbuf); + if (buff != NULL) + OPENSSL_free(buff); + if (in != NULL) + BIO_free(in); + if (out != NULL) + BIO_free(out); + if (benc != NULL) + BIO_free(benc); + if (b64 != NULL) + BIO_free(b64); + EXIT(ret); +} diff --git a/openssl/demos/bio/Makefile b/openssl/demos/bio/Makefile index 435154053..f8c8f0351 100644 --- a/openssl/demos/bio/Makefile +++ b/openssl/demos/bio/Makefile @@ -1,7 +1,7 @@ CC=cc CFLAGS= -g -I../../include -LIBS= -L../.. ../../libssl.a ../../libcrypto.a -EXAMPLES=saccept sconnect +LIBS= -L../.. ../../libssl.a ../../libcrypto.a -ldl +EXAMPLES=saccept sconnect client-arg client-conf all: $(EXAMPLES) @@ -11,6 +11,12 @@ saccept: saccept.o sconnect: sconnect.o $(CC) -o sconnect sconnect.o $(LIBS) +client-arg: client-arg.o + $(CC) -o client-arg client-arg.o $(LIBS) + +client-conf: client-conf.o + $(CC) -o client-conf client-conf.o $(LIBS) + clean: rm -f $(EXAMPLES) *.o diff --git a/openssl/demos/bio/README b/openssl/demos/bio/README index 0b24e5b80..a36bb48a5 100644 --- a/openssl/demos/bio/README +++ b/openssl/demos/bio/README @@ -1,3 +1,7 @@ This directory contains some simple examples of the use of BIO's to simplify socket programming. +The client-conf, server-conf, client-arg and client-conf include examples +of how to use the SSL_CONF API for configuration file or command line +processing. + diff --git a/openssl/demos/bio/accept.cnf b/openssl/demos/bio/accept.cnf new file mode 100755 index 000000000..e4acea75f --- /dev/null +++ b/openssl/demos/bio/accept.cnf @@ -0,0 +1,13 @@ +# Example configuration file +# Port to listen on +Port = 4433 +# Disable TLS v1.2 for test. +# Protocol = ALL, -TLSv1.2 +# Only support 3 curves +Curves = P-521:P-384:P-256 +# Automatic curve selection +ECDHParameters = Automatic +# Restricted signature algorithms +SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512 +Certificate=server.pem +PrivateKey=server.pem diff --git a/openssl/demos/bio/client-arg.c b/openssl/demos/bio/client-arg.c new file mode 100755 index 000000000..dc354cae0 --- /dev/null +++ b/openssl/demos/bio/client-arg.c @@ -0,0 +1,111 @@ +#include +#include + +int main(int argc, char **argv) +{ + BIO *sbio = NULL, *out = NULL; + int len; + char tmpbuf[1024]; + SSL_CTX *ctx; + SSL_CONF_CTX *cctx; + SSL *ssl; + char **args = argv + 1; + const char *connect_str = "localhost:4433"; + int nargs = argc - 1; + + ERR_load_crypto_strings(); + ERR_load_SSL_strings(); + SSL_library_init(); + + ctx = SSL_CTX_new(SSLv23_client_method()); + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + while (*args && **args == '-') { + int rv; + /* Parse standard arguments */ + rv = SSL_CONF_cmd_argv(cctx, &nargs, &args); + if (rv == -3) { + fprintf(stderr, "Missing argument for %s\n", *args); + goto end; + } + if (rv < 0) { + fprintf(stderr, "Error in command %s\n", *args); + ERR_print_errors_fp(stderr); + goto end; + } + /* If rv > 0 we processed something so proceed to next arg */ + if (rv > 0) + continue; + /* Otherwise application specific argument processing */ + if (!strcmp(*args, "-connect")) { + connect_str = args[1]; + if (connect_str == NULL) { + fprintf(stderr, "Missing -connect argument\n"); + goto end; + } + args += 2; + nargs -= 2; + continue; + } else { + fprintf(stderr, "Unknown argument %s\n", *args); + goto end; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto err; + } + + /* + * We'd normally set some stuff like the verify paths and * mode here + * because as things stand this will connect to * any server whose + * certificate is signed by any CA. + */ + + sbio = BIO_new_ssl_connect(ctx); + + BIO_get_ssl(sbio, &ssl); + + if (!ssl) { + fprintf(stderr, "Can't locate SSL pointer\n"); + goto end; + } + + /* Don't want any retries */ + SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); + + /* We might want to do other things with ssl here */ + + BIO_set_conn_hostname(sbio, connect_str); + + out = BIO_new_fp(stdout, BIO_NOCLOSE); + if (BIO_do_connect(sbio) <= 0) { + fprintf(stderr, "Error connecting to server\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + if (BIO_do_handshake(sbio) <= 0) { + fprintf(stderr, "Error establishing SSL connection\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + /* Could examine ssl here to get connection info */ + + BIO_puts(sbio, "GET / HTTP/1.0\n\n"); + for (;;) { + len = BIO_read(sbio, tmpbuf, 1024); + if (len <= 0) + break; + BIO_write(out, tmpbuf, len); + } + end: + SSL_CONF_CTX_free(cctx); + BIO_free_all(sbio); + BIO_free(out); + return 0; +} diff --git a/openssl/demos/bio/client-conf.c b/openssl/demos/bio/client-conf.c new file mode 100755 index 000000000..150e7fcf8 --- /dev/null +++ b/openssl/demos/bio/client-conf.c @@ -0,0 +1,120 @@ +#include +#include +#include + +int main(int argc, char **argv) +{ + BIO *sbio = NULL, *out = NULL; + int i, len, rv; + char tmpbuf[1024]; + SSL_CTX *ctx = NULL; + SSL_CONF_CTX *cctx = NULL; + SSL *ssl = NULL; + CONF *conf = NULL; + STACK_OF(CONF_VALUE) *sect = NULL; + CONF_VALUE *cnf; + const char *connect_str = "localhost:4433"; + long errline = -1; + + ERR_load_crypto_strings(); + ERR_load_SSL_strings(); + SSL_library_init(); + + conf = NCONF_new(NULL); + + if (NCONF_load(conf, "connect.cnf", &errline) <= 0) { + if (errline <= 0) + fprintf(stderr, "Error processing config file\n"); + else + fprintf(stderr, "Error on line %ld\n", errline); + goto end; + } + + sect = NCONF_get_section(conf, "default"); + + if (sect == NULL) { + fprintf(stderr, "Error retrieving default section\n"); + goto end; + } + + ctx = SSL_CTX_new(SSLv23_client_method()); + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + for (i = 0; i < sk_CONF_VALUE_num(sect); i++) { + cnf = sk_CONF_VALUE_value(sect, i); + rv = SSL_CONF_cmd(cctx, cnf->name, cnf->value); + if (rv > 0) + continue; + if (rv != -2) { + fprintf(stderr, "Error processing %s = %s\n", + cnf->name, cnf->value); + ERR_print_errors_fp(stderr); + goto end; + } + if (!strcmp(cnf->name, "Connect")) { + connect_str = cnf->value; + } else { + fprintf(stderr, "Unknown configuration option %s\n", cnf->name); + goto end; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto err; + } + + /* + * We'd normally set some stuff like the verify paths and * mode here + * because as things stand this will connect to * any server whose + * certificate is signed by any CA. + */ + + sbio = BIO_new_ssl_connect(ctx); + + BIO_get_ssl(sbio, &ssl); + + if (!ssl) { + fprintf(stderr, "Can't locate SSL pointer\n"); + goto end; + } + + /* Don't want any retries */ + SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); + + /* We might want to do other things with ssl here */ + + BIO_set_conn_hostname(sbio, connect_str); + + out = BIO_new_fp(stdout, BIO_NOCLOSE); + if (BIO_do_connect(sbio) <= 0) { + fprintf(stderr, "Error connecting to server\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + if (BIO_do_handshake(sbio) <= 0) { + fprintf(stderr, "Error establishing SSL connection\n"); + ERR_print_errors_fp(stderr); + goto end; + } + + /* Could examine ssl here to get connection info */ + + BIO_puts(sbio, "GET / HTTP/1.0\n\n"); + for (;;) { + len = BIO_read(sbio, tmpbuf, 1024); + if (len <= 0) + break; + BIO_write(out, tmpbuf, len); + } + end: + SSL_CONF_CTX_free(cctx); + BIO_free_all(sbio); + BIO_free(out); + NCONF_free(conf); + return 0; +} diff --git a/openssl/demos/bio/connect.cnf b/openssl/demos/bio/connect.cnf new file mode 100755 index 000000000..4dee03c37 --- /dev/null +++ b/openssl/demos/bio/connect.cnf @@ -0,0 +1,9 @@ +# Example configuration file +# Connects to the default port of s_server +Connect = localhost:4433 +# Disable TLS v1.2 for test. +# Protocol = ALL, -TLSv1.2 +# Only support 3 curves +Curves = P-521:P-384:P-256 +# Restricted signature algorithms +SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512 diff --git a/openssl/demos/bio/saccept.c b/openssl/demos/bio/saccept.c index 40cd4daad..e79c87232 100644 --- a/openssl/demos/bio/saccept.c +++ b/openssl/demos/bio/saccept.c @@ -1,13 +1,14 @@ /* NOCW */ /* demos/bio/saccept.c */ -/* A minimal program to server an SSL connection. +/*- + * A minimal program to serve an SSL connection. * It uses blocking. * saccept host:port * host is the interface IP to use. If any interface, use *:port * The default it *:4433 * - * cc -I../../include saccept.c -L../.. -lssl -lcrypto + * cc -I../../include saccept.c -L../.. -lssl -lcrypto -ldl */ #include @@ -15,98 +16,102 @@ #include #include -#define CERT_FILE "server.pem" +#define CERT_FILE "server.pem" -BIO *in=NULL; +BIO *in = NULL; void close_up() - { - if (in != NULL) - BIO_free(in); - } +{ + if (in != NULL) + BIO_free(in); +} -int main(argc,argv) +int main(argc, argv) int argc; char *argv[]; - { - char *port=NULL; - BIO *ssl_bio,*tmp; - SSL_CTX *ctx; - SSL *ssl; - char buf[512]; - int ret=1,i; +{ + char *port = NULL; + BIO *ssl_bio, *tmp; + SSL_CTX *ctx; + SSL *ssl; + char buf[512]; + int ret = 1, i; - if (argc <= 1) - port="*:4433"; - else - port=argv[1]; + if (argc <= 1) + port = "*:4433"; + else + port = argv[1]; - signal(SIGINT,close_up); + signal(SIGINT, close_up); - SSL_load_error_strings(); + SSL_load_error_strings(); #ifdef WATT32 - dbug_init(); - sock_init(); + dbug_init(); + sock_init(); #endif - /* Add ciphers and message digests */ - OpenSSL_add_ssl_algorithms(); - - ctx=SSL_CTX_new(SSLv23_server_method()); - if (!SSL_CTX_use_certificate_file(ctx,CERT_FILE,SSL_FILETYPE_PEM)) - goto err; - if (!SSL_CTX_use_PrivateKey_file(ctx,CERT_FILE,SSL_FILETYPE_PEM)) - goto err; - if (!SSL_CTX_check_private_key(ctx)) - goto err; - - /* Setup server side SSL bio */ - ssl=SSL_new(ctx); - ssl_bio=BIO_new_ssl(ctx,0); - - if ((in=BIO_new_accept(port)) == NULL) goto err; - - /* This means that when a new connection is acceptede on 'in', - * The ssl_bio will be 'dupilcated' and have the new socket - * BIO push into it. Basically it means the SSL BIO will be - * automatically setup */ - BIO_set_accept_bios(in,ssl_bio); - -again: - /* The first call will setup the accept socket, and the second - * will get a socket. In this loop, the first actual accept - * will occur in the BIO_read() function. */ - - if (BIO_do_accept(in) <= 0) goto err; - - for (;;) - { - i=BIO_read(in,buf,512); - if (i == 0) - { - /* If we have finished, remove the underlying - * BIO stack so the next time we call any function - * for this BIO, it will attempt to do an - * accept */ - printf("Done\n"); - tmp=BIO_pop(in); - BIO_free_all(tmp); - goto again; - } - if (i < 0) goto err; - fwrite(buf,1,i,stdout); - fflush(stdout); - } - - ret=0; -err: - if (ret) - { - ERR_print_errors_fp(stderr); - } - if (in != NULL) BIO_free(in); - exit(ret); - return(!ret); - } - + /* Add ciphers and message digests */ + OpenSSL_add_ssl_algorithms(); + + ctx = SSL_CTX_new(SSLv23_server_method()); + if (!SSL_CTX_use_certificate_file(ctx, CERT_FILE, SSL_FILETYPE_PEM)) + goto err; + if (!SSL_CTX_use_PrivateKey_file(ctx, CERT_FILE, SSL_FILETYPE_PEM)) + goto err; + if (!SSL_CTX_check_private_key(ctx)) + goto err; + + /* Setup server side SSL bio */ + ssl = SSL_new(ctx); + ssl_bio = BIO_new_ssl(ctx, 0); + + if ((in = BIO_new_accept(port)) == NULL) + goto err; + + /* + * This means that when a new connection is accepted on 'in', The ssl_bio + * will be 'duplicated' and have the new socket BIO push into it. + * Basically it means the SSL BIO will be automatically setup + */ + BIO_set_accept_bios(in, ssl_bio); + + again: + /* + * The first call will setup the accept socket, and the second will get a + * socket. In this loop, the first actual accept will occur in the + * BIO_read() function. + */ + + if (BIO_do_accept(in) <= 0) + goto err; + + for (;;) { + i = BIO_read(in, buf, 512); + if (i == 0) { + /* + * If we have finished, remove the underlying BIO stack so the + * next time we call any function for this BIO, it will attempt + * to do an accept + */ + printf("Done\n"); + tmp = BIO_pop(in); + BIO_free_all(tmp); + goto again; + } + if (i < 0) + goto err; + fwrite(buf, 1, i, stdout); + fflush(stdout); + } + + ret = 0; + err: + if (ret) { + ERR_print_errors_fp(stderr); + } + if (in != NULL) + BIO_free(in); + exit(ret); + return (!ret); +} diff --git a/openssl/demos/bio/sconnect.c b/openssl/demos/bio/sconnect.c index 880344eb7..e6eddb1c0 100644 --- a/openssl/demos/bio/sconnect.c +++ b/openssl/demos/bio/sconnect.c @@ -1,7 +1,8 @@ /* NOCW */ /* demos/bio/sconnect.c */ -/* A minimal program to do SSL to a passed host and port. +/*- + * A minimal program to do SSL to a passed host and port. * It is actually using non-blocking IO but in a very simple manner * sconnect host:port - it does a 'GET / HTTP/1.0' * @@ -15,107 +16,98 @@ extern int errno; -int main(argc,argv) +int main(argc, argv) int argc; char *argv[]; - { - char *host; - BIO *out; - char buf[1024*10],*p; - SSL_CTX *ssl_ctx=NULL; - SSL *ssl; - BIO *ssl_bio; - int i,len,off,ret=1; - - if (argc <= 1) - host="localhost:4433"; - else - host=argv[1]; +{ + char *host; + BIO *out; + char buf[1024 * 10], *p; + SSL_CTX *ssl_ctx = NULL; + SSL *ssl; + BIO *ssl_bio; + int i, len, off, ret = 1; + + if (argc <= 1) + host = "localhost:4433"; + else + host = argv[1]; #ifdef WATT32 - dbug_init(); - sock_init(); + dbug_init(); + sock_init(); #endif - /* Lets get nice error messages */ - SSL_load_error_strings(); - - /* Setup all the global SSL stuff */ - OpenSSL_add_ssl_algorithms(); - ssl_ctx=SSL_CTX_new(SSLv23_client_method()); - - /* Lets make a SSL structure */ - ssl=SSL_new(ssl_ctx); - SSL_set_connect_state(ssl); - - /* Use it inside an SSL BIO */ - ssl_bio=BIO_new(BIO_f_ssl()); - BIO_set_ssl(ssl_bio,ssl,BIO_CLOSE); - - /* Lets use a connect BIO under the SSL BIO */ - out=BIO_new(BIO_s_connect()); - BIO_set_conn_hostname(out,host); - BIO_set_nbio(out,1); - out=BIO_push(ssl_bio,out); - - p="GET / HTTP/1.0\r\n\r\n"; - len=strlen(p); - - off=0; - for (;;) - { - i=BIO_write(out,&(p[off]),len); - if (i <= 0) - { - if (BIO_should_retry(out)) - { - fprintf(stderr,"write DELAY\n"); - sleep(1); - continue; - } - else - { - goto err; - } - } - off+=i; - len-=i; - if (len <= 0) break; - } - - for (;;) - { - i=BIO_read(out,buf,sizeof(buf)); - if (i == 0) break; - if (i < 0) - { - if (BIO_should_retry(out)) - { - fprintf(stderr,"read DELAY\n"); - sleep(1); - continue; - } - goto err; - } - fwrite(buf,1,i,stdout); - } - - ret=1; - - if (0) - { -err: - if (ERR_peek_error() == 0) /* system call error */ - { - fprintf(stderr,"errno=%d ",errno); - perror("error"); - } - else - ERR_print_errors_fp(stderr); - } - BIO_free_all(out); - if (ssl_ctx != NULL) SSL_CTX_free(ssl_ctx); - exit(!ret); - return(ret); - } - + /* Lets get nice error messages */ + SSL_load_error_strings(); + + /* Setup all the global SSL stuff */ + OpenSSL_add_ssl_algorithms(); + ssl_ctx = SSL_CTX_new(SSLv23_client_method()); + + /* Lets make a SSL structure */ + ssl = SSL_new(ssl_ctx); + SSL_set_connect_state(ssl); + + /* Use it inside an SSL BIO */ + ssl_bio = BIO_new(BIO_f_ssl()); + BIO_set_ssl(ssl_bio, ssl, BIO_CLOSE); + + /* Lets use a connect BIO under the SSL BIO */ + out = BIO_new(BIO_s_connect()); + BIO_set_conn_hostname(out, host); + BIO_set_nbio(out, 1); + out = BIO_push(ssl_bio, out); + + p = "GET / HTTP/1.0\r\n\r\n"; + len = strlen(p); + + off = 0; + for (;;) { + i = BIO_write(out, &(p[off]), len); + if (i <= 0) { + if (BIO_should_retry(out)) { + fprintf(stderr, "write DELAY\n"); + sleep(1); + continue; + } else { + goto err; + } + } + off += i; + len -= i; + if (len <= 0) + break; + } + + for (;;) { + i = BIO_read(out, buf, sizeof(buf)); + if (i == 0) + break; + if (i < 0) { + if (BIO_should_retry(out)) { + fprintf(stderr, "read DELAY\n"); + sleep(1); + continue; + } + goto err; + } + fwrite(buf, 1, i, stdout); + } + + ret = 1; + + if (0) { + err: + if (ERR_peek_error() == 0) { /* system call error */ + fprintf(stderr, "errno=%d ", errno); + perror("error"); + } else + ERR_print_errors_fp(stderr); + } + BIO_free_all(out); + if (ssl_ctx != NULL) + SSL_CTX_free(ssl_ctx); + exit(!ret); + return (ret); +} diff --git a/openssl/demos/bio/server-arg.c b/openssl/demos/bio/server-arg.c new file mode 100755 index 000000000..1d0e1db23 --- /dev/null +++ b/openssl/demos/bio/server-arg.c @@ -0,0 +1,144 @@ +/* NOCW */ +/* demos/bio/server-arg.c */ + +/* + * A minimal program to serve an SSL connection. It uses blocking. It use the + * SSL_CONF API with the command line. cc -I../../include server-arg.c + * -L../.. -lssl -lcrypto -ldl + */ + +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + char *port = "*:4433"; + BIO *ssl_bio, *tmp; + SSL_CTX *ctx; + SSL_CONF_CTX *cctx; + char buf[512]; + BIO *in = NULL; + int ret = 1, i; + char **args = argv + 1; + int nargs = argc - 1; + + SSL_load_error_strings(); + + /* Add ciphers and message digests */ + OpenSSL_add_ssl_algorithms(); + + ctx = SSL_CTX_new(SSLv23_server_method()); + + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + while (*args && **args == '-') { + int rv; + /* Parse standard arguments */ + rv = SSL_CONF_cmd_argv(cctx, &nargs, &args); + if (rv == -3) { + fprintf(stderr, "Missing argument for %s\n", *args); + goto err; + } + if (rv < 0) { + fprintf(stderr, "Error in command %s\n", *args); + ERR_print_errors_fp(stderr); + goto err; + } + /* If rv > 0 we processed something so proceed to next arg */ + if (rv > 0) + continue; + /* Otherwise application specific argument processing */ + if (!strcmp(*args, "-port")) { + port = args[1]; + if (port == NULL) { + fprintf(stderr, "Missing -port argument\n"); + goto err; + } + args += 2; + nargs -= 2; + continue; + } else { + fprintf(stderr, "Unknown argument %s\n", *args); + goto err; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto err; + } +#if 0 + /* + * Demo of how to iterate over all certificates in an SSL_CTX structure. + */ + { + X509 *x; + int rv; + rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_FIRST); + while (rv) { + X509 *x = SSL_CTX_get0_certificate(ctx); + X509_NAME_print_ex_fp(stdout, X509_get_subject_name(x), 0, + XN_FLAG_ONELINE); + printf("\n"); + rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_NEXT); + } + fflush(stdout); + } +#endif + /* Setup server side SSL bio */ + ssl_bio = BIO_new_ssl(ctx, 0); + + if ((in = BIO_new_accept(port)) == NULL) + goto err; + + /* + * This means that when a new connection is accepted on 'in', The ssl_bio + * will be 'duplicated' and have the new socket BIO push into it. + * Basically it means the SSL BIO will be automatically setup + */ + BIO_set_accept_bios(in, ssl_bio); + + again: + /* + * The first call will setup the accept socket, and the second will get a + * socket. In this loop, the first actual accept will occur in the + * BIO_read() function. + */ + + if (BIO_do_accept(in) <= 0) + goto err; + + for (;;) { + i = BIO_read(in, buf, 512); + if (i == 0) { + /* + * If we have finished, remove the underlying BIO stack so the + * next time we call any function for this BIO, it will attempt + * to do an accept + */ + printf("Done\n"); + tmp = BIO_pop(in); + BIO_free_all(tmp); + goto again; + } + if (i < 0) + goto err; + fwrite(buf, 1, i, stdout); + fflush(stdout); + } + + ret = 0; + err: + if (ret) { + ERR_print_errors_fp(stderr); + } + if (in != NULL) + BIO_free(in); + exit(ret); + return (!ret); +} diff --git a/openssl/demos/bio/server-conf.c b/openssl/demos/bio/server-conf.c new file mode 100755 index 000000000..a09bc9320 --- /dev/null +++ b/openssl/demos/bio/server-conf.c @@ -0,0 +1,138 @@ +/* NOCW */ +/* demos/bio/saccept-conf.c */ + +/* + * A minimal program to serve an SSL connection. It uses blocking. It uses + * the SSL_CONF API with a configuration file. cc -I../../include saccept.c + * -L../.. -lssl -lcrypto -ldl + */ + +#include +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + char *port = "*:4433"; + BIO *in = NULL; + BIO *ssl_bio, *tmp; + SSL_CTX *ctx; + SSL_CONF_CTX *cctx = NULL; + CONF *conf = NULL; + STACK_OF(CONF_VALUE) *sect = NULL; + CONF_VALUE *cnf; + long errline = -1; + char buf[512]; + int ret = 1, i; + + SSL_load_error_strings(); + + /* Add ciphers and message digests */ + OpenSSL_add_ssl_algorithms(); + + conf = NCONF_new(NULL); + + if (NCONF_load(conf, "accept.cnf", &errline) <= 0) { + if (errline <= 0) + fprintf(stderr, "Error processing config file\n"); + else + fprintf(stderr, "Error on line %ld\n", errline); + goto err; + } + + sect = NCONF_get_section(conf, "default"); + + if (sect == NULL) { + fprintf(stderr, "Error retrieving default section\n"); + goto err; + } + + ctx = SSL_CTX_new(SSLv23_server_method()); + cctx = SSL_CONF_CTX_new(); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE); + SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE); + SSL_CONF_CTX_set_ssl_ctx(cctx, ctx); + for (i = 0; i < sk_CONF_VALUE_num(sect); i++) { + int rv; + cnf = sk_CONF_VALUE_value(sect, i); + rv = SSL_CONF_cmd(cctx, cnf->name, cnf->value); + if (rv > 0) + continue; + if (rv != -2) { + fprintf(stderr, "Error processing %s = %s\n", + cnf->name, cnf->value); + ERR_print_errors_fp(stderr); + goto err; + } + if (!strcmp(cnf->name, "Port")) { + port = cnf->value; + } else { + fprintf(stderr, "Unknown configuration option %s\n", cnf->name); + goto err; + } + } + + if (!SSL_CONF_CTX_finish(cctx)) { + fprintf(stderr, "Finish error\n"); + ERR_print_errors_fp(stderr); + goto err; + } + + /* Setup server side SSL bio */ + ssl_bio = BIO_new_ssl(ctx, 0); + + if ((in = BIO_new_accept(port)) == NULL) + goto err; + + /* + * This means that when a new connection is accepted on 'in', The ssl_bio + * will be 'duplicated' and have the new socket BIO push into it. + * Basically it means the SSL BIO will be automatically setup + */ + BIO_set_accept_bios(in, ssl_bio); + + again: + /* + * The first call will setup the accept socket, and the second will get a + * socket. In this loop, the first actual accept will occur in the + * BIO_read() function. + */ + + if (BIO_do_accept(in) <= 0) + goto err; + + for (;;) { + i = BIO_read(in, buf, 512); + if (i == 0) { + /* + * If we have finished, remove the underlying BIO stack so the + * next time we call any function for this BIO, it will attempt + * to do an accept + */ + printf("Done\n"); + tmp = BIO_pop(in); + BIO_free_all(tmp); + goto again; + } + if (i < 0) { + if (BIO_should_retry(in)) + continue; + goto err; + } + fwrite(buf, 1, i, stdout); + fflush(stdout); + } + + ret = 0; + err: + if (ret) { + ERR_print_errors_fp(stderr); + } + if (in != NULL) + BIO_free(in); + exit(ret); + return (!ret); +} diff --git a/openssl/demos/bio/server.pem b/openssl/demos/bio/server.pem index 5cf1387d6..d0fc265f0 100644 --- a/openssl/demos/bio/server.pem +++ b/openssl/demos/bio/server.pem @@ -1,30 +1,52 @@ -subject=/C=AU/SP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server -issuer= /C=AU/SP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA ------BEGIN X509 CERTIFICATE----- - -MIIBgjCCASwCAQQwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV -BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MTAwOTIz -MzIwNVoXDTk4MDcwNTIzMzIwNVowYDELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM -RDEZMBcGA1UEChMQTWluY29tIFB0eS4gTHRkLjELMAkGA1UECxMCQ1MxGzAZBgNV -BAMTElNTTGVheSBkZW1vIHNlcnZlcjBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3 -LCXcScWua0PFLkHBLm2VejqpA1F4RQ8q0VjRiPafjx/Z/aWH3ipdMVvuJGa/wFXb -/nDFLDlfWp+oCPwhBtVPAgMBAAEwDQYJKoZIhvcNAQEEBQADQQArNFsihWIjBzb0 -DCsU0BvL2bvSwJrPEqFlkDq3F4M6EGutL9axEcANWgbbEdAvNJD1dmEmoWny27Pn -IMs6ZOZB ------END X509 CERTIFICATE----- +subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Server Cert +issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA +-----BEGIN CERTIFICATE----- +MIID5zCCAs+gAwIBAgIJALnu1NlVpZ6zMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV +BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT +VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt +ZWRpYXRlIENBMB4XDTExMTIwODE0MDE0OFoXDTIxMTAxNjE0MDE0OFowZDELMAkG +A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU +RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgU2VydmVyIENlcnQw +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDzhPOSNtyyRspmeuUpxfNJ +KCLTuf7g3uQ4zu4iHOmRO5TQci+HhVlLZrHF9XqFXcIP0y4pWDbMSGuiorUmzmfi +R7bfSdI/+qIQt8KXRH6HNG1t8ou0VSvWId5TS5Dq/er5ODUr9OaaDva7EquHIcMv +vPQGuI+OEAcnleVCy9HVEIySrO4P3CNIicnGkwwiAud05yUAq/gPXBC1hTtmlPD7 +TVcGVSEiJdvzqqlgv02qedGrkki6GY4S7GjZxrrf7Foc2EP+51LJzwLQx3/JfrCU +41NEWAsu/Sl0tQabXESN+zJ1pDqoZ3uHMgpQjeGiE0olr+YcsSW/tJmiU9OiAr8R +AgMBAAGjgY8wgYwwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBeAwLAYJYIZI +AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW +BBSCvM8AABPR9zklmifnr9LvIBturDAfBgNVHSMEGDAWgBQ2w2yI55X+sL3szj49 +hqshgYfa2jANBgkqhkiG9w0BAQUFAAOCAQEAqb1NV0B0/pbpK9Z4/bNjzPQLTRLK +WnSNm/Jh5v0GEUOE/Beg7GNjNrmeNmqxAlpqWz9qoeoFZax+QBpIZYjROU3TS3fp +yLsrnlr0CDQ5R7kCCDGa8dkXxemmpZZLbUCpW2Uoy8sAA4JjN9OtsZY7dvUXFgJ7 +vVNTRnI01ghknbtD+2SxSQd3CWF6QhcRMAzZJ1z1cbbwGDDzfvGFPzJ+Sq+zEPds +xoVLLSetCiBc+40ZcDS5dV98h9XD7JMTQfxzA7mNGv73JoZJA6nFgj+ADSlJsY/t +JBv+z1iQRueoh9Qeee+ZbRifPouCB8FDx+AltvHTANdAq0t/K3o+pplMVA== +-----END CERTIFICATE----- -----BEGIN RSA PRIVATE KEY----- - -MIIBPAIBAAJBALcsJdxJxa5rQ8UuQcEubZV6OqkDUXhFDyrRWNGI9p+PH9n9pYfe -Kl0xW+4kZr/AVdv+cMUsOV9an6gI/CEG1U8CAwEAAQJAXJMBZ34ZXHd1vtgL/3hZ -hexKbVTx/djZO4imXO/dxPGRzG2ylYZpHmG32/T1kaHpZlCHoEPgHoSzmxYXfxjG -sQIhAPmZ/bQOjmRUHM/VM2X5zrjjM6z18R1P6l3ObFwt9FGdAiEAu943Yh9SqMRw -tL0xHGxKmM/YJueUw1gB6sLkETN71NsCIQCeT3RhoqXfrpXDoEcEU+gwzjI1bpxq -agiNTOLfqGoA5QIhAIQFYjgzONxex7FLrsKBm16N2SFl5pXsN9SpRqqL2n63AiEA -g9VNIQ3xwpw7og3IbONifeku+J9qGMGQJMKwSTwrFtI= +MIIEpAIBAAKCAQEA84TzkjbcskbKZnrlKcXzSSgi07n+4N7kOM7uIhzpkTuU0HIv +h4VZS2axxfV6hV3CD9MuKVg2zEhroqK1Js5n4ke230nSP/qiELfCl0R+hzRtbfKL +tFUr1iHeU0uQ6v3q+Tg1K/Tmmg72uxKrhyHDL7z0BriPjhAHJ5XlQsvR1RCMkqzu +D9wjSInJxpMMIgLndOclAKv4D1wQtYU7ZpTw+01XBlUhIiXb86qpYL9NqnnRq5JI +uhmOEuxo2ca63+xaHNhD/udSyc8C0Md/yX6wlONTRFgLLv0pdLUGm1xEjfsydaQ6 +qGd7hzIKUI3hohNKJa/mHLElv7SZolPTogK/EQIDAQABAoIBAADq9FwNtuE5IRQn +zGtO4q7Y5uCzZ8GDNYr9RKp+P2cbuWDbvVAecYq2NV9QoIiWJOAYZKklOvekIju3 +r0UZLA0PRiIrTg6NrESx3JrjWDK8QNlUO7CPTZ39/K+FrmMkV9lem9yxjJjyC34D +AQB+YRTx+l14HppjdxNwHjAVQpIx/uO2F5xAMuk32+3K+pq9CZUtrofe1q4Agj9R +5s8mSy9pbRo9kW9wl5xdEotz1LivFOEiqPUJTUq5J5PeMKao3vdK726XI4Z455Nm +W2/MA0YV0ug2FYinHcZdvKM6dimH8GLfa3X8xKRfzjGjTiMSwsdjgMa4awY3tEHH +674jhAECgYEA/zqMrc0zsbNk83sjgaYIug5kzEpN4ic020rSZsmQxSCerJTgNhmg +utKSCt0Re09Jt3LqG48msahX8ycqDsHNvlEGPQSbMu9IYeO3Wr3fAm75GEtFWePY +BhM73I7gkRt4s8bUiUepMG/wY45c5tRF23xi8foReHFFe9MDzh8fJFECgYEA9EFX +4qAik1pOJGNei9BMwmx0I0gfVEIgu0tzeVqT45vcxbxr7RkTEaDoAG6PlbWP6D9a +WQNLp4gsgRM90ZXOJ4up5DsAWDluvaF4/omabMA+MJJ5kGZ0gCj5rbZbKqUws7x8 +bp+6iBfUPJUbcqNqFmi/08Yt7vrDnMnyMw2A/sECgYEAiiuRMxnuzVm34hQcsbhH +6ymVqf7j0PW2qK0F4H1ocT9qhzWFd+RB3kHWrCjnqODQoI6GbGr/4JepHUpre1ex +4UEN5oSS3G0ru0rC3U4C59dZ5KwDHFm7ffZ1pr52ljfQDUsrjjIMRtuiwNK2OoRa +WSsqiaL+SDzSB+nBmpnAizECgYBdt/y6rerWUx4MhDwwtTnel7JwHyo2MDFS6/5g +n8qC2Lj6/fMDRE22w+CA2esp7EJNQJGv+b27iFpbJEDh+/Lf5YzIT4MwVskQ5bYB +JFcmRxUVmf4e09D7o705U/DjCgMH09iCsbLmqQ38ONIRSHZaJtMDtNTHD1yi+jF+ +OT43gQKBgQC/2OHZoko6iRlNOAQ/tMVFNq7fL81GivoQ9F1U0Qr+DH3ZfaH8eIkX +xT0ToMPJUzWAn8pZv0snA0um6SIgvkCuxO84OkANCVbttzXImIsL7pFzfcwV/ERK +UM6j0ZuSMFOCr/lGPAoOQU0fskidGEHi1/kW+suSr28TqsyYZpwBDQ== -----END RSA PRIVATE KEY----- - ------BEGIN DH PARAMETERS----- -MEYCQQDaWDwW2YUiidDkr3VvTMqS3UvlM7gE+w/tlO+cikQD7VdGUNNpmdsp13Yn -a6LT1BLiGPTdHghM9tgAPnxHdOgzAgEC ------END DH PARAMETERS----- - diff --git a/openssl/demos/cms/cms_comp.c b/openssl/demos/cms/cms_comp.c index 01bf09254..059152fe0 100644 --- a/openssl/demos/cms/cms_comp.c +++ b/openssl/demos/cms/cms_comp.c @@ -4,58 +4,57 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - /* - * On OpenSSL 1.0.0+ only: - * for streaming set CMS_STREAM - */ - int flags = CMS_STREAM; + /* + * On OpenSSL 1.0.0+ only: + * for streaming set CMS_STREAM + */ + int flags = CMS_STREAM; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Open content being compressed */ + /* Open content being compressed */ - in = BIO_new_file("comp.txt", "r"); + in = BIO_new_file("comp.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* compress content */ - cms = CMS_compress(in, NID_zlib_compression, flags); + /* compress content */ + cms = CMS_compress(in, NID_zlib_compression, flags); - if (!cms) - goto err; + if (!cms) + goto err; - out = BIO_new_file("smcomp.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smcomp.txt", "w"); + if (!out) + goto err; - /* Write out S/MIME message */ - if (!SMIME_write_CMS(out, cms, in, flags)) - goto err; + /* Write out S/MIME message */ + if (!SMIME_write_CMS(out, cms, in, flags)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Compressing Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Compressing Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); - if (in) - BIO_free(in); - if (out) - BIO_free(out); + if (cms) + CMS_ContentInfo_free(cms); + if (in) + BIO_free(in); + if (out) + BIO_free(out); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_ddec.c b/openssl/demos/cms/cms_ddec.c index ba68cfdf7..37ac97fd0 100644 --- a/openssl/demos/cms/cms_ddec.c +++ b/openssl/demos/cms/cms_ddec.c @@ -1,89 +1,89 @@ -/* S/MIME detached data decrypt example: rarely done but - * should the need arise this is an example.... +/* + * S/MIME detached data decrypt example: rarely done but should the need + * arise this is an example.... */ #include #include #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL, *dcont = NULL; - X509 *rcert = NULL; - EVP_PKEY *rkey = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *dcont = NULL; + X509 *rcert = NULL; + EVP_PKEY *rkey = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in recipient certificate and private key */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in recipient certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - if (!rcert || !rkey) - goto err; + if (!rcert || !rkey) + goto err; - /* Open PEM file containing enveloped data */ + /* Open PEM file containing enveloped data */ - in = BIO_new_file("smencr.pem", "r"); + in = BIO_new_file("smencr.pem", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Parse PEM content */ - cms = PEM_read_bio_CMS(in, NULL, 0, NULL); + /* Parse PEM content */ + cms = PEM_read_bio_CMS(in, NULL, 0, NULL); - if (!cms) - goto err; + if (!cms) + goto err; - /* Open file containing detached content */ - dcont = BIO_new_file("smencr.out", "rb"); + /* Open file containing detached content */ + dcont = BIO_new_file("smencr.out", "rb"); - if (!in) - goto err; + if (!in) + goto err; - out = BIO_new_file("encrout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("encrout.txt", "w"); + if (!out) + goto err; - /* Decrypt S/MIME message */ - if (!CMS_decrypt(cms, rkey, rcert, dcont, out, 0)) - goto err; + /* Decrypt S/MIME message */ + if (!CMS_decrypt(cms, rkey, rcert, dcont, out, 0)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Decrypting Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Decrypting Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); - if (rcert) - X509_free(rcert); - if (rkey) - EVP_PKEY_free(rkey); + if (cms) + CMS_ContentInfo_free(cms); + if (rcert) + X509_free(rcert); + if (rkey) + EVP_PKEY_free(rkey); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); - if (dcont) - BIO_free(dcont); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); + if (dcont) + BIO_free(dcont); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_dec.c b/openssl/demos/cms/cms_dec.c index 9fee0a3eb..3291eacab 100644 --- a/openssl/demos/cms/cms_dec.c +++ b/openssl/demos/cms/cms_dec.c @@ -4,76 +4,75 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *rcert = NULL; - EVP_PKEY *rkey = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + EVP_PKEY *rkey = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in recipient certificate and private key */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in recipient certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - if (!rcert || !rkey) - goto err; + if (!rcert || !rkey) + goto err; - /* Open S/MIME message to decrypt */ + /* Open S/MIME message to decrypt */ - in = BIO_new_file("smencr.txt", "r"); + in = BIO_new_file("smencr.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Parse message */ - cms = SMIME_read_CMS(in, NULL); + /* Parse message */ + cms = SMIME_read_CMS(in, NULL); - if (!cms) - goto err; + if (!cms) + goto err; - out = BIO_new_file("decout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("decout.txt", "w"); + if (!out) + goto err; - /* Decrypt S/MIME message */ - if (!CMS_decrypt(cms, rkey, rcert, NULL, out, 0)) - goto err; + /* Decrypt S/MIME message */ + if (!CMS_decrypt(cms, rkey, rcert, NULL, out, 0)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Decrypting Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Decrypting Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); - if (rcert) - X509_free(rcert); - if (rkey) - EVP_PKEY_free(rkey); + if (cms) + CMS_ContentInfo_free(cms); + if (rcert) + X509_free(rcert); + if (rkey) + EVP_PKEY_free(rkey); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_denc.c b/openssl/demos/cms/cms_denc.c index 9265e47bf..c86a5fd72 100644 --- a/openssl/demos/cms/cms_denc.c +++ b/openssl/demos/cms/cms_denc.c @@ -1,97 +1,98 @@ -/* S/MIME detached data encrypt example: rarely done but - * should the need arise this is an example.... +/* + * S/MIME detached data encrypt example: rarely done but should the need + * arise this is an example.... */ #include #include #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL, *dout = NULL; - X509 *rcert = NULL; - STACK_OF(X509) *recips = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *dout = NULL; + X509 *rcert = NULL; + STACK_OF(X509) *recips = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - int flags = CMS_STREAM|CMS_DETACHED; + int flags = CMS_STREAM | CMS_DETACHED; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in recipient certificate */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in recipient certificate */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - if (!rcert) - goto err; + if (!rcert) + goto err; - /* Create recipient STACK and add recipient cert to it */ - recips = sk_X509_new_null(); + /* Create recipient STACK and add recipient cert to it */ + recips = sk_X509_new_null(); - if (!recips || !sk_X509_push(recips, rcert)) - goto err; + if (!recips || !sk_X509_push(recips, rcert)) + goto err; - /* sk_X509_pop_free will free up recipient STACK and its contents - * so set rcert to NULL so it isn't freed up twice. - */ - rcert = NULL; + /* + * sk_X509_pop_free will free up recipient STACK and its contents so set + * rcert to NULL so it isn't freed up twice. + */ + rcert = NULL; - /* Open content being encrypted */ + /* Open content being encrypted */ - in = BIO_new_file("encr.txt", "r"); + in = BIO_new_file("encr.txt", "r"); - dout = BIO_new_file("smencr.out", "wb"); + dout = BIO_new_file("smencr.out", "wb"); - if (!in) - goto err; + if (!in) + goto err; - /* encrypt content */ - cms = CMS_encrypt(recips, in, EVP_des_ede3_cbc(), flags); + /* encrypt content */ + cms = CMS_encrypt(recips, in, EVP_des_ede3_cbc(), flags); - if (!cms) - goto err; + if (!cms) + goto err; - out = BIO_new_file("smencr.pem", "w"); - if (!out) - goto err; + out = BIO_new_file("smencr.pem", "w"); + if (!out) + goto err; - if (!CMS_final(cms, in, dout, flags)) - goto err; + if (!CMS_final(cms, in, dout, flags)) + goto err; - /* Write out CMS structure without content */ - if (!PEM_write_bio_CMS(out, cms)) - goto err; + /* Write out CMS structure without content */ + if (!PEM_write_bio_CMS(out, cms)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Encrypting Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Encrypting Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); - if (rcert) - X509_free(rcert); - if (recips) - sk_X509_pop_free(recips, X509_free); + if (cms) + CMS_ContentInfo_free(cms); + if (rcert) + X509_free(rcert); + if (recips) + sk_X509_pop_free(recips, X509_free); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (dout) - BIO_free(dout); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (dout) + BIO_free(dout); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_enc.c b/openssl/demos/cms/cms_enc.c index 916b479d3..e8ecb48e2 100644 --- a/openssl/demos/cms/cms_enc.c +++ b/openssl/demos/cms/cms_enc.c @@ -4,89 +4,89 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *rcert = NULL; - STACK_OF(X509) *recips = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + STACK_OF(X509) *recips = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - /* - * On OpenSSL 1.0.0 and later only: - * for streaming set CMS_STREAM - */ - int flags = CMS_STREAM; + /* + * On OpenSSL 1.0.0 and later only: + * for streaming set CMS_STREAM + */ + int flags = CMS_STREAM; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in recipient certificate */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in recipient certificate */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - if (!rcert) - goto err; + if (!rcert) + goto err; - /* Create recipient STACK and add recipient cert to it */ - recips = sk_X509_new_null(); + /* Create recipient STACK and add recipient cert to it */ + recips = sk_X509_new_null(); - if (!recips || !sk_X509_push(recips, rcert)) - goto err; + if (!recips || !sk_X509_push(recips, rcert)) + goto err; - /* sk_X509_pop_free will free up recipient STACK and its contents - * so set rcert to NULL so it isn't freed up twice. - */ - rcert = NULL; + /* + * sk_X509_pop_free will free up recipient STACK and its contents so set + * rcert to NULL so it isn't freed up twice. + */ + rcert = NULL; - /* Open content being encrypted */ + /* Open content being encrypted */ - in = BIO_new_file("encr.txt", "r"); + in = BIO_new_file("encr.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* encrypt content */ - cms = CMS_encrypt(recips, in, EVP_des_ede3_cbc(), flags); + /* encrypt content */ + cms = CMS_encrypt(recips, in, EVP_des_ede3_cbc(), flags); - if (!cms) - goto err; + if (!cms) + goto err; - out = BIO_new_file("smencr.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smencr.txt", "w"); + if (!out) + goto err; - /* Write out S/MIME message */ - if (!SMIME_write_CMS(out, cms, in, flags)) - goto err; + /* Write out S/MIME message */ + if (!SMIME_write_CMS(out, cms, in, flags)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Encrypting Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Encrypting Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); - if (rcert) - X509_free(rcert); - if (recips) - sk_X509_pop_free(recips, X509_free); + if (cms) + CMS_ContentInfo_free(cms); + if (rcert) + X509_free(rcert); + if (recips) + sk_X509_pop_free(recips, X509_free); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_sign.c b/openssl/demos/cms/cms_sign.c index 6823c34a0..4bf85d138 100644 --- a/openssl/demos/cms/cms_sign.c +++ b/openssl/demos/cms/cms_sign.c @@ -4,86 +4,85 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *scert = NULL; - EVP_PKEY *skey = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL; + EVP_PKEY *skey = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - /* For simple S/MIME signing use CMS_DETACHED. - * On OpenSSL 1.0.0 only: - * for streaming detached set CMS_DETACHED|CMS_STREAM - * for streaming non-detached set CMS_STREAM - */ - int flags = CMS_DETACHED|CMS_STREAM; + /* + * For simple S/MIME signing use CMS_DETACHED. On OpenSSL 1.0.0 only: for + * streaming detached set CMS_DETACHED|CMS_STREAM for streaming + * non-detached set CMS_STREAM + */ + int flags = CMS_DETACHED | CMS_STREAM; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in signer certificate and private key */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in signer certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - if (!scert || !skey) - goto err; + if (!scert || !skey) + goto err; - /* Open content being signed */ + /* Open content being signed */ - in = BIO_new_file("sign.txt", "r"); + in = BIO_new_file("sign.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Sign content */ - cms = CMS_sign(scert, skey, NULL, in, flags); + /* Sign content */ + cms = CMS_sign(scert, skey, NULL, in, flags); - if (!cms) - goto err; + if (!cms) + goto err; - out = BIO_new_file("smout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; - if (!(flags & CMS_STREAM)) - BIO_reset(in); + if (!(flags & CMS_STREAM)) + BIO_reset(in); - /* Write out S/MIME message */ - if (!SMIME_write_CMS(out, cms, in, flags)) - goto err; + /* Write out S/MIME message */ + if (!SMIME_write_CMS(out, cms, in, flags)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Signing Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); - if (scert) - X509_free(scert); - if (skey) - EVP_PKEY_free(skey); + if (cms) + CMS_ContentInfo_free(cms); + if (scert) + X509_free(scert); + if (skey) + EVP_PKEY_free(skey); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_sign2.c b/openssl/demos/cms/cms_sign2.c index 36adee730..7e98a5171 100644 --- a/openssl/demos/cms/cms_sign2.c +++ b/openssl/demos/cms/cms_sign2.c @@ -4,100 +4,99 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *scert = NULL, *scert2 = NULL; - EVP_PKEY *skey = NULL, *skey2 = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL, *scert2 = NULL; + EVP_PKEY *skey = NULL, *skey2 = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - tbio = BIO_new_file("signer.pem", "r"); + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - BIO_free(tbio); + BIO_free(tbio); - tbio = BIO_new_file("signer2.pem", "r"); + tbio = BIO_new_file("signer2.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - scert2 = PEM_read_bio_X509(tbio, NULL, 0, NULL); + scert2 = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - skey2 = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + skey2 = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - if (!scert2 || !skey2) - goto err; + if (!scert2 || !skey2) + goto err; - in = BIO_new_file("sign.txt", "r"); + in = BIO_new_file("sign.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - cms = CMS_sign(NULL, NULL, NULL, in, CMS_STREAM|CMS_PARTIAL); + cms = CMS_sign(NULL, NULL, NULL, in, CMS_STREAM | CMS_PARTIAL); - if (!cms) - goto err; + if (!cms) + goto err; - /* Add each signer in turn */ + /* Add each signer in turn */ - if (!CMS_add1_signer(cms, scert, skey, NULL, 0)) - goto err; + if (!CMS_add1_signer(cms, scert, skey, NULL, 0)) + goto err; - if (!CMS_add1_signer(cms, scert2, skey2, NULL, 0)) - goto err; + if (!CMS_add1_signer(cms, scert2, skey2, NULL, 0)) + goto err; - out = BIO_new_file("smout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; - /* NB: content included and finalized by SMIME_write_CMS */ + /* NB: content included and finalized by SMIME_write_CMS */ - if (!SMIME_write_CMS(out, cms, in, CMS_STREAM)) - goto err; + if (!SMIME_write_CMS(out, cms, in, CMS_STREAM)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Signing Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); + if (cms) + CMS_ContentInfo_free(cms); - if (scert) - X509_free(scert); - if (skey) - EVP_PKEY_free(skey); + if (scert) + X509_free(scert); + if (skey) + EVP_PKEY_free(skey); - if (scert2) - X509_free(scert2); - if (skey) - EVP_PKEY_free(skey2); + if (scert2) + X509_free(scert2); + if (skey) + EVP_PKEY_free(skey2); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_uncomp.c b/openssl/demos/cms/cms_uncomp.c index f15ae2f13..392f4b450 100644 --- a/openssl/demos/cms/cms_uncomp.c +++ b/openssl/demos/cms/cms_uncomp.c @@ -4,53 +4,52 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL; - CMS_ContentInfo *cms = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL; + CMS_ContentInfo *cms = NULL; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Open compressed content */ + /* Open compressed content */ - in = BIO_new_file("smcomp.txt", "r"); + in = BIO_new_file("smcomp.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Sign content */ - cms = SMIME_read_CMS(in, NULL); + /* Sign content */ + cms = SMIME_read_CMS(in, NULL); - if (!cms) - goto err; + if (!cms) + goto err; - out = BIO_new_file("smuncomp.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smuncomp.txt", "w"); + if (!out) + goto err; - /* Uncompress S/MIME message */ - if (!CMS_uncompress(cms, out, NULL, 0)) - goto err; + /* Uncompress S/MIME message */ + if (!CMS_uncompress(cms, out, NULL, 0)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Uncompressing Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Uncompressing Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); + if (cms) + CMS_ContentInfo_free(cms); - if (in) - BIO_free(in); - if (out) - BIO_free(out); + if (in) + BIO_free(in); + if (out) + BIO_free(out); - return ret; + return ret; - } +} diff --git a/openssl/demos/cms/cms_ver.c b/openssl/demos/cms/cms_ver.c index bf1145ed8..ca935517a 100644 --- a/openssl/demos/cms/cms_ver.c +++ b/openssl/demos/cms/cms_ver.c @@ -4,84 +4,82 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL; - X509_STORE *st = NULL; - X509 *cacert = NULL; - CMS_ContentInfo *cms = NULL; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL; + X509_STORE *st = NULL; + X509 *cacert = NULL; + CMS_ContentInfo *cms = NULL; - int ret = 1; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Set up trusted CA certificate store */ + /* Set up trusted CA certificate store */ - st = X509_STORE_new(); + st = X509_STORE_new(); - /* Read in CA certificate */ - tbio = BIO_new_file("cacert.pem", "r"); + /* Read in CA certificate */ + tbio = BIO_new_file("cacert.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - if (!cacert) - goto err; + if (!cacert) + goto err; - if (!X509_STORE_add_cert(st, cacert)) - goto err; + if (!X509_STORE_add_cert(st, cacert)) + goto err; - /* Open message being verified */ + /* Open message being verified */ - in = BIO_new_file("smout.txt", "r"); + in = BIO_new_file("smout.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* parse message */ - cms = SMIME_read_CMS(in, &cont); + /* parse message */ + cms = SMIME_read_CMS(in, &cont); - if (!cms) - goto err; + if (!cms) + goto err; - /* File to output verified content to */ - out = BIO_new_file("smver.txt", "w"); - if (!out) - goto err; + /* File to output verified content to */ + out = BIO_new_file("smver.txt", "w"); + if (!out) + goto err; - if (!CMS_verify(cms, NULL, st, cont, out, 0)) - { - fprintf(stderr, "Verification Failure\n"); - goto err; - } + if (!CMS_verify(cms, NULL, st, cont, out, 0)) { + fprintf(stderr, "Verification Failure\n"); + goto err; + } - fprintf(stderr, "Verification Successful\n"); + fprintf(stderr, "Verification Successful\n"); - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Verifying Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Verifying Data\n"); + ERR_print_errors_fp(stderr); + } - if (cms) - CMS_ContentInfo_free(cms); + if (cms) + CMS_ContentInfo_free(cms); - if (cacert) - X509_free(cacert); + if (cacert) + X509_free(cacert); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/easy_tls/easy-tls.c b/openssl/demos/easy_tls/easy-tls.c index 9cd8314c3..acc688aaf 100644 --- a/openssl/demos/easy_tls/easy-tls.c +++ b/openssl/demos/easy_tls/easy-tls.c @@ -1,9 +1,9 @@ /* -*- Mode: C; c-file-style: "bsd" -*- */ -/* +/*- * easy-tls.c -- generic TLS proxy. * $Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $ */ -/* +/*- (c) Copyright 1999 Bodo Moeller. All rights reserved. This is free software; you can redistributed and/or modify it @@ -14,17 +14,17 @@ or - the following license: */ -/* +/*- * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that each of the following * conditions is met: * * 1. Redistributions qualify as "freeware" or "Open Source Software" under * one of the following terms: - * + * * (a) Redistributions are made at no charge beyond the reasonable cost of * materials and delivery. - * + * * (b) Redistributions are accompanied by a copy of the Source Code * or by an irrevocable offer to provide a copy of the Source Code * for up to three years at the cost of materials and delivery. @@ -33,7 +33,7 @@ * terms as this license. * * 2. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 3. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -62,7 +62,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/*- * Attribution for OpenSSL library: * * This product includes cryptographic software written by Eric Young @@ -73,7 +73,7 @@ */ static char const rcsid[] = -"$Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $"; + "$Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $"; #include #include @@ -99,7 +99,7 @@ static char const rcsid[] = #include #include #ifndef NO_RSA - #include +# include #endif #include #include @@ -109,11 +109,12 @@ static char const rcsid[] = # error "This program needs OpenSSL 0.9.4 or later." #endif -#include "easy-tls.h" /* include after if both are needed */ +#include "easy-tls.h" /* include after if both are + * needed */ #if TLS_INFO_SIZE > PIPE_BUF # if PIPE_BUF < 512 -# error "PIPE_BUF < 512" /* non-POSIX */ +# error "PIPE_BUF < 512" /* non-POSIX */ # endif # error "TLS_INFO_SIZE > PIPE_BUF" #endif @@ -124,9 +125,10 @@ static char const rcsid[] = # include TLS_APP #endif -/* Applications can define: +/*- + * Applications can define: * TLS_APP_PROCESS_INIT -- void ...(int fd, int client_p, void *apparg) - * TLS_CUMULATE_ERRORS + * TLS_CUMULATE_ERRORS * TLS_ERROR_BUFSIZ * TLS_APP_ERRFLUSH -- void ...(int child_p, char *, size_t, void *apparg) */ @@ -138,7 +140,7 @@ static char const rcsid[] = #ifndef TLS_ERROR_BUFSIZ # define TLS_ERROR_BUFSIZ (10*160) #endif -#if TLS_ERROR_BUFSIZ < 2 /* {'\n',0} */ +#if TLS_ERROR_BUFSIZ < 2 /* {'\n',0} */ # error "TLS_ERROR_BUFSIZE is too small." #endif @@ -164,15 +166,14 @@ static int tls_select_count = 0; #endif static void tls_rand_seed_uniquely(void); -static void tls_proxy(int clear_fd, int tls_fd, int info_fd, SSL_CTX *ctx, int client_p); +static void tls_proxy(int clear_fd, int tls_fd, int info_fd, SSL_CTX *ctx, + int client_p); static int tls_socket_nonblocking(int fd); static int tls_child_p = 0; static void *tls_child_apparg; - -struct tls_start_proxy_args -tls_start_proxy_defaultargs(void) +struct tls_start_proxy_args tls_start_proxy_defaultargs(void) { struct tls_start_proxy_args ret; @@ -181,11 +182,12 @@ tls_start_proxy_defaultargs(void) ret.ctx = NULL; ret.pid = NULL; ret.infofd = NULL; - + return ret; } -/* Slice in TLS proxy process at fd. +/*- + * Slice in TLS proxy process at fd. * Return value: * 0 ok (*pid is set to child's PID if pid != NULL), * < 0 look at errno @@ -193,11 +195,10 @@ tls_start_proxy_defaultargs(void) * (return value encodes place of error) * */ -int -tls_start_proxy(struct tls_start_proxy_args a, void *apparg) +int tls_start_proxy(struct tls_start_proxy_args a, void *apparg) { - int fds[2] = {-1, -1}; - int infofds[2] = {-1, -1}; + int fds[2] = { -1, -1 }; + int infofds[2] = { -1, -1 }; int r, getfd, getfl; int ret; @@ -205,52 +206,52 @@ tls_start_proxy(struct tls_start_proxy_args a, void *apparg) DEBUG_MSG2("tls_start_proxy client_p", a.client_p); if (a.fd == -1 || a.client_p == -1 || a.ctx == NULL) - return 1; + return 1; if (a.pid != NULL) { - *a.pid = 0; + *a.pid = 0; } if (a.infofd != NULL) { - *a.infofd = -1; + *a.infofd = -1; } r = socketpair(AF_UNIX, SOCK_STREAM, 0, fds); if (r == -1) - return -1; + return -1; if (a.fd >= FD_SETSIZE || fds[0] >= FD_SETSIZE) { - ret = 2; - goto err; + ret = 2; + goto err; } if (a.infofd != NULL) { - r = pipe(infofds); - if (r == -1) { - ret = -3; - goto err; - } + r = pipe(infofds); + if (r == -1) { + ret = -3; + goto err; + } } r = fork(); if (r == -1) { - ret = -4; - goto err; + ret = -4; + goto err; } if (r == 0) { - DEBUG_MSG("fork"); - tls_child_p = 1; - tls_child_apparg = apparg; - close(fds[1]); - if (infofds[0] != -1) - close(infofds[0]); - TLS_APP_PROCESS_INIT(a.fd, a.client_p, apparg); - DEBUG_MSG("TLS_APP_PROCESS_INIT"); - tls_proxy(fds[0], a.fd, infofds[1], a.ctx, a.client_p); - exit(0); + DEBUG_MSG("fork"); + tls_child_p = 1; + tls_child_apparg = apparg; + close(fds[1]); + if (infofds[0] != -1) + close(infofds[0]); + TLS_APP_PROCESS_INIT(a.fd, a.client_p, apparg); + DEBUG_MSG("TLS_APP_PROCESS_INIT"); + tls_proxy(fds[0], a.fd, infofds[1], a.ctx, a.client_p); + exit(0); } if (a.pid != NULL) - *a.pid = r; + *a.pid = r; if (infofds[1] != -1) { - close(infofds[1]); - infofds[1] = -1; + close(infofds[1]); + infofds[1] = -1; } /* install fds[1] in place of fd: */ close(fds[0]); @@ -261,26 +262,26 @@ tls_start_proxy(struct tls_start_proxy_args a, void *apparg) close(fds[1]); fds[1] = -1; if (r == -1) { - ret = -5; - goto err; + ret = -5; + goto err; } if (getfd != 1) - fcntl(a.fd, F_SETFD, getfd); + fcntl(a.fd, F_SETFD, getfd); if (getfl & O_NONBLOCK) - (void)tls_socket_nonblocking(a.fd); + (void)tls_socket_nonblocking(a.fd); if (a.infofd != NULL) - *a.infofd = infofds[0]; + *a.infofd = infofds[0]; return 0; - - err: + + err: if (fds[0] != -1) - close(fds[0]); + close(fds[0]); if (fds[1] != -1) - close(fds[1]); + close(fds[1]); if (infofds[0] != -1) - close(infofds[0]); + close(infofds[0]); if (infofds[1] != -1) - close(infofds[1]); + close(infofds[1]); return ret; } @@ -289,62 +290,64 @@ tls_start_proxy(struct tls_start_proxy_args a, void *apparg) static char errbuf[TLS_ERROR_BUFSIZ]; static size_t errbuf_i = 0; -static void -tls_errflush(void *apparg) +static void tls_errflush(void *apparg) { if (errbuf_i == 0) - return; - + return; + assert(errbuf_i < sizeof errbuf); assert(errbuf[errbuf_i] == 0); if (errbuf_i == sizeof errbuf - 1) { - /* make sure we have a newline, even if string has been truncated */ - errbuf[errbuf_i - 1] = '\n'; + /* make sure we have a newline, even if string has been truncated */ + errbuf[errbuf_i - 1] = '\n'; } - /* TLS_APP_ERRFLUSH may modify the string as needed, - * e.g. substitute other characters for \n for convenience */ + /* + * TLS_APP_ERRFLUSH may modify the string as needed, e.g. substitute + * other characters for \n for convenience + */ TLS_APP_ERRFLUSH(tls_child_p, errbuf, errbuf_i, apparg); errbuf_i = 0; } -static void -tls_errprintf(int flush, void *apparg, const char *fmt, ...) +static void tls_errprintf(int flush, void *apparg, const char *fmt, ...) { va_list args; int r; - + if (errbuf_i < sizeof errbuf - 1) { - size_t n; - - va_start(args, fmt); - n = (sizeof errbuf) - errbuf_i; - r = vsnprintf(errbuf + errbuf_i, n, fmt, args); - if (r >= n) - r = n - 1; - if (r >= 0) { - errbuf_i += r; - } else { - errbuf_i = sizeof errbuf - 1; - errbuf[errbuf_i] = '\0'; - } - assert(errbuf_i < sizeof errbuf); - assert(errbuf[errbuf_i] == 0); + size_t n; + + va_start(args, fmt); + n = (sizeof errbuf) - errbuf_i; + r = vsnprintf(errbuf + errbuf_i, n, fmt, args); + if (r >= n) + r = n - 1; + if (r >= 0) { + errbuf_i += r; + } else { + errbuf_i = sizeof errbuf - 1; + errbuf[errbuf_i] = '\0'; + } + assert(errbuf_i < sizeof errbuf); + assert(errbuf[errbuf_i] == 0); } #ifndef TLS_CUMULATE_ERRORS tls_errflush(apparg); #else if (flush) - tls_errflush(apparg); + tls_errflush(apparg); #endif } -/* app_prefix.. are for additional information provided by caller. - * If OpenSSL error queue is empty, print default_text ("???" if NULL). +/* + * app_prefix.. are for additional information provided by caller. If OpenSSL + * error queue is empty, print default_text ("???" if NULL). */ -static char * -tls_openssl_errors(const char *app_prefix_1, const char *app_prefix_2, const char *default_text, void *apparg) +static char *tls_openssl_errors(const char *app_prefix_1, + const char *app_prefix_2, + const char *default_text, void *apparg) { static char reasons[255]; size_t reasons_i; @@ -355,45 +358,49 @@ tls_openssl_errors(const char *app_prefix_1, const char *app_prefix_2, const cha int flags; char *errstring; int printed_something = 0; - + reasons_i = 0; assert(app_prefix_1 != NULL); assert(app_prefix_2 != NULL); if (default_text == NULL) - default_text = "?""?""?"; - - while ((err = ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) { - if (reasons_i < sizeof reasons) { - size_t n; - int r; - - n = (sizeof reasons) - reasons_i; - r = snprintf(reasons + reasons_i, n, "%s%s", (reasons_i > 0 ? ", " : ""), ERR_reason_error_string(err)); - if (r >= n) - r = n - 1; - if (r >= 0) { - reasons_i += r; - } else { - reasons_i = sizeof reasons; - } - assert(reasons_i <= sizeof reasons); - } - - errstring = ERR_error_string(err, NULL); - assert(errstring != NULL); - tls_errprintf(0, apparg, "OpenSSL error%s%s: %s:%s:%d:%s\n", app_prefix_1, app_prefix_2, errstring, file, line, (flags & ERR_TXT_STRING) ? data : ""); - printed_something = 1; + default_text = "?" "?" "?"; + + while ((err = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0) { + if (reasons_i < sizeof reasons) { + size_t n; + int r; + + n = (sizeof reasons) - reasons_i; + r = snprintf(reasons + reasons_i, n, "%s%s", + (reasons_i > 0 ? ", " : ""), + ERR_reason_error_string(err)); + if (r >= n) + r = n - 1; + if (r >= 0) { + reasons_i += r; + } else { + reasons_i = sizeof reasons; + } + assert(reasons_i <= sizeof reasons); + } + + errstring = ERR_error_string(err, NULL); + assert(errstring != NULL); + tls_errprintf(0, apparg, "OpenSSL error%s%s: %s:%s:%d:%s\n", + app_prefix_1, app_prefix_2, errstring, file, line, + (flags & ERR_TXT_STRING) ? data : ""); + printed_something = 1; } if (!printed_something) { - assert(reasons_i == 0); - snprintf(reasons, sizeof reasons, "%s", default_text); - tls_errprintf(0, apparg, "OpenSSL error%s%s: %s\n", app_prefix_1, app_prefix_2, default_text); + assert(reasons_i == 0); + snprintf(reasons, sizeof reasons, "%s", default_text); + tls_errprintf(0, apparg, "OpenSSL error%s%s: %s\n", app_prefix_1, + app_prefix_2, default_text); } - -#ifdef TLS_CUMULATE_ERRORS +#ifdef TLS_CUMULATE_ERRORS tls_errflush(apparg); #endif assert(errbuf_i == 0); @@ -405,16 +412,15 @@ tls_openssl_errors(const char *app_prefix_1, const char *app_prefix_2, const cha static int tls_init_done = 0; -static int -tls_init(void *apparg) +static int tls_init(void *apparg) { if (tls_init_done) - return 0; - + return 0; + SSL_load_error_strings(); if (!SSL_library_init() /* aka SSLeay_add_ssl_algorithms() */ ) { - tls_errprintf(1, apparg, "SSL_library_init failed.\n"); - return -1; + tls_errprintf(1, apparg, "SSL_library_init failed.\n"); + return -1; } tls_init_done = 1; tls_rand_seed(); @@ -423,13 +429,12 @@ tls_init(void *apparg) /*****************************************************************************/ -static void -tls_rand_seed_uniquely(void) +static void tls_rand_seed_uniquely(void) { struct { - pid_t pid; - time_t time; - void *stack; + pid_t pid; + time_t time; + void *stack; } data; data.pid = getpid(); @@ -439,80 +444,84 @@ tls_rand_seed_uniquely(void) RAND_seed((const void *)&data, sizeof data); } -void -tls_rand_seed(void) +void tls_rand_seed(void) { struct { - struct utsname uname; - int uname_1; - int uname_2; - uid_t uid; - uid_t euid; - gid_t gid; - gid_t egid; + struct utsname uname; + int uname_1; + int uname_2; + uid_t uid; + uid_t euid; + gid_t gid; + gid_t egid; } data; - + data.uname_1 = uname(&data.uname); - data.uname_2 = errno; /* Let's hope that uname fails randomly :-) */ + data.uname_2 = errno; /* Let's hope that uname fails randomly :-) */ data.uid = getuid(); data.euid = geteuid(); data.gid = getgid(); data.egid = getegid(); - + RAND_seed((const void *)&data, sizeof data); tls_rand_seed_uniquely(); } static int tls_rand_seeded_p = 0; -#define my_MIN_SEED_BYTES 256 /* struct stat can be larger than 128 */ -int -tls_rand_seed_from_file(const char *filename, size_t n, void *apparg) +#define my_MIN_SEED_BYTES 256 /* struct stat can be larger than 128 */ +int tls_rand_seed_from_file(const char *filename, size_t n, void *apparg) { - /* Seed OpenSSL's random number generator from file. - Try to read n bytes if n > 0, whole file if n == 0. */ + /* + * Seed OpenSSL's random number generator from file. Try to read n bytes + * if n > 0, whole file if n == 0. + */ int r; if (tls_init(apparg) == -1) - return -1; + return -1; tls_rand_seed(); - r = RAND_load_file(filename, (n > 0 && n < LONG_MAX) ? (long)n : LONG_MAX); - /* r is the number of bytes filled into the random number generator, - * which are taken from "stat(filename, ...)" in addition to the - * file contents. + r = RAND_load_file(filename, + (n > 0 && n < LONG_MAX) ? (long)n : LONG_MAX); + /* + * r is the number of bytes filled into the random number generator, + * which are taken from "stat(filename, ...)" in addition to the file + * contents. */ assert(1 < my_MIN_SEED_BYTES); - /* We need to detect at least those cases when the file does not exist - * at all. With current versions of OpenSSL, this should do it: */ + /* + * We need to detect at least those cases when the file does not exist at + * all. With current versions of OpenSSL, this should do it: + */ if (n == 0) - n = my_MIN_SEED_BYTES; + n = my_MIN_SEED_BYTES; if (r < n) { - tls_errprintf(1, apparg, "rand_seed_from_file: could not read %d bytes from %s.\n", n, filename); - return -1; + tls_errprintf(1, apparg, + "rand_seed_from_file: could not read %d bytes from %s.\n", + n, filename); + return -1; } else { - tls_rand_seeded_p = 1; - return 0; + tls_rand_seeded_p = 1; + return 0; } } -void -tls_rand_seed_from_memory(const void *buf, size_t n) +void tls_rand_seed_from_memory(const void *buf, size_t n) { size_t i = 0; - + while (i < n) { - size_t rest = n - i; - int chunk = rest < INT_MAX ? (int)rest : INT_MAX; - RAND_seed((const char *)buf + i, chunk); - i += chunk; + size_t rest = n - i; + int chunk = rest < INT_MAX ? (int)rest : INT_MAX; + RAND_seed((const char *)buf + i, chunk); + i += chunk; } tls_rand_seeded_p = 1; } - /*****************************************************************************/ struct tls_x509_name_string { @@ -520,341 +529,367 @@ struct tls_x509_name_string { }; static void -tls_get_x509_subject_name_oneline(X509 *cert, struct tls_x509_name_string *namestring) +tls_get_x509_subject_name_oneline(X509 *cert, + struct tls_x509_name_string *namestring) { X509_NAME *name; if (cert == NULL) { - namestring->str[0] = '\0'; - return; + namestring->str[0] = '\0'; + return; } - - name = X509_get_subject_name(cert); /* does not increment any reference counter */ + + name = X509_get_subject_name(cert); /* does not increment any reference + * counter */ assert(sizeof namestring->str >= 4); /* "?" or "...", plus 0 */ - + if (name == NULL) { - namestring->str[0] = '?'; - namestring->str[1] = 0; + namestring->str[0] = '?'; + namestring->str[1] = 0; } else { - size_t len; - - X509_NAME_oneline(name, namestring->str, sizeof namestring->str); - len = strlen(namestring->str); - assert(namestring->str[len] == 0); - assert(len < sizeof namestring->str); - - if (len+1 == sizeof namestring->str) { - /* (Probably something was cut off.) - * Does not really work -- X509_NAME_oneline truncates after - * name components, we cannot tell from the result whether - * anything is missing. */ - - assert(namestring->str[len] == 0); - namestring->str[--len] = '.'; - namestring->str[--len] = '.'; - namestring->str[--len] = '.'; - } + size_t len; + + X509_NAME_oneline(name, namestring->str, sizeof namestring->str); + len = strlen(namestring->str); + assert(namestring->str[len] == 0); + assert(len < sizeof namestring->str); + + if (len + 1 == sizeof namestring->str) { + /* + * (Probably something was cut off.) Does not really work -- + * X509_NAME_oneline truncates after name components, we cannot + * tell from the result whether anything is missing. + */ + + assert(namestring->str[len] == 0); + namestring->str[--len] = '.'; + namestring->str[--len] = '.'; + namestring->str[--len] = '.'; + } } } /*****************************************************************************/ /* to hinder OpenSSL from asking for passphrases */ -static int -no_passphrase_callback(char *buf, int num, int w, void *arg) +static int no_passphrase_callback(char *buf, int num, int w, void *arg) { return -1; } #if OPENSSL_VERSION_NUMBER >= 0x00907000L -static int -verify_dont_fail_cb(X509_STORE_CTX *c, void *unused_arg) +static int verify_dont_fail_cb(X509_STORE_CTX *c, void *unused_arg) #else -static int -verify_dont_fail_cb(X509_STORE_CTX *c) +static int verify_dont_fail_cb(X509_STORE_CTX *c) #endif { int i; - - i = X509_verify_cert(c); /* sets c->error */ + + i = X509_verify_cert(c); /* sets c->error */ #if OPENSSL_VERSION_NUMBER >= 0x00905000L /* don't allow unverified - * certificates -- they could - * survive session reuse, but - * OpenSSL < 0.9.5-dev does not - * preserve their verify_result */ + * certificates -- they could + * survive session reuse, but + * OpenSSL < 0.9.5-dev does not + * preserve their verify_result */ if (i == 0) - return 1; + return 1; else #endif - return i; + return i; } -static DH *tls_dhe1024 = NULL; /* generating these takes a while, so do it just once */ +static DH *tls_dhe1024 = NULL; /* generating these takes a while, so do it + * just once */ -void -tls_set_dhe1024(int i, void *apparg) +void tls_set_dhe1024(int i, void *apparg) { DSA *dsaparams; DH *dhparams; const char *seed[] = { ";-) :-( :-) :-( ", - ";-) :-( :-) :-( ", - "Random String no. 12", - ";-) :-( :-) :-( ", - "hackers have even mo", /* from jargon file */ + ";-) :-( :-) :-( ", + "Random String no. 12", + ";-) :-( :-) :-( ", + "hackers have even mo", /* from jargon file */ }; unsigned char seedbuf[20]; - + tls_init(apparg); if (i >= 0) { - i %= sizeof seed / sizeof seed[0]; - assert(strlen(seed[i]) == 20); - memcpy(seedbuf, seed[i], 20); - dsaparams = DSA_generate_parameters(1024, seedbuf, 20, NULL, NULL, 0, NULL); + i %= sizeof seed / sizeof seed[0]; + assert(strlen(seed[i]) == 20); + memcpy(seedbuf, seed[i], 20); + dsaparams = + DSA_generate_parameters(1024, seedbuf, 20, NULL, NULL, 0, NULL); } else { - /* random parameters (may take a while) */ - dsaparams = DSA_generate_parameters(1024, NULL, 0, NULL, NULL, 0, NULL); + /* random parameters (may take a while) */ + dsaparams = + DSA_generate_parameters(1024, NULL, 0, NULL, NULL, 0, NULL); } - + if (dsaparams == NULL) { - tls_openssl_errors("", "", NULL, apparg); - return; + tls_openssl_errors("", "", NULL, apparg); + return; } dhparams = DSA_dup_DH(dsaparams); DSA_free(dsaparams); if (dhparams == NULL) { - tls_openssl_errors("", "", NULL, apparg); - return; + tls_openssl_errors("", "", NULL, apparg); + return; } if (tls_dhe1024 != NULL) - DH_free(tls_dhe1024); + DH_free(tls_dhe1024); tls_dhe1024 = dhparams; } -struct tls_create_ctx_args -tls_create_ctx_defaultargs(void) +struct tls_create_ctx_args tls_create_ctx_defaultargs(void) { - struct tls_create_ctx_args ret; + struct tls_create_ctx_args ret; - ret.client_p = 0; - ret.certificate_file = NULL; - ret.key_file = NULL; - ret.ca_file = NULL; - ret.verify_depth = -1; - ret.fail_unless_verified = 0; - ret.export_p = 0; + ret.client_p = 0; + ret.certificate_file = NULL; + ret.key_file = NULL; + ret.ca_file = NULL; + ret.verify_depth = -1; + ret.fail_unless_verified = 0; + ret.export_p = 0; - return ret; + return ret; } -SSL_CTX * -tls_create_ctx(struct tls_create_ctx_args a, void *apparg) +SSL_CTX *tls_create_ctx(struct tls_create_ctx_args a, void *apparg) { int r; static long context_num = 0; SSL_CTX *ret; const char *err_pref_1 = "", *err_pref_2 = ""; - + if (tls_init(apparg) == -1) - return NULL; + return NULL; - ret = SSL_CTX_new((a.client_p? SSLv23_client_method:SSLv23_server_method)()); + ret = + SSL_CTX_new((a.client_p ? SSLv23_client_method : + SSLv23_server_method) ()); if (ret == NULL) - goto err; + goto err; SSL_CTX_set_default_passwd_cb(ret, no_passphrase_callback); SSL_CTX_set_mode(ret, SSL_MODE_ENABLE_PARTIAL_WRITE); - + if ((a.certificate_file != NULL) || (a.key_file != NULL)) { - if (a.key_file == NULL) { - tls_errprintf(1, apparg, "Need a key file.\n"); - goto err_return; - } - if (a.certificate_file == NULL) { - tls_errprintf(1, apparg, "Need a certificate chain file.\n"); - goto err_return; - } - - if (!SSL_CTX_use_PrivateKey_file(ret, a.key_file, SSL_FILETYPE_PEM)) - goto err; - if (!tls_rand_seeded_p) { - /* particularly paranoid people may not like this -- - * so provide your own random seeding before calling this */ - if (tls_rand_seed_from_file(a.key_file, 0, apparg) == -1) - goto err_return; - } - if (!SSL_CTX_use_certificate_chain_file(ret, a.certificate_file)) - goto err; - if (!SSL_CTX_check_private_key(ret)) { - tls_errprintf(1, apparg, "Private key \"%s\" does not match certificate \"%s\".\n", a.key_file, a.certificate_file); - goto err_peek; - } + if (a.key_file == NULL) { + tls_errprintf(1, apparg, "Need a key file.\n"); + goto err_return; + } + if (a.certificate_file == NULL) { + tls_errprintf(1, apparg, "Need a certificate chain file.\n"); + goto err_return; + } + + if (!SSL_CTX_use_PrivateKey_file(ret, a.key_file, SSL_FILETYPE_PEM)) + goto err; + if (!tls_rand_seeded_p) { + /* + * particularly paranoid people may not like this -- so provide + * your own random seeding before calling this + */ + if (tls_rand_seed_from_file(a.key_file, 0, apparg) == -1) + goto err_return; + } + if (!SSL_CTX_use_certificate_chain_file(ret, a.certificate_file)) + goto err; + if (!SSL_CTX_check_private_key(ret)) { + tls_errprintf(1, apparg, + "Private key \"%s\" does not match certificate \"%s\".\n", + a.key_file, a.certificate_file); + goto err_peek; + } } - + if ((a.ca_file != NULL) || (a.verify_depth > 0)) { - context_num++; - r = SSL_CTX_set_session_id_context(ret, (const void *)&context_num, (unsigned int)sizeof context_num); - if (!r) - goto err; - - SSL_CTX_set_verify(ret, SSL_VERIFY_PEER | (a.fail_unless_verified ? SSL_VERIFY_FAIL_IF_NO_PEER_CERT : 0), 0); - if (!a.fail_unless_verified) - SSL_CTX_set_cert_verify_callback(ret, verify_dont_fail_cb, NULL); - - if (a.verify_depth > 0) - SSL_CTX_set_verify_depth(ret, a.verify_depth); - - if (a.ca_file != NULL) { - r = SSL_CTX_load_verify_locations(ret, a.ca_file, NULL /* no CA-directory */); /* does not report failure if file does not exist ... */ - if (!r) { - err_pref_1 = " while processing certificate file "; - err_pref_2 = a.ca_file; - goto err; - } - - if (!a.client_p) { - /* SSL_load_client_CA_file is a misnomer, it just creates a list of CNs. */ - SSL_CTX_set_client_CA_list(ret, SSL_load_client_CA_file(a.ca_file)); - /* SSL_CTX_set_client_CA_list does not have a return value; - * it does not really need one, but make sure - * (we really test if SSL_load_client_CA_file worked) */ - if (SSL_CTX_get_client_CA_list(ret) == NULL) { - tls_errprintf(1, apparg, "Could not set client CA list from \"%s\".\n", a.ca_file); - goto err_peek; - } - } - } + context_num++; + r = SSL_CTX_set_session_id_context(ret, (const void *)&context_num, + (unsigned int)sizeof context_num); + if (!r) + goto err; + + SSL_CTX_set_verify(ret, + SSL_VERIFY_PEER | (a.fail_unless_verified ? + SSL_VERIFY_FAIL_IF_NO_PEER_CERT + : 0), 0); + if (!a.fail_unless_verified) + SSL_CTX_set_cert_verify_callback(ret, verify_dont_fail_cb, NULL); + + if (a.verify_depth > 0) + SSL_CTX_set_verify_depth(ret, a.verify_depth); + + if (a.ca_file != NULL) { + /* does not report failure if file does not exist ... */ + /* NULL argument means no CA-directory */ + r = SSL_CTX_load_verify_locations(ret, a.ca_file, NULL); + if (!r) { + err_pref_1 = " while processing certificate file "; + err_pref_2 = a.ca_file; + goto err; + } + + if (!a.client_p) { + /* + * SSL_load_client_CA_file is a misnomer, it just creates a + * list of CNs. + */ + SSL_CTX_set_client_CA_list(ret, + SSL_load_client_CA_file + (a.ca_file)); + /* + * SSL_CTX_set_client_CA_list does not have a return value; + * it does not really need one, but make sure (we really test + * if SSL_load_client_CA_file worked) + */ + if (SSL_CTX_get_client_CA_list(ret) == NULL) { + tls_errprintf(1, apparg, + "Could not set client CA list from \"%s\".\n", + a.ca_file); + goto err_peek; + } + } + } } - + if (!a.client_p) { - if (tls_dhe1024 == NULL) { - int i; - - RAND_bytes((unsigned char *) &i, sizeof i); - /* make sure that i is non-negative -- pick one of the provided - * seeds */ - if (i < 0) - i = -i; - if (i < 0) - i = 0; - tls_set_dhe1024(i, apparg); - if (tls_dhe1024 == NULL) - goto err_return; - } - - if (!SSL_CTX_set_tmp_dh(ret, tls_dhe1024)) - goto err; - - /* avoid small subgroup attacks: */ - SSL_CTX_set_options(ret, SSL_OP_SINGLE_DH_USE); + if (tls_dhe1024 == NULL) { + int i; + + RAND_bytes((unsigned char *)&i, sizeof i); + /* + * make sure that i is non-negative -- pick one of the provided + * seeds + */ + if (i < 0) + i = -i; + if (i < 0) + i = 0; + tls_set_dhe1024(i, apparg); + if (tls_dhe1024 == NULL) + goto err_return; + } + + if (!SSL_CTX_set_tmp_dh(ret, tls_dhe1024)) + goto err; + + /* avoid small subgroup attacks: */ + SSL_CTX_set_options(ret, SSL_OP_SINGLE_DH_USE); } - #ifndef NO_RSA if (!a.client_p && a.export_p) { - RSA *tmpkey; - - tmpkey = RSA_generate_key(512, RSA_F4, 0, NULL); - if (tmpkey == NULL) - goto err; - if (!SSL_CTX_set_tmp_rsa(ret, tmpkey)) { - RSA_free(tmpkey); - goto err; - } - RSA_free(tmpkey); /* SSL_CTX_set_tmp_rsa uses a duplicate. */ + RSA *tmpkey; + + tmpkey = RSA_generate_key(512, RSA_F4, 0, NULL); + if (tmpkey == NULL) + goto err; + if (!SSL_CTX_set_tmp_rsa(ret, tmpkey)) { + RSA_free(tmpkey); + goto err; + } + RSA_free(tmpkey); /* SSL_CTX_set_tmp_rsa uses a duplicate. */ } #endif - + return ret; - + err_peek: if (!ERR_peek_error()) - goto err_return; + goto err_return; err: tls_openssl_errors(err_pref_1, err_pref_2, NULL, apparg); err_return: if (ret != NULL) - SSL_CTX_free(ret); + SSL_CTX_free(ret); return NULL; } - /*****************************************************************************/ -static int -tls_socket_nonblocking(int fd) +static int tls_socket_nonblocking(int fd) { int v, r; v = fcntl(fd, F_GETFL, 0); if (v == -1) { - if (errno == EINVAL) - return 0; /* already shut down -- ignore */ - return -1; + if (errno == EINVAL) + return 0; /* already shut down -- ignore */ + return -1; } r = fcntl(fd, F_SETFL, v | O_NONBLOCK); if (r == -1) { - if (errno == EINVAL) - return 0; /* already shut down -- ignore */ - return -1; + if (errno == EINVAL) + return 0; /* already shut down -- ignore */ + return -1; } return 0; } -static int -max(int a, int b) +static int max(int a, int b) { return a > b ? a : b; } +/* timeout, -1 means no timeout */ static void -tls_sockets_select(int read_select_1, int read_select_2, int write_select_1, int write_select_2, int seconds /* timeout, -1 means no timeout */) +tls_sockets_select(int read_select_1, int read_select_2, int write_select_1, + int write_select_2, int seconds) { int maxfd, n; fd_set reads, writes; struct timeval timeout; struct timeval *timeout_p; - - assert(read_select_1 >= -1 && read_select_2 >= -1 && write_select_1 >= -1 && write_select_2 >= -1); - assert(read_select_1 < FD_SETSIZE && read_select_2 < FD_SETSIZE -1 && write_select_1 < FD_SETSIZE -1 && write_select_2 < FD_SETSIZE -1); - maxfd = max(max(read_select_1, read_select_2), max(write_select_1, write_select_2)); + assert(read_select_1 >= -1 && read_select_2 >= -1 && write_select_1 >= -1 + && write_select_2 >= -1); + assert(read_select_1 < FD_SETSIZE && read_select_2 < FD_SETSIZE - 1 + && write_select_1 < FD_SETSIZE - 1 + && write_select_2 < FD_SETSIZE - 1); + + maxfd = + max(max(read_select_1, read_select_2), + max(write_select_1, write_select_2)); assert(maxfd >= 0); FD_ZERO(&reads); FD_ZERO(&writes); - - for(n = 0; n < 4; ++n) { - int i = n % 2; - int w = n >= 2; - /* loop over all (i, w) in {0,1}x{0,1} */ - int fd; - - if (i == 0 && w == 0) - fd = read_select_1; - else if (i == 1 && w == 0) - fd = read_select_2; - else if (i == 0 && w == 1) - fd = write_select_1; - else { - assert(i == 1 && w == 1); - fd = write_select_2; - } - - if (fd >= 0) { - if (w == 0) - FD_SET(fd, &reads); - else /* w == 1 */ - FD_SET(fd, &writes); - } + + for (n = 0; n < 4; ++n) { + int i = n % 2; + int w = n >= 2; + /* loop over all (i, w) in {0,1}x{0,1} */ + int fd; + + if (i == 0 && w == 0) + fd = read_select_1; + else if (i == 1 && w == 0) + fd = read_select_2; + else if (i == 0 && w == 1) + fd = write_select_1; + else { + assert(i == 1 && w == 1); + fd = write_select_2; + } + + if (fd >= 0) { + if (w == 0) + FD_SET(fd, &reads); + else /* w == 1 */ + FD_SET(fd, &writes); + } } if (seconds >= 0) { - timeout.tv_sec = seconds; - timeout.tv_usec = 0; - timeout_p = &timeout; - } else - timeout_p = NULL; + timeout.tv_sec = seconds; + timeout.tv_usec = 0; + timeout_p = &timeout; + } else + timeout_p = NULL; DEBUG_MSG2("select no.", ++tls_select_count); select(maxfd + 1, &reads, &writes, (fd_set *) NULL, timeout_p); @@ -870,56 +905,65 @@ struct tunnelbuf { size_t offset; }; -static int tls_connect_attempt(SSL *, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref); +static int tls_connect_attempt(SSL *, int *write_select, int *read_select, + int *closed, int *progress, + const char **err_pref); -static int tls_accept_attempt(SSL *, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref); +static int tls_accept_attempt(SSL *, int *write_select, int *read_select, + int *closed, int *progress, + const char **err_pref); -static int tls_write_attempt(SSL *, struct tunnelbuf *, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref); +static int tls_write_attempt(SSL *, struct tunnelbuf *, int *write_select, + int *read_select, int *closed, int *progress, + const char **err_pref); -static int tls_read_attempt(SSL *, struct tunnelbuf *, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref); +static int tls_read_attempt(SSL *, struct tunnelbuf *, int *write_select, + int *read_select, int *closed, int *progress, + const char **err_pref); -static int write_attempt(int fd, struct tunnelbuf *, int *select, int *closed, int *progress); +static int write_attempt(int fd, struct tunnelbuf *, int *select, int *closed, + int *progress); -static int read_attempt(int fd, struct tunnelbuf *, int *select, int *closed, int *progress); +static int read_attempt(int fd, struct tunnelbuf *, int *select, int *closed, + int *progress); static void write_info(SSL *ssl, int *info_fd) { if (*info_fd != -1) { - long v; - int v_ok; - struct tls_x509_name_string peer; - char infobuf[TLS_INFO_SIZE]; - int r; - - DEBUG_MSG("write_info"); - v = SSL_get_verify_result(ssl); - v_ok = (v == X509_V_OK) ? 'A' : 'E'; /* Auth./Error */ - { - X509 *peercert; - - peercert = SSL_get_peer_certificate(ssl); - tls_get_x509_subject_name_oneline(peercert, &peer); - if (peercert != NULL) - X509_free(peercert); - } - if (peer.str[0] == '\0') - v_ok = '0'; /* no cert at all */ - else - if (strchr(peer.str, '\n')) { - /* should not happen, but make sure */ - *strchr(peer.str, '\n') = '\0'; - } - r = snprintf(infobuf, sizeof infobuf, "%c:%s\n%s\n", v_ok, X509_verify_cert_error_string(v), peer.str); - DEBUG_MSG2("snprintf", r); - if (r == -1 || r >= sizeof infobuf) - r = sizeof infobuf - 1; - write(*info_fd, infobuf, r); - close (*info_fd); - *info_fd = -1; + long v; + int v_ok; + struct tls_x509_name_string peer; + char infobuf[TLS_INFO_SIZE]; + int r; + + DEBUG_MSG("write_info"); + v = SSL_get_verify_result(ssl); + v_ok = (v == X509_V_OK) ? 'A' : 'E'; /* Auth./Error */ + { + X509 *peercert; + + peercert = SSL_get_peer_certificate(ssl); + tls_get_x509_subject_name_oneline(peercert, &peer); + if (peercert != NULL) + X509_free(peercert); + } + if (peer.str[0] == '\0') + v_ok = '0'; /* no cert at all */ + else if (strchr(peer.str, '\n')) { + /* should not happen, but make sure */ + *strchr(peer.str, '\n') = '\0'; + } + r = snprintf(infobuf, sizeof infobuf, "%c:%s\n%s\n", v_ok, + X509_verify_cert_error_string(v), peer.str); + DEBUG_MSG2("snprintf", r); + if (r == -1 || r >= sizeof infobuf) + r = sizeof infobuf - 1; + write(*info_fd, infobuf, r); + close(*info_fd); + *info_fd = -1; } } - /* tls_proxy expects that all fds are closed after return */ static void tls_proxy(int clear_fd, int tls_fd, int info_fd, SSL_CTX *ctx, int client_p) @@ -947,19 +991,19 @@ tls_proxy(int clear_fd, int tls_fd, int info_fd, SSL_CTX *ctx, int client_p) ssl = SSL_new(ctx); if (ssl == NULL) - goto err; + goto err; DEBUG_MSG("SSL_new"); if (!SSL_set_fd(ssl, tls_fd)) - goto err; + goto err; rbio = SSL_get_rbio(ssl); - wbio = SSL_get_wbio(ssl); /* should be the same, but who cares */ + wbio = SSL_get_wbio(ssl); /* should be the same, but who cares */ assert(rbio != NULL); assert(wbio != NULL); if (client_p) - SSL_set_connect_state(ssl); + SSL_set_connect_state(ssl); else - SSL_set_accept_state(ssl); - + SSL_set_accept_state(ssl); + closed = 0; in_handshake = 1; tls_to_clear.len = 0; @@ -968,100 +1012,117 @@ tls_proxy(int clear_fd, int tls_fd, int info_fd, SSL_CTX *ctx, int client_p) clear_to_tls.offset = 0; err_def = "I/O error"; - - /* loop finishes as soon as we detect that one side closed; - * when all (program and OS) buffers have enough space, - * the data from the last succesful read in each direction is transferred - * before close */ + + /* + * loop finishes as soon as we detect that one side closed; when all + * (program and OS) buffers have enough space, the data from the last + * succesful read in each direction is transferred before close + */ do { - int clear_read_select = 0, clear_write_select = 0, - tls_read_select = 0, tls_write_select = 0, - progress = 0; - int r; - unsigned long num_read = BIO_number_read(rbio), - num_written = BIO_number_written(wbio); - - DEBUG_MSG2("loop iteration", ++tls_loop_count); - - if (in_handshake) { - DEBUG_MSG("in_handshake"); - if (client_p) - r = tls_connect_attempt(ssl, &tls_write_select, &tls_read_select, &closed, &progress, &err_pref_1); - else - r = tls_accept_attempt(ssl, &tls_write_select, &tls_read_select, &closed, &progress, &err_pref_1); - if (r != 0) { - write_info(ssl, &info_fd); - goto err; - } - if (closed) - goto err_return; - if (!SSL_in_init(ssl)) { - in_handshake = 0; - write_info(ssl, &info_fd); - } - } - - if (clear_to_tls.len != 0 && !in_handshake) { - assert(!closed); - - r = tls_write_attempt(ssl, &clear_to_tls, &tls_write_select, &tls_read_select, &closed, &progress, &err_pref_1); - if (r != 0) - goto err; - if (closed) { - assert(progress); - tls_to_clear.offset = 0; - tls_to_clear.len = 0; - } - } - - if (tls_to_clear.len != 0) { - assert(!closed); - - r = write_attempt(clear_fd, &tls_to_clear, &clear_write_select, &closed, &progress); - if (r != 0) - goto err_return; - if (closed) { - assert(progress); - clear_to_tls.offset = 0; - clear_to_tls.len = 0; - } - } - - if (!closed) { - if (clear_to_tls.offset + clear_to_tls.len < sizeof clear_to_tls.buf) { - r = read_attempt(clear_fd, &clear_to_tls, &clear_read_select, &closed, &progress); - if (r != 0) - goto err_return; - if (closed) { - r = SSL_shutdown(ssl); - DEBUG_MSG2("SSL_shutdown", r); - } - } - } - - if (!closed && !in_handshake) { - if (tls_to_clear.offset + tls_to_clear.len < sizeof tls_to_clear.buf) { - r = tls_read_attempt(ssl, &tls_to_clear, &tls_write_select, &tls_read_select, &closed, &progress, &err_pref_1); - if (r != 0) - goto err; - if (closed) { - r = SSL_shutdown(ssl); - DEBUG_MSG2("SSL_shutdown", r); - } - } - } - - if (!progress) { - DEBUG_MSG("!progress?"); - if (num_read != BIO_number_read(rbio) || num_written != BIO_number_written(wbio)) - progress = 1; - - if (!progress) { - DEBUG_MSG("!progress"); - assert(clear_read_select || tls_read_select || clear_write_select || tls_write_select); - tls_sockets_select(clear_read_select ? clear_fd : -1, tls_read_select ? tls_fd : -1, clear_write_select ? clear_fd : -1, tls_write_select ? tls_fd : -1, -1); - } - } + int clear_read_select = 0, clear_write_select = 0, + tls_read_select = 0, tls_write_select = 0, progress = 0; + int r; + unsigned long num_read = BIO_number_read(rbio), + num_written = BIO_number_written(wbio); + + DEBUG_MSG2("loop iteration", ++tls_loop_count); + + if (in_handshake) { + DEBUG_MSG("in_handshake"); + if (client_p) + r = tls_connect_attempt(ssl, &tls_write_select, + &tls_read_select, &closed, &progress, + &err_pref_1); + else + r = tls_accept_attempt(ssl, &tls_write_select, + &tls_read_select, &closed, &progress, + &err_pref_1); + if (r != 0) { + write_info(ssl, &info_fd); + goto err; + } + if (closed) + goto err_return; + if (!SSL_in_init(ssl)) { + in_handshake = 0; + write_info(ssl, &info_fd); + } + } + + if (clear_to_tls.len != 0 && !in_handshake) { + assert(!closed); + + r = tls_write_attempt(ssl, &clear_to_tls, &tls_write_select, + &tls_read_select, &closed, &progress, + &err_pref_1); + if (r != 0) + goto err; + if (closed) { + assert(progress); + tls_to_clear.offset = 0; + tls_to_clear.len = 0; + } + } + + if (tls_to_clear.len != 0) { + assert(!closed); + + r = write_attempt(clear_fd, &tls_to_clear, &clear_write_select, + &closed, &progress); + if (r != 0) + goto err_return; + if (closed) { + assert(progress); + clear_to_tls.offset = 0; + clear_to_tls.len = 0; + } + } + + if (!closed) { + if (clear_to_tls.offset + clear_to_tls.len < + sizeof clear_to_tls.buf) { + r = read_attempt(clear_fd, &clear_to_tls, &clear_read_select, + &closed, &progress); + if (r != 0) + goto err_return; + if (closed) { + r = SSL_shutdown(ssl); + DEBUG_MSG2("SSL_shutdown", r); + } + } + } + + if (!closed && !in_handshake) { + if (tls_to_clear.offset + tls_to_clear.len < + sizeof tls_to_clear.buf) { + r = tls_read_attempt(ssl, &tls_to_clear, &tls_write_select, + &tls_read_select, &closed, &progress, + &err_pref_1); + if (r != 0) + goto err; + if (closed) { + r = SSL_shutdown(ssl); + DEBUG_MSG2("SSL_shutdown", r); + } + } + } + + if (!progress) { + DEBUG_MSG("!progress?"); + if (num_read != BIO_number_read(rbio) + || num_written != BIO_number_written(wbio)) + progress = 1; + + if (!progress) { + DEBUG_MSG("!progress"); + assert(clear_read_select || tls_read_select + || clear_write_select || tls_write_select); + tls_sockets_select(clear_read_select ? clear_fd : -1, + tls_read_select ? tls_fd : -1, + clear_write_select ? clear_fd : -1, + tls_write_select ? tls_fd : -1, -1); + } + } } while (!closed); return; @@ -1071,91 +1132,97 @@ tls_proxy(int clear_fd, int tls_fd, int info_fd, SSL_CTX *ctx, int client_p) return; } - static int -tls_get_error(SSL *ssl, int r, int *write_select, int *read_select, int *closed, int *progress) +tls_get_error(SSL *ssl, int r, int *write_select, int *read_select, + int *closed, int *progress) { int err = SSL_get_error(ssl, r); if (err == SSL_ERROR_NONE) { - assert(r > 0); - *progress = 1; - return 0; + assert(r > 0); + *progress = 1; + return 0; } assert(r <= 0); switch (err) { case SSL_ERROR_ZERO_RETURN: - assert(r == 0); - *closed = 1; - *progress = 1; - return 0; + assert(r == 0); + *closed = 1; + *progress = 1; + return 0; case SSL_ERROR_WANT_WRITE: - *write_select = 1; - return 0; - + *write_select = 1; + return 0; + case SSL_ERROR_WANT_READ: - *read_select = 1; - return 0; + *read_select = 1; + return 0; } return -1; } static int -tls_connect_attempt(SSL *ssl, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref) +tls_connect_attempt(SSL *ssl, int *write_select, int *read_select, + int *closed, int *progress, const char **err_pref) { int n, r; DEBUG_MSG("tls_connect_attempt"); n = SSL_connect(ssl); - DEBUG_MSG2("SSL_connect",n); + DEBUG_MSG2("SSL_connect", n); r = tls_get_error(ssl, n, write_select, read_select, closed, progress); if (r == -1) - *err_pref = " during SSL_connect"; + *err_pref = " during SSL_connect"; return r; } static int -tls_accept_attempt(SSL *ssl, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref) +tls_accept_attempt(SSL *ssl, int *write_select, int *read_select, int *closed, + int *progress, const char **err_pref) { int n, r; DEBUG_MSG("tls_accept_attempt"); n = SSL_accept(ssl); - DEBUG_MSG2("SSL_accept",n); + DEBUG_MSG2("SSL_accept", n); r = tls_get_error(ssl, n, write_select, read_select, closed, progress); if (r == -1) - *err_pref = " during SSL_accept"; + *err_pref = " during SSL_accept"; return r; } static int -tls_write_attempt(SSL *ssl, struct tunnelbuf *buf, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref) +tls_write_attempt(SSL *ssl, struct tunnelbuf *buf, int *write_select, + int *read_select, int *closed, int *progress, + const char **err_pref) { int n, r; DEBUG_MSG("tls_write_attempt"); n = SSL_write(ssl, buf->buf + buf->offset, buf->len); - DEBUG_MSG2("SSL_write",n); + DEBUG_MSG2("SSL_write", n); r = tls_get_error(ssl, n, write_select, read_select, closed, progress); if (n > 0) { - buf->len -= n; - assert(buf->len >= 0); - if (buf->len == 0) - buf->offset = 0; - else - buf->offset += n; + buf->len -= n; + assert(buf->len >= 0); + if (buf->len == 0) + buf->offset = 0; + else + buf->offset += n; } if (r == -1) - *err_pref = " during SSL_write"; + *err_pref = " during SSL_write"; return r; } static int -tls_read_attempt(SSL *ssl, struct tunnelbuf *buf, int *write_select, int *read_select, int *closed, int *progress, const char **err_pref) +tls_read_attempt(SSL *ssl, struct tunnelbuf *buf, int *write_select, + int *read_select, int *closed, int *progress, + const char **err_pref) { int n, r; size_t total; @@ -1164,62 +1231,64 @@ tls_read_attempt(SSL *ssl, struct tunnelbuf *buf, int *write_select, int *read_s total = buf->offset + buf->len; assert(total < sizeof buf->buf); n = SSL_read(ssl, buf->buf + total, (sizeof buf->buf) - total); - DEBUG_MSG2("SSL_read",n); + DEBUG_MSG2("SSL_read", n); r = tls_get_error(ssl, n, write_select, read_select, closed, progress); if (n > 0) { - buf->len += n; - assert(buf->offset + buf->len <= sizeof buf->buf); + buf->len += n; + assert(buf->offset + buf->len <= sizeof buf->buf); } if (r == -1) - *err_pref = " during SSL_read"; + *err_pref = " during SSL_read"; return r; } -static int -get_error(int r, int *select, int *closed, int *progress) +static int get_error(int r, int *select, int *closed, int *progress) { if (r >= 0) { - *progress = 1; - if (r == 0) - *closed = 1; - return 0; + *progress = 1; + if (r == 0) + *closed = 1; + return 0; } else { - assert(r == -1); - if (errno == EAGAIN || errno == EWOULDBLOCK) { - *select = 1; - return 0; - } else if (errno == EPIPE) { - *progress = 1; - *closed = 1; - return 0; - } else - return -1; + assert(r == -1); + if (errno == EAGAIN || errno == EWOULDBLOCK) { + *select = 1; + return 0; + } else if (errno == EPIPE) { + *progress = 1; + *closed = 1; + return 0; + } else + return -1; } } -static int write_attempt(int fd, struct tunnelbuf *buf, int *select, int *closed, int *progress) +static int write_attempt(int fd, struct tunnelbuf *buf, int *select, + int *closed, int *progress) { int n, r; DEBUG_MSG("write_attempt"); n = write(fd, buf->buf + buf->offset, buf->len); - DEBUG_MSG2("write",n); + DEBUG_MSG2("write", n); r = get_error(n, select, closed, progress); if (n > 0) { - buf->len -= n; - assert(buf->len >= 0); - if (buf->len == 0) - buf->offset = 0; - else - buf->offset += n; + buf->len -= n; + assert(buf->len >= 0); + if (buf->len == 0) + buf->offset = 0; + else + buf->offset += n; } if (r == -1) - tls_errprintf(1, tls_child_apparg, "write error: %s\n", strerror(errno)); + tls_errprintf(1, tls_child_apparg, "write error: %s\n", + strerror(errno)); return r; } - + static int -read_attempt(int fd, struct tunnelbuf *buf, int *select, int *closed, int *progress) +read_attempt(int fd, struct tunnelbuf *buf, int *select, int *closed, + int *progress) { int n, r; size_t total; @@ -1228,13 +1297,14 @@ read_attempt(int fd, struct tunnelbuf *buf, int *select, int *closed, int *progr total = buf->offset + buf->len; assert(total < sizeof buf->buf); n = read(fd, buf->buf + total, (sizeof buf->buf) - total); - DEBUG_MSG2("read",n); + DEBUG_MSG2("read", n); r = get_error(n, select, closed, progress); if (n > 0) { - buf->len += n; - assert(buf->offset + buf->len <= sizeof buf->buf); + buf->len += n; + assert(buf->offset + buf->len <= sizeof buf->buf); } if (r == -1) - tls_errprintf(1, tls_child_apparg, "read error: %s\n", strerror(errno)); + tls_errprintf(1, tls_child_apparg, "read error: %s\n", + strerror(errno)); return r; } diff --git a/openssl/demos/easy_tls/easy-tls.h b/openssl/demos/easy_tls/easy-tls.h index 52b298e65..1c587b861 100644 --- a/openssl/demos/easy_tls/easy-tls.h +++ b/openssl/demos/easy_tls/easy-tls.h @@ -1,5 +1,5 @@ /* -*- Mode: C; c-file-style: "bsd" -*- */ -/* +/*- * easy-tls.h -- generic TLS proxy. * $Id: easy-tls.h,v 1.1 2001/09/17 19:06:59 bodo Exp $ */ @@ -8,26 +8,26 @@ */ #ifndef HEADER_TLS_H -#define HEADER_TLS_H +# define HEADER_TLS_H -#ifndef HEADER_SSL_H +# ifndef HEADER_SSL_H typedef struct ssl_ctx_st SSL_CTX; -#endif +# endif -#define TLS_INFO_SIZE 512 /* max. # of bytes written to infofd */ +# define TLS_INFO_SIZE 512 /* max. # of bytes written to infofd */ -void tls_set_dhe1024(int i, void* apparg); -/* Generate DHE parameters: - * i >= 0 deterministic (i selects seed), i < 0 random (may take a while). - * tls_create_ctx calls this with random non-negative i if the application - * has never called it.*/ +void tls_set_dhe1024(int i, void *apparg); +/* + * Generate DHE parameters: i >= 0 deterministic (i selects seed), i < 0 + * random (may take a while). tls_create_ctx calls this with random + * non-negative i if the application has never called it. + */ void tls_rand_seed(void); int tls_rand_seed_from_file(const char *filename, size_t n, void *apparg); void tls_rand_seed_from_memory(const void *buf, size_t n); -struct tls_create_ctx_args -{ +struct tls_create_ctx_args { int client_p; const char *certificate_file; const char *key_file; @@ -37,12 +37,13 @@ struct tls_create_ctx_args int export_p; }; struct tls_create_ctx_args tls_create_ctx_defaultargs(void); -/* struct tls_create_ctx_args is similar to a conventional argument list, - * but it can provide default values and allows for future extension. */ +/* + * struct tls_create_ctx_args is similar to a conventional argument list, but + * it can provide default values and allows for future extension. + */ SSL_CTX *tls_create_ctx(struct tls_create_ctx_args, void *apparg); -struct tls_start_proxy_args -{ +struct tls_start_proxy_args { int fd; int client_p; SSL_CTX *ctx; @@ -50,8 +51,10 @@ struct tls_start_proxy_args int *infofd; }; struct tls_start_proxy_args tls_start_proxy_defaultargs(void); -/* tls_start_proxy return value *MUST* be checked! - * 0 means ok, otherwise we've probably run out of some resources. */ +/* + * tls_start_proxy return value *MUST* be checked! 0 means ok, otherwise + * we've probably run out of some resources. + */ int tls_start_proxy(struct tls_start_proxy_args, void *apparg); #endif diff --git a/openssl/demos/easy_tls/test.c b/openssl/demos/easy_tls/test.c index 21f679afd..d1dd53d0c 100644 --- a/openssl/demos/easy_tls/test.c +++ b/openssl/demos/easy_tls/test.c @@ -20,21 +20,19 @@ #include "test.h" #include "easy-tls.h" -void -test_process_init(int fd, int client_p, void *apparg) +void test_process_init(int fd, int client_p, void *apparg) { - fprintf(stderr, "test_process_init(fd = %d, client_p = %d, apparg = %p)\n", fd, client_p, apparg); + fprintf(stderr, + "test_process_init(fd = %d, client_p = %d, apparg = %p)\n", fd, + client_p, apparg); } -void -test_errflush(int child_p, char *errbuf, size_t num, void *apparg) +void test_errflush(int child_p, char *errbuf, size_t num, void *apparg) { fputs(errbuf, stderr); } - -int -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int s, fd, r; FILE *conn_in; @@ -47,198 +45,204 @@ main(int argc, char *argv[]) char infobuf[TLS_INFO_SIZE + 1]; if (argc > 1 && argv[1][0] == '-') { - fputs("Usage: test [port] -- server\n" - " test num.num.num.num [port] -- client\n", - stderr); - exit(1); + fputs("Usage: test [port] -- server\n" + " test num.num.num.num [port] -- client\n", stderr); + exit(1); } if (argc > 1) { - if (strchr(argv[1], '.')) { - client_p = 1; - } + if (strchr(argv[1], '.')) { + client_p = 1; + } } - + fputs(client_p ? "Client\n" : "Server\n", stderr); - + { - struct tls_create_ctx_args a = tls_create_ctx_defaultargs(); - a.client_p = client_p; - a.certificate_file = "cert.pem"; - a.key_file = "cert.pem"; - a.ca_file = "cacerts.pem"; - - ctx = tls_create_ctx(a, NULL); - if (ctx == NULL) - exit(1); + struct tls_create_ctx_args a = tls_create_ctx_defaultargs(); + a.client_p = client_p; + a.certificate_file = "cert.pem"; + a.key_file = "cert.pem"; + a.ca_file = "cacerts.pem"; + + ctx = tls_create_ctx(a, NULL); + if (ctx == NULL) + exit(1); } - + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (s == -1) { - perror("socket"); - exit(1); + perror("socket"); + exit(1); } - + if (client_p) { - struct sockaddr_in addr; - size_t addr_len = sizeof addr; - - addr.sin_family = AF_INET; - assert(argc > 1); - if (argc > 2) - sscanf(argv[2], "%d", &port); - else - port = C_PORT; - addr.sin_port = htons(port); - addr.sin_addr.s_addr = inet_addr(argv[1]); - - r = connect(s, &addr, addr_len); - if (r != 0) { - perror("connect"); - exit(1); - } - fd = s; - fprintf(stderr, "Connect (fd = %d).\n", fd); + struct sockaddr_in addr; + size_t addr_len = sizeof addr; + + addr.sin_family = AF_INET; + assert(argc > 1); + if (argc > 2) + sscanf(argv[2], "%d", &port); + else + port = C_PORT; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = inet_addr(argv[1]); + + r = connect(s, &addr, addr_len); + if (r != 0) { + perror("connect"); + exit(1); + } + fd = s; + fprintf(stderr, "Connect (fd = %d).\n", fd); } else { - /* server */ - { - int i = 1; - - r = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *) &i, sizeof i); - if (r == -1) { - perror("setsockopt"); - exit(1); - } - } - - { - struct sockaddr_in addr; - size_t addr_len = sizeof addr; - - if (argc > 1) - sscanf(argv[1], "%d", &port); - else - port = L_PORT; - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr.s_addr = INADDR_ANY; - - r = bind(s, &addr, addr_len); - if (r != 0) { - perror("bind"); - exit(1); - } - } - - r = listen(s, 1); - if (r == -1) { - perror("listen"); - exit(1); - } - - fprintf(stderr, "Listening at port %i.\n", port); - - fd = accept(s, NULL, 0); - if (fd == -1) { - perror("accept"); - exit(1); - } - - fprintf(stderr, "Accept (fd = %d).\n", fd); + /* server */ + { + int i = 1; + + r = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&i, sizeof i); + if (r == -1) { + perror("setsockopt"); + exit(1); + } + } + + { + struct sockaddr_in addr; + size_t addr_len = sizeof addr; + + if (argc > 1) + sscanf(argv[1], "%d", &port); + else + port = L_PORT; + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = INADDR_ANY; + + r = bind(s, &addr, addr_len); + if (r != 0) { + perror("bind"); + exit(1); + } + } + + r = listen(s, 1); + if (r == -1) { + perror("listen"); + exit(1); + } + + fprintf(stderr, "Listening at port %i.\n", port); + + fd = accept(s, NULL, 0); + if (fd == -1) { + perror("accept"); + exit(1); + } + + fprintf(stderr, "Accept (fd = %d).\n", fd); } conn_in = fdopen(fd, "r"); if (conn_in == NULL) { - perror("fdopen"); - exit(1); + perror("fdopen"); + exit(1); } conn_out = fdopen(fd, "w"); if (conn_out == NULL) { - perror("fdopen"); - exit(1); + perror("fdopen"); + exit(1); } setvbuf(conn_in, NULL, _IOLBF, 256); setvbuf(conn_out, NULL, _IOLBF, 256); - + while (fgets(buf, sizeof buf, stdin) != NULL) { - if (buf[0] == 'W') { - fprintf(conn_out, "%.*s\r\n", (int)(strlen(buf + 1) - 1), buf + 1); - fprintf(stderr, ">>> %.*s\n", (int)(strlen(buf + 1) - 1), buf + 1); - } else if (buf[0] == 'C') { - fprintf(stderr, "Closing.\n"); - fclose(conn_in); - fclose(conn_out); - exit(0); - } else if (buf[0] == 'R') { - int lines = 0; - - sscanf(buf + 1, "%d", &lines); - do { - if (fgets(buf, sizeof buf, conn_in) == NULL) { - if (ferror(conn_in)) { - fprintf(stderr, "ERROR\n"); - exit(1); - } - fprintf(stderr, "CLOSED\n"); - return 0; - } - fprintf(stderr, "<<< %s", buf); - } while (--lines > 0); - } else if (buf[0] == 'T') { - int infofd; - - tls++; - { - struct tls_start_proxy_args a = tls_start_proxy_defaultargs(); - a.fd = fd; - a.client_p = client_p; - a.ctx = ctx; - a.infofd = &infofd; - r = tls_start_proxy(a, NULL); - } - assert(r != 1); - if (r != 0) { - fprintf(stderr, "tls_start_proxy failed: %d\n", r); - switch (r) { - case -1: - fputs("socketpair", stderr); break; - case 2: - fputs("FD_SETSIZE exceeded", stderr); break; - case -3: - fputs("pipe", stderr); break; - case -4: - fputs("fork", stderr); break; - case -5: - fputs("dup2", stderr); break; - default: - fputs("?", stderr); - } - if (r < 0) - perror(""); - else - fputc('\n', stderr); - exit(1); - } - - r = read(infofd, infobuf, sizeof infobuf - 1); - if (r > 0) { - const char *info = infobuf; - const char *eol; - - infobuf[r] = '\0'; - while ((eol = strchr(info, '\n')) != NULL) { - fprintf(stderr, "+++ `%.*s'\n", eol - info, info); - info = eol+1; - } - close (infofd); - } - } else { - fprintf(stderr, "W... write line to network\n" - "R[n] read line (n lines) from network\n" - "C close\n" - "T start %sTLS proxy\n", tls ? "another " : ""); - } + if (buf[0] == 'W') { + fprintf(conn_out, "%.*s\r\n", (int)(strlen(buf + 1) - 1), + buf + 1); + fprintf(stderr, ">>> %.*s\n", (int)(strlen(buf + 1) - 1), + buf + 1); + } else if (buf[0] == 'C') { + fprintf(stderr, "Closing.\n"); + fclose(conn_in); + fclose(conn_out); + exit(0); + } else if (buf[0] == 'R') { + int lines = 0; + + sscanf(buf + 1, "%d", &lines); + do { + if (fgets(buf, sizeof buf, conn_in) == NULL) { + if (ferror(conn_in)) { + fprintf(stderr, "ERROR\n"); + exit(1); + } + fprintf(stderr, "CLOSED\n"); + return 0; + } + fprintf(stderr, "<<< %s", buf); + } while (--lines > 0); + } else if (buf[0] == 'T') { + int infofd; + + tls++; + { + struct tls_start_proxy_args a = tls_start_proxy_defaultargs(); + a.fd = fd; + a.client_p = client_p; + a.ctx = ctx; + a.infofd = &infofd; + r = tls_start_proxy(a, NULL); + } + assert(r != 1); + if (r != 0) { + fprintf(stderr, "tls_start_proxy failed: %d\n", r); + switch (r) { + case -1: + fputs("socketpair", stderr); + break; + case 2: + fputs("FD_SETSIZE exceeded", stderr); + break; + case -3: + fputs("pipe", stderr); + break; + case -4: + fputs("fork", stderr); + break; + case -5: + fputs("dup2", stderr); + break; + default: + fputs("?", stderr); + } + if (r < 0) + perror(""); + else + fputc('\n', stderr); + exit(1); + } + + r = read(infofd, infobuf, sizeof infobuf - 1); + if (r > 0) { + const char *info = infobuf; + const char *eol; + + infobuf[r] = '\0'; + while ((eol = strchr(info, '\n')) != NULL) { + fprintf(stderr, "+++ `%.*s'\n", eol - info, info); + info = eol + 1; + } + close(infofd); + } + } else { + fprintf(stderr, "W... write line to network\n" + "R[n] read line (n lines) from network\n" + "C close\n" + "T start %sTLS proxy\n", tls ? "another " : ""); + } } return 0; } diff --git a/openssl/demos/easy_tls/test.h b/openssl/demos/easy_tls/test.h index dda667843..a7d0130e2 100644 --- a/openssl/demos/easy_tls/test.h +++ b/openssl/demos/easy_tls/test.h @@ -1,7 +1,6 @@ /* test.h */ /* $Id: test.h,v 1.1 2001/09/17 19:07:00 bodo Exp $ */ - void test_process_init(int fd, int client_p, void *apparg); #define TLS_APP_PROCESS_INIT test_process_init diff --git a/openssl/demos/engines/cluster_labs/cluster_labs.h b/openssl/demos/engines/cluster_labs/cluster_labs.h index d0926796f..d024d91d7 100644 --- a/openssl/demos/engines/cluster_labs/cluster_labs.h +++ b/openssl/demos/engines/cluster_labs/cluster_labs.h @@ -1,35 +1,33 @@ typedef int cl_engine_init(void); typedef int cl_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *cgx); + const BIGNUM *m, BN_CTX *cgx); typedef int cl_mod_exp_crt(BIGNUM *r, BIGNUM *a, const BIGNUM *p, - const BIGNUM *q, const BIGNUM *dmp1, const BIGNUM *dmq1, - const BIGNUM *iqmp, BN_CTX *ctx); + const BIGNUM *q, const BIGNUM *dmp1, + const BIGNUM *dmq1, const BIGNUM *iqmp, + BN_CTX *ctx); typedef int cl_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa); typedef int cl_rsa_pub_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); + unsigned char *to, RSA *rsa, int padding); typedef int cl_rsa_pub_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -typedef int cl_rsa_priv_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -typedef int cl_rsa_priv_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); + unsigned char *to, RSA *rsa, int padding); +typedef int cl_rsa_priv_enc(int flen, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding); +typedef int cl_rsa_priv_dec(int flen, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding); typedef int cl_rand_bytes(unsigned char *buf, int num); typedef DSA_SIG *cl_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa); typedef int cl_dsa_verify(const unsigned char *dgst, int dgst_len, - DSA_SIG *sig, DSA *dsa); - + DSA_SIG *sig, DSA *dsa); static const char *CLUSTER_LABS_LIB_NAME = "cluster_labs"; -static const char *CLUSTER_LABS_F1 = "hw_engine_init"; -static const char *CLUSTER_LABS_F2 = "hw_mod_exp"; -static const char *CLUSTER_LABS_F3 = "hw_mod_exp_crt"; -static const char *CLUSTER_LABS_F4 = "hw_rsa_mod_exp"; -static const char *CLUSTER_LABS_F5 = "hw_rsa_priv_enc"; -static const char *CLUSTER_LABS_F6 = "hw_rsa_priv_dec"; -static const char *CLUSTER_LABS_F7 = "hw_rsa_pub_enc"; -static const char *CLUSTER_LABS_F8 = "hw_rsa_pub_dec"; -static const char *CLUSTER_LABS_F20 = "hw_rand_bytes"; -static const char *CLUSTER_LABS_F30 = "hw_dsa_sign"; -static const char *CLUSTER_LABS_F31 = "hw_dsa_verify"; - - +static const char *CLUSTER_LABS_F1 = "hw_engine_init"; +static const char *CLUSTER_LABS_F2 = "hw_mod_exp"; +static const char *CLUSTER_LABS_F3 = "hw_mod_exp_crt"; +static const char *CLUSTER_LABS_F4 = "hw_rsa_mod_exp"; +static const char *CLUSTER_LABS_F5 = "hw_rsa_priv_enc"; +static const char *CLUSTER_LABS_F6 = "hw_rsa_priv_dec"; +static const char *CLUSTER_LABS_F7 = "hw_rsa_pub_enc"; +static const char *CLUSTER_LABS_F8 = "hw_rsa_pub_dec"; +static const char *CLUSTER_LABS_F20 = "hw_rand_bytes"; +static const char *CLUSTER_LABS_F30 = "hw_dsa_sign"; +static const char *CLUSTER_LABS_F31 = "hw_dsa_verify"; diff --git a/openssl/demos/engines/cluster_labs/hw_cluster_labs.c b/openssl/demos/engines/cluster_labs/hw_cluster_labs.c index 036f48baf..c58e548f1 100644 --- a/openssl/demos/engines/cluster_labs/hw_cluster_labs.c +++ b/openssl/demos/engines/cluster_labs/hw_cluster_labs.c @@ -1,6 +1,7 @@ /* crypto/engine/hw_cluster_labs.c */ -/* Written by Jan Tschirschwitz (jan.tschirschwitz@cluster-labs.com - * for the OpenSSL project 2000. +/* + * Written by Jan Tschirschwitz (jan.tschirschwitz@cluster-labs.com for the + * OpenSSL project 2000. */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. @@ -10,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -56,7 +57,7 @@ * */ -#define MSC_VER /* only used cryptic.h */ +#define MSC_VER /* only used cryptic.h */ #include #include @@ -65,608 +66,579 @@ #include #ifndef NO_HW -#ifndef NO_HW_CLUSTER_LABS +# ifndef NO_HW_CLUSTER_LABS -#ifdef FLAT_INC -#include "cluster_labs.h" -#else -#include "vendor_defns/cluster_labs.h" -#endif - -#define CL_LIB_NAME "cluster_labs engine" -#include "hw_cluster_labs_err.c" +# ifdef FLAT_INC +# include "cluster_labs.h" +# else +# include "vendor_defns/cluster_labs.h" +# endif +# define CL_LIB_NAME "cluster_labs engine" +# include "hw_cluster_labs_err.c" static int cluster_labs_destroy(ENGINE *e); static int cluster_labs_init(ENGINE *e); static int cluster_labs_finish(ENGINE *e); -static int cluster_labs_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); - +static int cluster_labs_ctrl(ENGINE *e, int cmd, long i, void *p, + void (*f) ()); /* BIGNUM stuff */ /* This function is aliased to mod_exp (with the mont stuff dropped). */ -static int cluster_labs_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); - +static int cluster_labs_mod_exp_mont(BIGNUM *r, const BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx); + /* RSA stuff */ -#ifndef OPENSSL_NO_RSA +# ifndef OPENSSL_NO_RSA static int cluster_labs_rsa_pub_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); + unsigned char *to, RSA *rsa, int padding); static int cluster_labs_rsa_pub_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -static int cluster_labs_rsa_priv_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -static int cluster_labs_rsa_priv_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); + unsigned char *to, RSA *rsa, int padding); +static int cluster_labs_rsa_priv_enc(int flen, const unsigned char *from, + unsigned char *to, RSA *rsa, + int padding); +static int cluster_labs_rsa_priv_dec(int flen, const unsigned char *from, + unsigned char *to, RSA *rsa, + int padding); static int cluster_labs_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa); -#endif +# endif /* DSA stuff */ -#ifndef OPENSSL_NO_DSA -static DSA_SIG *cluster_labs_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa); +# ifndef OPENSSL_NO_DSA +static DSA_SIG *cluster_labs_dsa_sign(const unsigned char *dgst, int dlen, + DSA *dsa); static int cluster_labs_dsa_verify(const unsigned char *dgst, int dgst_len, - DSA_SIG *sig, DSA *dsa); + DSA_SIG *sig, DSA *dsa); static int cluster_labs_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, - BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, - BN_CTX *ctx, BN_MONT_CTX *in_mont); + BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, + BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *in_mont); static int cluster_labs_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a, - const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, - BN_MONT_CTX *m_ctx); -#endif - + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx); +# endif + /* DH stuff */ -#ifndef OPENSSL_NO_DH +# ifndef OPENSSL_NO_DH /* This function is alised to mod_exp (with the DH and mont dropped). */ -static int cluster_labs_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); -#endif - -/* RANDOM stuff */ +static int cluster_labs_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx); +# endif + +/* RANDOM stuff */ static int cluster_labs_rand_bytes(unsigned char *buf, int num); /* The definitions for control commands specific to this engine */ -#define CLUSTER_LABS_CMD_SO_PATH ENGINE_CMD_BASE -static const ENGINE_CMD_DEFN cluster_labs_cmd_defns[] = - { - { CLUSTER_LABS_CMD_SO_PATH, - "SO_PATH", - "Specifies the path to the 'cluster labs' shared library", - ENGINE_CMD_FLAG_STRING - }, - {0, NULL, NULL, 0} - }; +# define CLUSTER_LABS_CMD_SO_PATH ENGINE_CMD_BASE +static const ENGINE_CMD_DEFN cluster_labs_cmd_defns[] = { + {CLUSTER_LABS_CMD_SO_PATH, + "SO_PATH", + "Specifies the path to the 'cluster labs' shared library", + ENGINE_CMD_FLAG_STRING}, + {0, NULL, NULL, 0} +}; /* Our internal RSA_METHOD that we provide pointers to */ -#ifndef OPENSSL_NO_RSA -static RSA_METHOD cluster_labs_rsa = - { - "Cluster Labs RSA method", - cluster_labs_rsa_pub_enc, /* rsa_pub_enc */ - cluster_labs_rsa_pub_dec, /* rsa_pub_dec */ - cluster_labs_rsa_priv_enc, /* rsa_priv_enc */ - cluster_labs_rsa_priv_dec, /* rsa_priv_dec */ - cluster_labs_rsa_mod_exp, /* rsa_mod_exp */ - cluster_labs_mod_exp_mont, /* bn_mod_exp */ - NULL, /* init */ - NULL, /* finish */ - 0, /* flags */ - NULL, /* apps_data */ - NULL, /* rsa_sign */ - NULL /* rsa_verify */ - }; -#endif +# ifndef OPENSSL_NO_RSA +static RSA_METHOD cluster_labs_rsa = { + "Cluster Labs RSA method", + cluster_labs_rsa_pub_enc, /* rsa_pub_enc */ + cluster_labs_rsa_pub_dec, /* rsa_pub_dec */ + cluster_labs_rsa_priv_enc, /* rsa_priv_enc */ + cluster_labs_rsa_priv_dec, /* rsa_priv_dec */ + cluster_labs_rsa_mod_exp, /* rsa_mod_exp */ + cluster_labs_mod_exp_mont, /* bn_mod_exp */ + NULL, /* init */ + NULL, /* finish */ + 0, /* flags */ + NULL, /* apps_data */ + NULL, /* rsa_sign */ + NULL /* rsa_verify */ +}; +# endif /* Our internal DSA_METHOD that we provide pointers to */ -#ifndef OPENSSL_NO_DSA -static DSA_METHOD cluster_labs_dsa = - { - "Cluster Labs DSA method", - cluster_labs_dsa_sign, /* dsa_do_sign */ - NULL, /* dsa_sign_setup */ - cluster_labs_dsa_verify, /* dsa_do_verify */ - cluster_labs_dsa_mod_exp, /* dsa_mod_exp */ - cluster_labs_mod_exp_dsa, /* bn_mod_exp */ - NULL, /* init */ - NULL, /* finish */ - 0, /* flags */ - NULL /* app_data */ - }; -#endif +# ifndef OPENSSL_NO_DSA +static DSA_METHOD cluster_labs_dsa = { + "Cluster Labs DSA method", + cluster_labs_dsa_sign, /* dsa_do_sign */ + NULL, /* dsa_sign_setup */ + cluster_labs_dsa_verify, /* dsa_do_verify */ + cluster_labs_dsa_mod_exp, /* dsa_mod_exp */ + cluster_labs_mod_exp_dsa, /* bn_mod_exp */ + NULL, /* init */ + NULL, /* finish */ + 0, /* flags */ + NULL /* app_data */ +}; +# endif /* Our internal DH_METHOD that we provide pointers to */ -#ifndef OPENSSL_NO_DH -static DH_METHOD cluster_labs_dh = - { - "Cluster Labs DH method", - NULL, /* generate key */ - NULL, /* compute key */ - cluster_labs_mod_exp_dh, /* bn_mod_exp */ - NULL, /* init */ - NULL, /* finish */ - 0, /* flags */ - NULL /* app_data */ - }; -#endif - -static RAND_METHOD cluster_labs_rand = - { - /* "Cluster Labs RAND method", */ - NULL, /* seed */ - cluster_labs_rand_bytes, /* bytes */ - NULL, /* cleanup */ - NULL, /* add */ - cluster_labs_rand_bytes, /* pseudorand */ - NULL, /* status */ - }; +# ifndef OPENSSL_NO_DH +static DH_METHOD cluster_labs_dh = { + "Cluster Labs DH method", + NULL, /* generate key */ + NULL, /* compute key */ + cluster_labs_mod_exp_dh, /* bn_mod_exp */ + NULL, /* init */ + NULL, /* finish */ + 0, /* flags */ + NULL /* app_data */ +}; +# endif + +static RAND_METHOD cluster_labs_rand = { + /* "Cluster Labs RAND method", */ + NULL, /* seed */ + cluster_labs_rand_bytes, /* bytes */ + NULL, /* cleanup */ + NULL, /* add */ + cluster_labs_rand_bytes, /* pseudorand */ + NULL, /* status */ +}; static const char *engine_cluster_labs_id = "cluster_labs"; -static const char *engine_cluster_labs_name = "Cluster Labs hardware engine support"; +static const char *engine_cluster_labs_name = + "Cluster Labs hardware engine support"; /* engine implementation */ -/*-----------------------*/ +/* ---------------------*/ static int bind_helper(ENGINE *e) - { - - if(!ENGINE_set_id(e, engine_cluster_labs_id) || - !ENGINE_set_name(e, engine_cluster_labs_name) || -#ifndef OPENSSL_NO_RSA - !ENGINE_set_RSA(e, &cluster_labs_rsa) || -#endif -#ifndef OPENSSL_NO_DSA - !ENGINE_set_DSA(e, &cluster_labs_dsa) || -#endif -#ifndef OPENSSL_NO_DH - !ENGINE_set_DH(e, &cluster_labs_dh) || -#endif - !ENGINE_set_RAND(e, &cluster_labs_rand) || - !ENGINE_set_destroy_function(e, cluster_labs_destroy) || - !ENGINE_set_init_function(e, cluster_labs_init) || - !ENGINE_set_finish_function(e, cluster_labs_finish) || - !ENGINE_set_ctrl_function(e, cluster_labs_ctrl) || - !ENGINE_set_cmd_defns(e, cluster_labs_cmd_defns)) - return 0; - /* Ensure the error handling is set up */ - ERR_load_CL_strings(); - return 1; - } - -#ifndef ENGINE_DYNAMIC_SUPPORT +{ + + if (!ENGINE_set_id(e, engine_cluster_labs_id) || + !ENGINE_set_name(e, engine_cluster_labs_name) || +# ifndef OPENSSL_NO_RSA + !ENGINE_set_RSA(e, &cluster_labs_rsa) || +# endif +# ifndef OPENSSL_NO_DSA + !ENGINE_set_DSA(e, &cluster_labs_dsa) || +# endif +# ifndef OPENSSL_NO_DH + !ENGINE_set_DH(e, &cluster_labs_dh) || +# endif + !ENGINE_set_RAND(e, &cluster_labs_rand) || + !ENGINE_set_destroy_function(e, cluster_labs_destroy) || + !ENGINE_set_init_function(e, cluster_labs_init) || + !ENGINE_set_finish_function(e, cluster_labs_finish) || + !ENGINE_set_ctrl_function(e, cluster_labs_ctrl) || + !ENGINE_set_cmd_defns(e, cluster_labs_cmd_defns)) + return 0; + /* Ensure the error handling is set up */ + ERR_load_CL_strings(); + return 1; +} + +# ifndef ENGINE_DYNAMIC_SUPPORT static ENGINE *engine_cluster_labs(void) - { - ENGINE *ret = ENGINE_new(); - - if(!ret) - return NULL; - if(!bind_helper(ret)) - { - ENGINE_free(ret); - return NULL; - } - return ret; - } - -#ifdef ENGINE_DYNAMIC_SUPPORT +{ + ENGINE *ret = ENGINE_new(); + + if (!ret) + return NULL; + if (!bind_helper(ret)) { + ENGINE_free(ret); + return NULL; + } + return ret; +} + +# ifdef ENGINE_DYNAMIC_SUPPORT static -#endif +# endif void ENGINE_load_cluster_labs(void) - { +{ - ENGINE *cluster_labs = engine_cluster_labs(); - - if(!cluster_labs) return; - ENGINE_add(cluster_labs); - ENGINE_free(cluster_labs); - ERR_clear_error(); - } -#endif /* !ENGINE_DYNAMIC_SUPPORT */ + ENGINE *cluster_labs = engine_cluster_labs(); -static int cluster_labs_destroy(ENGINE *e) - { - - ERR_unload_CL_strings(); - return 1; - } + if (!cluster_labs) + return; + ENGINE_add(cluster_labs); + ENGINE_free(cluster_labs); + ERR_clear_error(); +} +# endif /* !ENGINE_DYNAMIC_SUPPORT */ +static int cluster_labs_destroy(ENGINE *e) +{ + ERR_unload_CL_strings(); + return 1; +} -/* This is a process-global DSO handle used for loading and unloading - * the Cluster Labs library. NB: This is only set (or unset) during an - * init() or finish() call (reference counts permitting) and they're - * operating with global locks, so this should be thread-safe - * implicitly. */ +/* + * This is a process-global DSO handle used for loading and unloading the + * Cluster Labs library. NB: This is only set (or unset) during an init() or + * finish() call (reference counts permitting) and they're operating with + * global locks, so this should be thread-safe implicitly. + */ static DSO *cluster_labs_dso = NULL; -/* These are the function pointers that are (un)set when the library has - * successfully (un)loaded. */ -static cl_engine_init *p_cl_engine_init = NULL; -static cl_mod_exp *p_cl_mod_exp = NULL; -static cl_mod_exp_crt *p_cl_mod_exp_crt = NULL; -static cl_rsa_mod_exp *p_cl_rsa_mod_exp = NULL; -static cl_rsa_priv_enc *p_cl_rsa_priv_enc = NULL; -static cl_rsa_priv_dec *p_cl_rsa_priv_dec = NULL; -static cl_rsa_pub_enc *p_cl_rsa_pub_enc = NULL; -static cl_rsa_pub_dec *p_cl_rsa_pub_dec = NULL; -static cl_rand_bytes *p_cl_rand_bytes = NULL; -static cl_dsa_sign *p_cl_dsa_sign = NULL; -static cl_dsa_verify *p_cl_dsa_verify = NULL; - +/* + * These are the function pointers that are (un)set when the library has + * successfully (un)loaded. + */ +static cl_engine_init *p_cl_engine_init = NULL; +static cl_mod_exp *p_cl_mod_exp = NULL; +static cl_mod_exp_crt *p_cl_mod_exp_crt = NULL; +static cl_rsa_mod_exp *p_cl_rsa_mod_exp = NULL; +static cl_rsa_priv_enc *p_cl_rsa_priv_enc = NULL; +static cl_rsa_priv_dec *p_cl_rsa_priv_dec = NULL; +static cl_rsa_pub_enc *p_cl_rsa_pub_enc = NULL; +static cl_rsa_pub_dec *p_cl_rsa_pub_dec = NULL; +static cl_rand_bytes *p_cl_rand_bytes = NULL; +static cl_dsa_sign *p_cl_dsa_sign = NULL; +static cl_dsa_verify *p_cl_dsa_verify = NULL; int cluster_labs_init(ENGINE *e) - { - - cl_engine_init *p1; - cl_mod_exp *p2; - cl_mod_exp_crt *p3; - cl_rsa_mod_exp *p4; - cl_rsa_priv_enc *p5; - cl_rsa_priv_dec *p6; - cl_rsa_pub_enc *p7; - cl_rsa_pub_dec *p8; - cl_rand_bytes *p20; - cl_dsa_sign *p30; - cl_dsa_verify *p31; - - /* engine already loaded */ - if(cluster_labs_dso != NULL) - { - CLerr(CL_F_CLUSTER_LABS_INIT,CL_R_ALREADY_LOADED); - goto err; - } - /* try to load engine */ - cluster_labs_dso = DSO_load(NULL, CLUSTER_LABS_LIB_NAME, NULL,0); - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_INIT,CL_R_DSO_FAILURE); - goto err; - } - /* bind functions */ - if( !(p1 = (cl_engine_init *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F1)) || - !(p2 = (cl_mod_exp *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F2)) || - !(p3 = (cl_mod_exp_crt *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F3)) || - !(p4 = (cl_rsa_mod_exp *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F4)) || - !(p5 = (cl_rsa_priv_enc *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F5)) || - !(p6 = (cl_rsa_priv_dec *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F6)) || - !(p7 = (cl_rsa_pub_enc *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F7)) || - !(p8 = (cl_rsa_pub_dec *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F8)) || - !(p20= (cl_rand_bytes *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F20)) || - !(p30= (cl_dsa_sign *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F30)) || - !(p31= (cl_dsa_verify *)DSO_bind_func( - cluster_labs_dso, CLUSTER_LABS_F31))) - { - CLerr(CL_F_CLUSTER_LABS_INIT,CL_R_DSO_FAILURE); - goto err; - } - - /* copy function pointers */ - p_cl_engine_init = p1; - p_cl_mod_exp = p2; - p_cl_mod_exp_crt = p3; - p_cl_rsa_mod_exp = p4; - p_cl_rsa_priv_enc = p5; - p_cl_rsa_priv_dec = p6; - p_cl_rsa_pub_enc = p7; - p_cl_rsa_pub_dec = p8; - p_cl_rand_bytes = p20; - p_cl_dsa_sign = p30; - p_cl_dsa_verify = p31; - - - - /* cluster labs engine init */ - if(p_cl_engine_init()== 0){ - CLerr(CL_F_CLUSTER_LABS_INIT,CL_R_INIT_FAILED); - goto err; - } - - return(1); - -err: - /* reset all pointers */ - if(cluster_labs_dso) - DSO_free(cluster_labs_dso); - - cluster_labs_dso = NULL; - p_cl_engine_init = NULL; - p_cl_mod_exp = NULL; - p_cl_mod_exp_crt = NULL; - p_cl_rsa_mod_exp = NULL; - p_cl_rsa_priv_enc = NULL; - p_cl_rsa_priv_dec = NULL; - p_cl_rsa_pub_enc = NULL; - p_cl_rsa_pub_dec = NULL; - p_cl_rand_bytes = NULL; - p_cl_dsa_sign = NULL; - p_cl_dsa_verify = NULL; - - return(0); - } - +{ + + cl_engine_init *p1; + cl_mod_exp *p2; + cl_mod_exp_crt *p3; + cl_rsa_mod_exp *p4; + cl_rsa_priv_enc *p5; + cl_rsa_priv_dec *p6; + cl_rsa_pub_enc *p7; + cl_rsa_pub_dec *p8; + cl_rand_bytes *p20; + cl_dsa_sign *p30; + cl_dsa_verify *p31; + + /* engine already loaded */ + if (cluster_labs_dso != NULL) { + CLerr(CL_F_CLUSTER_LABS_INIT, CL_R_ALREADY_LOADED); + goto err; + } + /* try to load engine */ + cluster_labs_dso = DSO_load(NULL, CLUSTER_LABS_LIB_NAME, NULL, 0); + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_INIT, CL_R_DSO_FAILURE); + goto err; + } + /* bind functions */ + if (! + (p1 = + (cl_engine_init *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F1)) +|| !(p2 = (cl_mod_exp *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F2)) +|| !(p3 = (cl_mod_exp_crt *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F3)) +|| !(p4 = (cl_rsa_mod_exp *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F4)) +|| !(p5 = + (cl_rsa_priv_enc *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F5)) +|| !(p6 = + (cl_rsa_priv_dec *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F6)) +|| !(p7 = (cl_rsa_pub_enc *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F7)) +|| !(p8 = (cl_rsa_pub_dec *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F8)) +|| !(p20 = + (cl_rand_bytes *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F20)) +|| !(p30 = (cl_dsa_sign *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F30)) +|| !(p31 = + (cl_dsa_verify *) DSO_bind_func(cluster_labs_dso, CLUSTER_LABS_F31))) { + CLerr(CL_F_CLUSTER_LABS_INIT, CL_R_DSO_FAILURE); + goto err; + } + + /* copy function pointers */ + p_cl_engine_init = p1; + p_cl_mod_exp = p2; + p_cl_mod_exp_crt = p3; + p_cl_rsa_mod_exp = p4; + p_cl_rsa_priv_enc = p5; + p_cl_rsa_priv_dec = p6; + p_cl_rsa_pub_enc = p7; + p_cl_rsa_pub_dec = p8; + p_cl_rand_bytes = p20; + p_cl_dsa_sign = p30; + p_cl_dsa_verify = p31; + + /* cluster labs engine init */ + if (p_cl_engine_init() == 0) { + CLerr(CL_F_CLUSTER_LABS_INIT, CL_R_INIT_FAILED); + goto err; + } + + return (1); + + err: + /* reset all pointers */ + if (cluster_labs_dso) + DSO_free(cluster_labs_dso); + + cluster_labs_dso = NULL; + p_cl_engine_init = NULL; + p_cl_mod_exp = NULL; + p_cl_mod_exp_crt = NULL; + p_cl_rsa_mod_exp = NULL; + p_cl_rsa_priv_enc = NULL; + p_cl_rsa_priv_dec = NULL; + p_cl_rsa_pub_enc = NULL; + p_cl_rsa_pub_dec = NULL; + p_cl_rand_bytes = NULL; + p_cl_dsa_sign = NULL; + p_cl_dsa_verify = NULL; + + return (0); +} static int cluster_labs_finish(ENGINE *e) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_FINISH,CL_R_NOT_LOADED); - return 0; - } - if(!DSO_free(cluster_labs_dso)) - { - CLerr(CL_F_CLUSTER_LABS_FINISH,CL_R_DSO_FAILURE); - return 0; - } - - cluster_labs_dso = NULL; - p_cl_engine_init = NULL; - p_cl_mod_exp = NULL; - p_cl_rsa_mod_exp = NULL; - p_cl_mod_exp_crt = NULL; - p_cl_rsa_priv_enc = NULL; - p_cl_rsa_priv_dec = NULL; - p_cl_rsa_pub_enc = NULL; - p_cl_rsa_pub_dec = NULL; - p_cl_rand_bytes = NULL; - p_cl_dsa_sign = NULL; - p_cl_dsa_verify = NULL; - - return(1); - - } - -static int cluster_labs_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) - { - int initialised = ((cluster_labs_dso == NULL) ? 0 : 1); - - switch(cmd) - { - case CLUSTER_LABS_CMD_SO_PATH: - if(p == NULL) - { - CLerr(CL_F_CLUSTER_LABS_CTRL,ERR_R_PASSED_NULL_PARAMETER); - return 0; - } - if(initialised) - { - CLerr(CL_F_CLUSTER_LABS_CTRL,CL_R_ALREADY_LOADED); - return 0; - } - CLUSTER_LABS_LIB_NAME = (const char *)p; - return 1; - default: - break; - } - CLerr(CL_F_CLUSTER_LABS_CTRL,CL_R_COMMAND_NOT_IMPLEMENTED); - return 0; - } - +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_FINISH, CL_R_NOT_LOADED); + return 0; + } + if (!DSO_free(cluster_labs_dso)) { + CLerr(CL_F_CLUSTER_LABS_FINISH, CL_R_DSO_FAILURE); + return 0; + } + + cluster_labs_dso = NULL; + p_cl_engine_init = NULL; + p_cl_mod_exp = NULL; + p_cl_rsa_mod_exp = NULL; + p_cl_mod_exp_crt = NULL; + p_cl_rsa_priv_enc = NULL; + p_cl_rsa_priv_dec = NULL; + p_cl_rsa_pub_enc = NULL; + p_cl_rsa_pub_dec = NULL; + p_cl_rand_bytes = NULL; + p_cl_dsa_sign = NULL; + p_cl_dsa_verify = NULL; + + return (1); + +} + +static int cluster_labs_ctrl(ENGINE *e, int cmd, long i, void *p, + void (*f) ()) +{ + int initialised = ((cluster_labs_dso == NULL) ? 0 : 1); + + switch (cmd) { + case CLUSTER_LABS_CMD_SO_PATH: + if (p == NULL) { + CLerr(CL_F_CLUSTER_LABS_CTRL, ERR_R_PASSED_NULL_PARAMETER); + return 0; + } + if (initialised) { + CLerr(CL_F_CLUSTER_LABS_CTRL, CL_R_ALREADY_LOADED); + return 0; + } + CLUSTER_LABS_LIB_NAME = (const char *)p; + return 1; + default: + break; + } + CLerr(CL_F_CLUSTER_LABS_CTRL, CL_R_COMMAND_NOT_IMPLEMENTED); + return 0; +} static int cluster_labs_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_MOD_EXP,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_mod_exp == NULL) - { - CLerr(CL_F_CLUSTER_LABS_MOD_EXP,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_mod_exp(r, a, p, m, ctx); - - } - + const BIGNUM *m, BN_CTX *ctx) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_MOD_EXP, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_mod_exp == NULL) { + CLerr(CL_F_CLUSTER_LABS_MOD_EXP, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_mod_exp(r, a, p, m, ctx); + +} + static int cluster_labs_mod_exp_crt(BIGNUM *r, BIGNUM *a, const BIGNUM *p, - const BIGNUM *q, const BIGNUM *dmp1, const BIGNUM *dmq1, - const BIGNUM *iqmp, BN_CTX *ctx) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_MOD_EXP_CRT,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_mod_exp_crt == NULL) - { - CLerr(CL_F_CLUSTER_LABS_MOD_EXP_CRT,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_mod_exp_crt(r, a, p, q,dmp1, dmq1, iqmp, ctx); - - } - + const BIGNUM *q, const BIGNUM *dmp1, + const BIGNUM *dmq1, const BIGNUM *iqmp, + BN_CTX *ctx) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_MOD_EXP_CRT, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_mod_exp_crt == NULL) { + CLerr(CL_F_CLUSTER_LABS_MOD_EXP_CRT, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_mod_exp_crt(r, a, p, q, dmp1, dmq1, iqmp, ctx); + +} + static int cluster_labs_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_MOD_EXP,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_rsa_mod_exp == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_MOD_EXP,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_rsa_mod_exp(r0, I, rsa); - - } - -static DSA_SIG *cluster_labs_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_DSA_SIGN,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_dsa_sign == NULL) - { - CLerr(CL_F_CLUSTER_LABS_DSA_SIGN,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_dsa_sign(dgst, dlen, dsa); - - } - +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_MOD_EXP, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_rsa_mod_exp == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_MOD_EXP, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_rsa_mod_exp(r0, I, rsa); + +} + +static DSA_SIG *cluster_labs_dsa_sign(const unsigned char *dgst, int dlen, + DSA *dsa) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_DSA_SIGN, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_dsa_sign == NULL) { + CLerr(CL_F_CLUSTER_LABS_DSA_SIGN, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_dsa_sign(dgst, dlen, dsa); + +} + static int cluster_labs_dsa_verify(const unsigned char *dgst, int dgst_len, - DSA_SIG *sig, DSA *dsa) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_DSA_VERIFY,CL_R_NOT_LOADED); - return 0; - } - - if(p_cl_dsa_verify == NULL) - { - CLerr(CL_F_CLUSTER_LABS_DSA_VERIFY,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_dsa_verify(dgst, dgst_len, sig, dsa); - - } + DSA_SIG *sig, DSA *dsa) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_DSA_VERIFY, CL_R_NOT_LOADED); + return 0; + } + + if (p_cl_dsa_verify == NULL) { + CLerr(CL_F_CLUSTER_LABS_DSA_VERIFY, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_dsa_verify(dgst, dgst_len, sig, dsa); + +} static int cluster_labs_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, - BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, - BN_CTX *ctx, BN_MONT_CTX *in_mont) - { - BIGNUM t; - int status = 0; - - BN_init(&t); - /* let rr = a1 ^ p1 mod m */ - if (!cluster_labs_mod_exp(rr,a1,p1,m,ctx)) goto end; - /* let t = a2 ^ p2 mod m */ - if (!cluster_labs_mod_exp(&t,a2,p2,m,ctx)) goto end; - /* let rr = rr * t mod m */ - if (!BN_mod_mul(rr,rr,&t,m,ctx)) goto end; - status = 1; -end: - BN_free(&t); - - return(1); - - } + BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, + BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *in_mont) +{ + BIGNUM t; + int status = 0; + + BN_init(&t); + /* let rr = a1 ^ p1 mod m */ + if (!cluster_labs_mod_exp(rr, a1, p1, m, ctx)) + goto end; + /* let t = a2 ^ p2 mod m */ + if (!cluster_labs_mod_exp(&t, a2, p2, m, ctx)) + goto end; + /* let rr = rr * t mod m */ + if (!BN_mod_mul(rr, rr, &t, m, ctx)) + goto end; + status = 1; + end: + BN_free(&t); + + return (1); + +} static int cluster_labs_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a, - const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, - BN_MONT_CTX *m_ctx) - { - return cluster_labs_mod_exp(r, a, p, m, ctx); - } - + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx) +{ + return cluster_labs_mod_exp(r, a, p, m, ctx); +} + /* This function is aliased to mod_exp (with the mont stuff dropped). */ -static int cluster_labs_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) - { - return cluster_labs_mod_exp(r, a, p, m, ctx); - } - +static int cluster_labs_mod_exp_mont(BIGNUM *r, const BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx) +{ + return cluster_labs_mod_exp(r, a, p, m, ctx); +} /* This function is aliased to mod_exp (with the dh and mont dropped). */ -static int cluster_labs_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) - { - return cluster_labs_mod_exp(r, a, p, m, ctx); - } - +static int cluster_labs_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx) +{ + return cluster_labs_mod_exp(r, a, p, m, ctx); +} static int cluster_labs_rsa_pub_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PUB_ENC,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_rsa_priv_enc == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PUB_ENC,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_rsa_pub_enc(flen, from, to, rsa, padding); - - } - + unsigned char *to, RSA *rsa, int padding) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PUB_ENC, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_rsa_priv_enc == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PUB_ENC, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_rsa_pub_enc(flen, from, to, rsa, padding); + +} + static int cluster_labs_rsa_pub_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PUB_DEC,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_rsa_priv_enc == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PUB_DEC,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_rsa_pub_dec(flen, from, to, rsa, padding); - - } - - -static int cluster_labs_rsa_priv_enc(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_ENC,CL_R_NOT_LOADED); - return 0; - } - - if(p_cl_rsa_priv_enc == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_ENC,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_rsa_priv_enc(flen, from, to, rsa, padding); - - } - -static int cluster_labs_rsa_priv_dec(int flen, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding) - { - - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_DEC,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_rsa_priv_dec == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_DEC,CL_R_FUNCTION_NOT_BINDED); - return 0; - } - - return p_cl_rsa_priv_dec(flen, from, to, rsa, padding); - - } + unsigned char *to, RSA *rsa, int padding) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PUB_DEC, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_rsa_priv_enc == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PUB_DEC, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_rsa_pub_dec(flen, from, to, rsa, padding); + +} + +static int cluster_labs_rsa_priv_enc(int flen, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_ENC, CL_R_NOT_LOADED); + return 0; + } + + if (p_cl_rsa_priv_enc == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_ENC, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_rsa_priv_enc(flen, from, to, rsa, padding); + +} + +static int cluster_labs_rsa_priv_dec(int flen, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding) +{ + + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_DEC, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_rsa_priv_dec == NULL) { + CLerr(CL_F_CLUSTER_LABS_RSA_PRIV_DEC, CL_R_FUNCTION_NOT_BINDED); + return 0; + } + + return p_cl_rsa_priv_dec(flen, from, to, rsa, padding); + +} /************************************************************************************ * Symmetric algorithms @@ -677,45 +649,44 @@ static int cluster_labs_rsa_priv_dec(int flen, const unsigned char *from, * Random generator ************************************************************************************/ -static int cluster_labs_rand_bytes(unsigned char *buf, int num){ +static int cluster_labs_rand_bytes(unsigned char *buf, int num) +{ - if(cluster_labs_dso == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RAND_BYTES,CL_R_NOT_LOADED); - return 0; - } - if(p_cl_mod_exp_crt == NULL) - { - CLerr(CL_F_CLUSTER_LABS_RAND_BYTES,CL_R_FUNCTION_NOT_BINDED); - return 0; - } + if (cluster_labs_dso == NULL) { + CLerr(CL_F_CLUSTER_LABS_RAND_BYTES, CL_R_NOT_LOADED); + return 0; + } + if (p_cl_mod_exp_crt == NULL) { + CLerr(CL_F_CLUSTER_LABS_RAND_BYTES, CL_R_FUNCTION_NOT_BINDED); + return 0; + } - return p_cl_rand_bytes(buf, num); + return p_cl_rand_bytes(buf, num); } - -/* This stuff is needed if this ENGINE is being compiled into a self-contained - * shared-library. */ -#ifdef ENGINE_DYNAMIC_SUPPORT +/* + * This stuff is needed if this ENGINE is being compiled into a + * self-contained shared-library. + */ +# ifdef ENGINE_DYNAMIC_SUPPORT static int bind_fn(ENGINE *e, const char *id) - { - fprintf(stderr, "bind_fn CLUSTER_LABS\n"); - if(id && (strcmp(id, engine_cluster_labs_id) != 0)) { - fprintf(stderr, "bind_fn return(0) first\n"); - return 0; - } - if(!bind_helper(e)) { - fprintf(stderr, "bind_fn return(1) first\n"); - return 0; - } - fprintf(stderr, "bind_fn return(1)\n"); - return 1; - } -IMPLEMENT_DYNAMIC_CHECK_FN() -IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) -#endif /* ENGINE_DYNAMIC_SUPPORT */ - -#endif /* !NO_HW_CLUSTER_LABS */ -#endif /* !NO_HW */ +{ + fprintf(stderr, "bind_fn CLUSTER_LABS\n"); + if (id && (strcmp(id, engine_cluster_labs_id) != 0)) { + fprintf(stderr, "bind_fn return(0) first\n"); + return 0; + } + if (!bind_helper(e)) { + fprintf(stderr, "bind_fn return(1) first\n"); + return 0; + } + fprintf(stderr, "bind_fn return(1)\n"); + return 1; +} +IMPLEMENT_DYNAMIC_CHECK_FN() + IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) +# endif /* ENGINE_DYNAMIC_SUPPORT */ +# endif /* !NO_HW_CLUSTER_LABS */ +#endif /* !NO_HW */ diff --git a/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.c b/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.c index a7fa4083b..9e8332513 100644 --- a/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.c +++ b/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.c @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,7 +53,8 @@ * */ -/* NOTE: this file was auto generated by the mkerr.pl script: any changes +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes * made to it will be overwritten when the script next updates this file, * only reason strings will be preserved. */ @@ -64,88 +65,88 @@ /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -static ERR_STRING_DATA CL_str_functs[]= - { -{ERR_PACK(0,CL_F_CLUSTER_LABS_CTRL,0), "CLUSTER_LABS_CTRL"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_DSA_SIGN,0), "CLUSTER_LABS_DSA_SIGN"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_DSA_VERIFY,0), "CLUSTER_LABS_DSA_VERIFY"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_FINISH,0), "CLUSTER_LABS_FINISH"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_INIT,0), "CLUSTER_LABS_INIT"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_MOD_EXP,0), "CLUSTER_LABS_MOD_EXP"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_MOD_EXP_CRT,0), "CLUSTER_LABS_MOD_EXP_CRT"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_RAND_BYTES,0), "CLUSTER_LABS_RAND_BYTES"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_RSA_MOD_EXP,0), "CLUSTER_LABS_RSA_MOD_EXP"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_RSA_PRIV_DEC,0), "CLUSTER_LABS_RSA_PRIV_DEC"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_RSA_PRIV_ENC,0), "CLUSTER_LABS_RSA_PRIV_ENC"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_RSA_PUB_DEC,0), "CLUSTER_LABS_RSA_PUB_DEC"}, -{ERR_PACK(0,CL_F_CLUSTER_LABS_RSA_PUB_ENC,0), "CLUSTER_LABS_RSA_PUB_ENC"}, -{0,NULL} - }; +static ERR_STRING_DATA CL_str_functs[] = { + {ERR_PACK(0, CL_F_CLUSTER_LABS_CTRL, 0), "CLUSTER_LABS_CTRL"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_DSA_SIGN, 0), "CLUSTER_LABS_DSA_SIGN"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_DSA_VERIFY, 0), "CLUSTER_LABS_DSA_VERIFY"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_FINISH, 0), "CLUSTER_LABS_FINISH"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_INIT, 0), "CLUSTER_LABS_INIT"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_MOD_EXP, 0), "CLUSTER_LABS_MOD_EXP"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_MOD_EXP_CRT, 0), + "CLUSTER_LABS_MOD_EXP_CRT"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_RAND_BYTES, 0), "CLUSTER_LABS_RAND_BYTES"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_RSA_MOD_EXP, 0), + "CLUSTER_LABS_RSA_MOD_EXP"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_RSA_PRIV_DEC, 0), + "CLUSTER_LABS_RSA_PRIV_DEC"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_RSA_PRIV_ENC, 0), + "CLUSTER_LABS_RSA_PRIV_ENC"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_RSA_PUB_DEC, 0), + "CLUSTER_LABS_RSA_PUB_DEC"}, + {ERR_PACK(0, CL_F_CLUSTER_LABS_RSA_PUB_ENC, 0), + "CLUSTER_LABS_RSA_PUB_ENC"}, + {0, NULL} +}; -static ERR_STRING_DATA CL_str_reasons[]= - { -{CL_R_ALREADY_LOADED ,"already loaded"}, -{CL_R_COMMAND_NOT_IMPLEMENTED ,"command not implemented"}, -{CL_R_DSO_FAILURE ,"dso failure"}, -{CL_R_FUNCTION_NOT_BINDED ,"function not binded"}, -{CL_R_INIT_FAILED ,"init failed"}, -{CL_R_NOT_LOADED ,"not loaded"}, -{0,NULL} - }; +static ERR_STRING_DATA CL_str_reasons[] = { + {CL_R_ALREADY_LOADED, "already loaded"}, + {CL_R_COMMAND_NOT_IMPLEMENTED, "command not implemented"}, + {CL_R_DSO_FAILURE, "dso failure"}, + {CL_R_FUNCTION_NOT_BINDED, "function not binded"}, + {CL_R_INIT_FAILED, "init failed"}, + {CL_R_NOT_LOADED, "not loaded"}, + {0, NULL} +}; #endif #ifdef CL_LIB_NAME -static ERR_STRING_DATA CL_lib_name[]= - { -{0 ,CL_LIB_NAME}, -{0,NULL} - }; +static ERR_STRING_DATA CL_lib_name[] = { + {0, CL_LIB_NAME}, + {0, NULL} +}; #endif - -static int CL_lib_error_code=0; -static int CL_error_init=1; +static int CL_lib_error_code = 0; +static int CL_error_init = 1; static void ERR_load_CL_strings(void) - { - if (CL_lib_error_code == 0) - CL_lib_error_code=ERR_get_next_error_library(); +{ + if (CL_lib_error_code == 0) + CL_lib_error_code = ERR_get_next_error_library(); - if (CL_error_init) - { - CL_error_init=0; + if (CL_error_init) { + CL_error_init = 0; #ifndef OPENSSL_NO_ERR - ERR_load_strings(CL_lib_error_code,CL_str_functs); - ERR_load_strings(CL_lib_error_code,CL_str_reasons); + ERR_load_strings(CL_lib_error_code, CL_str_functs); + ERR_load_strings(CL_lib_error_code, CL_str_reasons); #endif #ifdef CL_LIB_NAME - CL_lib_name->error = ERR_PACK(CL_lib_error_code,0,0); - ERR_load_strings(0,CL_lib_name); + CL_lib_name->error = ERR_PACK(CL_lib_error_code, 0, 0); + ERR_load_strings(0, CL_lib_name); #endif - } - } + } +} static void ERR_unload_CL_strings(void) - { - if (CL_error_init == 0) - { +{ + if (CL_error_init == 0) { #ifndef OPENSSL_NO_ERR - ERR_unload_strings(CL_lib_error_code,CL_str_functs); - ERR_unload_strings(CL_lib_error_code,CL_str_reasons); + ERR_unload_strings(CL_lib_error_code, CL_str_functs); + ERR_unload_strings(CL_lib_error_code, CL_str_reasons); #endif #ifdef CL_LIB_NAME - ERR_unload_strings(0,CL_lib_name); + ERR_unload_strings(0, CL_lib_name); #endif - CL_error_init=1; - } - } + CL_error_init = 1; + } +} static void ERR_CL_error(int function, int reason, char *file, int line) - { - if (CL_lib_error_code == 0) - CL_lib_error_code=ERR_get_next_error_library(); - ERR_PUT_error(CL_lib_error_code,function,reason,file,line); - } +{ + if (CL_lib_error_code == 0) + CL_lib_error_code = ERR_get_next_error_library(); + ERR_PUT_error(CL_lib_error_code, function, reason, file, line); +} diff --git a/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h b/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h index f548a3b66..3300e11d8 100644 --- a/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h +++ b/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h @@ -6,7 +6,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,45 +53,46 @@ */ #ifndef HEADER_CL_ERR_H -#define HEADER_CL_ERR_H +# define HEADER_CL_ERR_H #ifdef __cplusplus extern "C" { #endif /* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes +/* + * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ static void ERR_load_CL_strings(void); static void ERR_unload_CL_strings(void); static void ERR_CL_error(int function, int reason, char *file, int line); -#define CLerr(f,r) ERR_CL_error((f),(r),__FILE__,__LINE__) +# define CLerr(f,r) ERR_CL_error((f),(r),__FILE__,__LINE__) /* Error codes for the CL functions. */ /* Function codes. */ -#define CL_F_CLUSTER_LABS_CTRL 100 -#define CL_F_CLUSTER_LABS_DSA_SIGN 101 -#define CL_F_CLUSTER_LABS_DSA_VERIFY 102 -#define CL_F_CLUSTER_LABS_FINISH 103 -#define CL_F_CLUSTER_LABS_INIT 104 -#define CL_F_CLUSTER_LABS_MOD_EXP 105 -#define CL_F_CLUSTER_LABS_MOD_EXP_CRT 106 -#define CL_F_CLUSTER_LABS_RAND_BYTES 107 -#define CL_F_CLUSTER_LABS_RSA_MOD_EXP 108 -#define CL_F_CLUSTER_LABS_RSA_PRIV_DEC 109 -#define CL_F_CLUSTER_LABS_RSA_PRIV_ENC 110 -#define CL_F_CLUSTER_LABS_RSA_PUB_DEC 111 -#define CL_F_CLUSTER_LABS_RSA_PUB_ENC 112 +# define CL_F_CLUSTER_LABS_CTRL 100 +# define CL_F_CLUSTER_LABS_DSA_SIGN 101 +# define CL_F_CLUSTER_LABS_DSA_VERIFY 102 +# define CL_F_CLUSTER_LABS_FINISH 103 +# define CL_F_CLUSTER_LABS_INIT 104 +# define CL_F_CLUSTER_LABS_MOD_EXP 105 +# define CL_F_CLUSTER_LABS_MOD_EXP_CRT 106 +# define CL_F_CLUSTER_LABS_RAND_BYTES 107 +# define CL_F_CLUSTER_LABS_RSA_MOD_EXP 108 +# define CL_F_CLUSTER_LABS_RSA_PRIV_DEC 109 +# define CL_F_CLUSTER_LABS_RSA_PRIV_ENC 110 +# define CL_F_CLUSTER_LABS_RSA_PUB_DEC 111 +# define CL_F_CLUSTER_LABS_RSA_PUB_ENC 112 /* Reason codes. */ -#define CL_R_ALREADY_LOADED 100 -#define CL_R_COMMAND_NOT_IMPLEMENTED 101 -#define CL_R_DSO_FAILURE 102 -#define CL_R_FUNCTION_NOT_BINDED 103 -#define CL_R_INIT_FAILED 104 -#define CL_R_NOT_LOADED 105 +# define CL_R_ALREADY_LOADED 100 +# define CL_R_COMMAND_NOT_IMPLEMENTED 101 +# define CL_R_DSO_FAILURE 102 +# define CL_R_FUNCTION_NOT_BINDED 103 +# define CL_R_INIT_FAILED 104 +# define CL_R_NOT_LOADED 105 #ifdef __cplusplus } diff --git a/openssl/demos/engines/ibmca/hw_ibmca.c b/openssl/demos/engines/ibmca/hw_ibmca.c index 0c2c39b8a..082246f92 100644 --- a/openssl/demos/engines/ibmca/hw_ibmca.c +++ b/openssl/demos/engines/ibmca/hw_ibmca.c @@ -1,920 +1,900 @@ -/* crypto/engine/hw_ibmca.c */ -/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL - * project 2000. - */ -/* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * licensing@OpenSSL.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -/* (C) COPYRIGHT International Business Machines Corp. 2001 */ - -#include -#include -#include -#include - -#ifndef OPENSSL_NO_HW -#ifndef OPENSSL_NO_HW_IBMCA - -#ifdef FLAT_INC -#include "ica_openssl_api.h" -#else -#include "vendor_defns/ica_openssl_api.h" -#endif - -#define IBMCA_LIB_NAME "ibmca engine" -#include "hw_ibmca_err.c" - -static int ibmca_destroy(ENGINE *e); -static int ibmca_init(ENGINE *e); -static int ibmca_finish(ENGINE *e); -static int ibmca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); - -static const char *IBMCA_F1 = "icaOpenAdapter"; -static const char *IBMCA_F2 = "icaCloseAdapter"; -static const char *IBMCA_F3 = "icaRsaModExpo"; -static const char *IBMCA_F4 = "icaRandomNumberGenerate"; -static const char *IBMCA_F5 = "icaRsaCrt"; - -ICA_ADAPTER_HANDLE handle=0; - -/* BIGNUM stuff */ -static int ibmca_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx); - -static int ibmca_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *q, const BIGNUM *dmp1, const BIGNUM *dmq1, - const BIGNUM *iqmp, BN_CTX *ctx); - -#ifndef OPENSSL_NO_RSA -/* RSA stuff */ -static int ibmca_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa); -#endif - -/* This function is aliased to mod_exp (with the mont stuff dropped). */ -static int ibmca_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); - -#ifndef OPENSSL_NO_DSA -/* DSA stuff */ -static int ibmca_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, - BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, - BN_CTX *ctx, BN_MONT_CTX *in_mont); -static int ibmca_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a, - const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, - BN_MONT_CTX *m_ctx); -#endif - -#ifndef OPENSSL_NO_DH -/* DH stuff */ -/* This function is alised to mod_exp (with the DH and mont dropped). */ -static int ibmca_mod_exp_dh(const DH *dh, BIGNUM *r, - const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); -#endif - -/* RAND stuff */ -static int ibmca_rand_bytes(unsigned char *buf, int num); -static int ibmca_rand_status(void); - - -/* WJH - check for more commands, like in nuron */ - -/* The definitions for control commands specific to this engine */ -#define IBMCA_CMD_SO_PATH ENGINE_CMD_BASE -static const ENGINE_CMD_DEFN ibmca_cmd_defns[] = { - {IBMCA_CMD_SO_PATH, - "SO_PATH", - "Specifies the path to the 'atasi' shared library", - ENGINE_CMD_FLAG_STRING}, - {0, NULL, NULL, 0} - }; - -#ifndef OPENSSL_NO_RSA -/* Our internal RSA_METHOD that we provide pointers to */ -static RSA_METHOD ibmca_rsa = - { - "Ibmca RSA method", - NULL, - NULL, - NULL, - NULL, - ibmca_rsa_mod_exp, - ibmca_mod_exp_mont, - NULL, - NULL, - 0, - NULL, - NULL, - NULL - }; -#endif - -#ifndef OPENSSL_NO_DSA -/* Our internal DSA_METHOD that we provide pointers to */ -static DSA_METHOD ibmca_dsa = - { - "Ibmca DSA method", - NULL, /* dsa_do_sign */ - NULL, /* dsa_sign_setup */ - NULL, /* dsa_do_verify */ - ibmca_dsa_mod_exp, /* dsa_mod_exp */ - ibmca_mod_exp_dsa, /* bn_mod_exp */ - NULL, /* init */ - NULL, /* finish */ - 0, /* flags */ - NULL /* app_data */ - }; -#endif - -#ifndef OPENSSL_NO_DH -/* Our internal DH_METHOD that we provide pointers to */ -static DH_METHOD ibmca_dh = - { - "Ibmca DH method", - NULL, - NULL, - ibmca_mod_exp_dh, - NULL, - NULL, - 0, - NULL - }; -#endif - -static RAND_METHOD ibmca_rand = - { - /* "IBMCA RAND method", */ - NULL, - ibmca_rand_bytes, - NULL, - NULL, - ibmca_rand_bytes, - ibmca_rand_status, - }; - -/* Constants used when creating the ENGINE */ -static const char *engine_ibmca_id = "ibmca"; -static const char *engine_ibmca_name = "Ibmca hardware engine support"; - -/* This internal function is used by ENGINE_ibmca() and possibly by the - * "dynamic" ENGINE support too */ -static int bind_helper(ENGINE *e) - { -#ifndef OPENSSL_NO_RSA - const RSA_METHOD *meth1; -#endif -#ifndef OPENSSL_NO_DSA - const DSA_METHOD *meth2; -#endif -#ifndef OPENSSL_NO_DH - const DH_METHOD *meth3; -#endif - if(!ENGINE_set_id(e, engine_ibmca_id) || - !ENGINE_set_name(e, engine_ibmca_name) || -#ifndef OPENSSL_NO_RSA - !ENGINE_set_RSA(e, &ibmca_rsa) || -#endif -#ifndef OPENSSL_NO_DSA - !ENGINE_set_DSA(e, &ibmca_dsa) || -#endif -#ifndef OPENSSL_NO_DH - !ENGINE_set_DH(e, &ibmca_dh) || -#endif - !ENGINE_set_RAND(e, &ibmca_rand) || - !ENGINE_set_destroy_function(e, ibmca_destroy) || - !ENGINE_set_init_function(e, ibmca_init) || - !ENGINE_set_finish_function(e, ibmca_finish) || - !ENGINE_set_ctrl_function(e, ibmca_ctrl) || - !ENGINE_set_cmd_defns(e, ibmca_cmd_defns)) - return 0; - -#ifndef OPENSSL_NO_RSA - /* We know that the "PKCS1_SSLeay()" functions hook properly - * to the ibmca-specific mod_exp and mod_exp_crt so we use - * those functions. NB: We don't use ENGINE_openssl() or - * anything "more generic" because something like the RSAref - * code may not hook properly, and if you own one of these - * cards then you have the right to do RSA operations on it - * anyway! */ - meth1 = RSA_PKCS1_SSLeay(); - ibmca_rsa.rsa_pub_enc = meth1->rsa_pub_enc; - ibmca_rsa.rsa_pub_dec = meth1->rsa_pub_dec; - ibmca_rsa.rsa_priv_enc = meth1->rsa_priv_enc; - ibmca_rsa.rsa_priv_dec = meth1->rsa_priv_dec; -#endif - -#ifndef OPENSSL_NO_DSA - /* Use the DSA_OpenSSL() method and just hook the mod_exp-ish - * bits. */ - meth2 = DSA_OpenSSL(); - ibmca_dsa.dsa_do_sign = meth2->dsa_do_sign; - ibmca_dsa.dsa_sign_setup = meth2->dsa_sign_setup; - ibmca_dsa.dsa_do_verify = meth2->dsa_do_verify; -#endif - -#ifndef OPENSSL_NO_DH - /* Much the same for Diffie-Hellman */ - meth3 = DH_OpenSSL(); - ibmca_dh.generate_key = meth3->generate_key; - ibmca_dh.compute_key = meth3->compute_key; -#endif - - /* Ensure the ibmca error handling is set up */ - ERR_load_IBMCA_strings(); - return 1; - } - -static ENGINE *engine_ibmca(void) - { - ENGINE *ret = ENGINE_new(); - if(!ret) - return NULL; - if(!bind_helper(ret)) - { - ENGINE_free(ret); - return NULL; - } - return ret; - } - -#ifdef ENGINE_DYNAMIC_SUPPORT -static -#endif -void ENGINE_load_ibmca(void) - { - /* Copied from eng_[openssl|dyn].c */ - ENGINE *toadd = engine_ibmca(); - if(!toadd) return; - ENGINE_add(toadd); - ENGINE_free(toadd); - ERR_clear_error(); - } - -/* Destructor (complements the "ENGINE_ibmca()" constructor) */ -static int ibmca_destroy(ENGINE *e) - { - /* Unload the ibmca error strings so any error state including our - * functs or reasons won't lead to a segfault (they simply get displayed - * without corresponding string data because none will be found). */ - ERR_unload_IBMCA_strings(); - return 1; - } - - -/* This is a process-global DSO handle used for loading and unloading - * the Ibmca library. NB: This is only set (or unset) during an - * init() or finish() call (reference counts permitting) and they're - * operating with global locks, so this should be thread-safe - * implicitly. */ - -static DSO *ibmca_dso = NULL; - -/* These are the function pointers that are (un)set when the library has - * successfully (un)loaded. */ - -static unsigned int (ICA_CALL *p_icaOpenAdapter)(); -static unsigned int (ICA_CALL *p_icaCloseAdapter)(); -static unsigned int (ICA_CALL *p_icaRsaModExpo)(); -static unsigned int (ICA_CALL *p_icaRandomNumberGenerate)(); -static unsigned int (ICA_CALL *p_icaRsaCrt)(); - -/* utility function to obtain a context */ -static int get_context(ICA_ADAPTER_HANDLE *p_handle) - { - unsigned int status=0; - - status = p_icaOpenAdapter(0, p_handle); - if(status != 0) - return 0; - return 1; - } - -/* similarly to release one. */ -static void release_context(ICA_ADAPTER_HANDLE handle) - { - p_icaCloseAdapter(handle); - } - -/* (de)initialisation functions. */ -static int ibmca_init(ENGINE *e) - { - - void (*p1)(); - void (*p2)(); - void (*p3)(); - void (*p4)(); - void (*p5)(); - - if(ibmca_dso != NULL) - { - IBMCAerr(IBMCA_F_IBMCA_INIT,IBMCA_R_ALREADY_LOADED); - goto err; - } - /* Attempt to load libatasi.so/atasi.dll/whatever. Needs to be - * changed unfortunately because the Ibmca drivers don't have - * standard library names that can be platform-translated well. */ - /* TODO: Work out how to actually map to the names the Ibmca - * drivers really use - for now a symbollic link needs to be - * created on the host system from libatasi.so to atasi.so on - * unix variants. */ - - /* WJH XXX check name translation */ - - ibmca_dso = DSO_load(NULL, IBMCA_LIBNAME, NULL, - /* DSO_FLAG_NAME_TRANSLATION */ 0); - if(ibmca_dso == NULL) - { - IBMCAerr(IBMCA_F_IBMCA_INIT,IBMCA_R_DSO_FAILURE); - goto err; - } - - if(!(p1 = DSO_bind_func( - ibmca_dso, IBMCA_F1)) || - !(p2 = DSO_bind_func( - ibmca_dso, IBMCA_F2)) || - !(p3 = DSO_bind_func( - ibmca_dso, IBMCA_F3)) || - !(p4 = DSO_bind_func( - ibmca_dso, IBMCA_F4)) || - !(p5 = DSO_bind_func( - ibmca_dso, IBMCA_F5))) - { - IBMCAerr(IBMCA_F_IBMCA_INIT,IBMCA_R_DSO_FAILURE); - goto err; - } - - /* Copy the pointers */ - - p_icaOpenAdapter = (unsigned int (ICA_CALL *)())p1; - p_icaCloseAdapter = (unsigned int (ICA_CALL *)())p2; - p_icaRsaModExpo = (unsigned int (ICA_CALL *)())p3; - p_icaRandomNumberGenerate = (unsigned int (ICA_CALL *)())p4; - p_icaRsaCrt = (unsigned int (ICA_CALL *)())p5; - - if(!get_context(&handle)) - { - IBMCAerr(IBMCA_F_IBMCA_INIT,IBMCA_R_UNIT_FAILURE); - goto err; - } - - return 1; - err: - if(ibmca_dso) - DSO_free(ibmca_dso); - - p_icaOpenAdapter = NULL; - p_icaCloseAdapter = NULL; - p_icaRsaModExpo = NULL; - p_icaRandomNumberGenerate = NULL; - - return 0; - } - -static int ibmca_finish(ENGINE *e) - { - if(ibmca_dso == NULL) - { - IBMCAerr(IBMCA_F_IBMCA_FINISH,IBMCA_R_NOT_LOADED); - return 0; - } - release_context(handle); - if(!DSO_free(ibmca_dso)) - { - IBMCAerr(IBMCA_F_IBMCA_FINISH,IBMCA_R_DSO_FAILURE); - return 0; - } - ibmca_dso = NULL; - - return 1; - } - -static int ibmca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) - { - int initialised = ((ibmca_dso == NULL) ? 0 : 1); - switch(cmd) - { - case IBMCA_CMD_SO_PATH: - if(p == NULL) - { - IBMCAerr(IBMCA_F_IBMCA_CTRL,ERR_R_PASSED_NULL_PARAMETER); - return 0; - } - if(initialised) - { - IBMCAerr(IBMCA_F_IBMCA_CTRL,IBMCA_R_ALREADY_LOADED); - return 0; - } - IBMCA_LIBNAME = (const char *)p; - return 1; - default: - break; - } - IBMCAerr(IBMCA_F_IBMCA_CTRL,IBMCA_R_CTRL_COMMAND_NOT_IMPLEMENTED); - return 0; - } - - -static int ibmca_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx) - { - /* I need somewhere to store temporary serialised values for - * use with the Ibmca API calls. A neat cheat - I'll use - * BIGNUMs from the BN_CTX but access their arrays directly as - * byte arrays . This way I don't have to clean anything - * up. */ - - BIGNUM *argument=NULL; - BIGNUM *result=NULL; - BIGNUM *key=NULL; - int to_return; - int inLen, outLen, tmpLen; - - - ICA_KEY_RSA_MODEXPO *publKey=NULL; - unsigned int rc; - - to_return = 0; /* expect failure */ - - if(!ibmca_dso) - { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP,IBMCA_R_NOT_LOADED); - goto err; - } - /* Prepare the params */ - BN_CTX_start(ctx); - argument = BN_CTX_get(ctx); - result = BN_CTX_get(ctx); - key = BN_CTX_get(ctx); - - if( !argument || !result || !key) - { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP,IBMCA_R_BN_CTX_FULL); - goto err; - } - - - if(!bn_wexpand(argument, m->top) || !bn_wexpand(result, m->top) || - !bn_wexpand(key, sizeof(*publKey)/BN_BYTES)) - - { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP,IBMCA_R_BN_EXPAND_FAIL); - goto err; - } - - publKey = (ICA_KEY_RSA_MODEXPO *)key->d; - - if (publKey == NULL) - { - goto err; - } - memset(publKey, 0, sizeof(ICA_KEY_RSA_MODEXPO)); - - publKey->keyType = CORRECT_ENDIANNESS(ME_KEY_TYPE); - publKey->keyLength = CORRECT_ENDIANNESS(sizeof(ICA_KEY_RSA_MODEXPO)); - publKey->expOffset = (char *) publKey->keyRecord - (char *) publKey; - - /* A quirk of the card: the exponent length has to be the same - as the modulus (key) length */ - - outLen = BN_num_bytes(m); - -/* check for modulus length SAB*/ - if (outLen > 256 ) { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP,IBMCA_R_MEXP_LENGTH_TO_LARGE); - goto err; - } -/* check for modulus length SAB*/ - - - publKey->expLength = publKey->nLength = outLen; -/* SAB Check for underflow condition - the size of the exponent is less than the size of the parameter - then we have a big problem and will underflow the keyRecord - buffer. Bad stuff could happen then -*/ -if (outLen < BN_num_bytes(p)){ - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP,IBMCA_R_UNDERFLOW_KEYRECORD); - goto err; -} -/* SAB End check for underflow */ - - - BN_bn2bin(p, &publKey->keyRecord[publKey->expLength - - BN_num_bytes(p)]); - BN_bn2bin(m, &publKey->keyRecord[publKey->expLength]); - - - - publKey->modulusBitLength = CORRECT_ENDIANNESS(publKey->nLength * 8); - publKey->nOffset = CORRECT_ENDIANNESS(publKey->expOffset + - publKey->expLength); - - publKey->expOffset = CORRECT_ENDIANNESS((char *) publKey->keyRecord - - (char *) publKey); - - tmpLen = outLen; - publKey->expLength = publKey->nLength = CORRECT_ENDIANNESS(tmpLen); - - /* Prepare the argument */ - - memset(argument->d, 0, outLen); - BN_bn2bin(a, (unsigned char *)argument->d + outLen - - BN_num_bytes(a)); - - inLen = outLen; - - /* Perform the operation */ - - if( (rc = p_icaRsaModExpo(handle, inLen,(unsigned char *)argument->d, - publKey, &outLen, (unsigned char *)result->d)) - !=0 ) - - { - printf("rc = %d\n", rc); - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP,IBMCA_R_REQUEST_FAILED); - goto err; - } - - - /* Convert the response */ - BN_bin2bn((unsigned char *)result->d, outLen, r); - to_return = 1; - err: - BN_CTX_end(ctx); - return to_return; - } - -#ifndef OPENSSL_NO_RSA -static int ibmca_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) - { - BN_CTX *ctx; - int to_return = 0; - - if((ctx = BN_CTX_new()) == NULL) - goto err; - if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp) - { - if(!rsa->d || !rsa->n) - { - IBMCAerr(IBMCA_F_IBMCA_RSA_MOD_EXP, - IBMCA_R_MISSING_KEY_COMPONENTS); - goto err; - } - to_return = ibmca_mod_exp(r0, I, rsa->d, rsa->n, ctx); - } - else - { - to_return = ibmca_mod_exp_crt(r0, I, rsa->p, rsa->q, rsa->dmp1, - rsa->dmq1, rsa->iqmp, ctx); - } - err: - if(ctx) - BN_CTX_free(ctx); - return to_return; - } -#endif - -/* Ein kleines chinesisches "Restessen" */ -static int ibmca_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *q, const BIGNUM *dmp1, - const BIGNUM *dmq1, const BIGNUM *iqmp, BN_CTX *ctx) - { - - BIGNUM *argument = NULL; - BIGNUM *result = NULL; - BIGNUM *key = NULL; - - int to_return = 0; /* expect failure */ - - char *pkey=NULL; - ICA_KEY_RSA_CRT *privKey=NULL; - int inLen, outLen; - - int rc; - unsigned int offset, pSize, qSize; -/* SAB New variables */ - unsigned int keyRecordSize; - unsigned int pbytes = BN_num_bytes(p); - unsigned int qbytes = BN_num_bytes(q); - unsigned int dmp1bytes = BN_num_bytes(dmp1); - unsigned int dmq1bytes = BN_num_bytes(dmq1); - unsigned int iqmpbytes = BN_num_bytes(iqmp); - - /* Prepare the params */ - - BN_CTX_start(ctx); - argument = BN_CTX_get(ctx); - result = BN_CTX_get(ctx); - key = BN_CTX_get(ctx); - - if(!argument || !result || !key) - { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_BN_CTX_FULL); - goto err; - } - - if(!bn_wexpand(argument, p->top + q->top) || - !bn_wexpand(result, p->top + q->top) || - !bn_wexpand(key, sizeof(*privKey)/BN_BYTES )) - { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_BN_EXPAND_FAIL); - goto err; - } - - - privKey = (ICA_KEY_RSA_CRT *)key->d; -/* SAB Add check for total size in bytes of the parms does not exceed - the buffer space we have - do this first -*/ - keyRecordSize = pbytes+qbytes+dmp1bytes+dmq1bytes+iqmpbytes; - if ( keyRecordSize > sizeof(privKey->keyRecord )) { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_OPERANDS_TO_LARGE); - goto err; - } - - if ( (qbytes + dmq1bytes) > 256 ){ - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_OPERANDS_TO_LARGE); - goto err; - } - - if ( pbytes + dmp1bytes > 256 ) { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_OPERANDS_TO_LARGE); - goto err; - } - -/* end SAB additions */ - - memset(privKey, 0, sizeof(ICA_KEY_RSA_CRT)); - privKey->keyType = CORRECT_ENDIANNESS(CRT_KEY_TYPE); - privKey->keyLength = CORRECT_ENDIANNESS(sizeof(ICA_KEY_RSA_CRT)); - privKey->modulusBitLength = - CORRECT_ENDIANNESS(BN_num_bytes(q) * 2 * 8); - - /* - * p,dp & qInv are 1 QWORD Larger - */ - privKey->pLength = CORRECT_ENDIANNESS(BN_num_bytes(p)+8); - privKey->qLength = CORRECT_ENDIANNESS(BN_num_bytes(q)); - privKey->dpLength = CORRECT_ENDIANNESS(BN_num_bytes(dmp1)+8); - privKey->dqLength = CORRECT_ENDIANNESS(BN_num_bytes(dmq1)); - privKey->qInvLength = CORRECT_ENDIANNESS(BN_num_bytes(iqmp)+8); - - offset = (char *) privKey->keyRecord - - (char *) privKey; - - qSize = BN_num_bytes(q); - pSize = qSize + 8; /* 1 QWORD larger */ - - -/* SAB probably aittle redundant, but we'll verify that each of the - components which make up a key record sent ot the card does not exceed - the space that is allocated for it. this handles the case where even if - the total length does not exceed keyrecord zied, if the operands are funny sized -they could cause potential side affects on either the card or the result */ - - if ( (pbytes > pSize) || (dmp1bytes > pSize) || - (iqmpbytes > pSize) || ( qbytes >qSize) || - (dmq1bytes > qSize) ) { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_OPERANDS_TO_LARGE); - goto err; - - } - - - privKey->dpOffset = CORRECT_ENDIANNESS(offset); - - offset += pSize; - privKey->dqOffset = CORRECT_ENDIANNESS(offset); - - offset += qSize; - privKey->pOffset = CORRECT_ENDIANNESS(offset); - - offset += pSize; - privKey->qOffset = CORRECT_ENDIANNESS(offset); - - offset += qSize; - privKey->qInvOffset = CORRECT_ENDIANNESS(offset); - - pkey = (char *) privKey->keyRecord; - - -/* SAB first check that we don;t under flow the buffer */ - if ( pSize < pbytes ) { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_UNDERFLOW_CONDITION); - goto err; - } - - /* pkey += pSize - BN_num_bytes(p); WROING this should be dmp1) */ - pkey += pSize - BN_num_bytes(dmp1); - BN_bn2bin(dmp1, pkey); - pkey += BN_num_bytes(dmp1); /* move the pointer */ - - BN_bn2bin(dmq1, pkey); /* Copy over dmq1 */ - - pkey += qSize; /* move pointer */ - pkey += pSize - BN_num_bytes(p); /* set up for zero padding of next field */ - - BN_bn2bin(p, pkey); - pkey += BN_num_bytes(p); /* increment pointer by number of bytes moved */ - - BN_bn2bin(q, pkey); - pkey += qSize ; /* move the pointer */ - pkey += pSize - BN_num_bytes(iqmp); /* Adjust for padding */ - BN_bn2bin(iqmp, pkey); - - /* Prepare the argument and response */ - - outLen = CORRECT_ENDIANNESS(privKey->qLength) * 2; /* Correct endianess is used - because the fields were converted above */ - - if (outLen > 256) { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_OUTLEN_TO_LARGE); - goto err; - } - - /* SAB check for underflow here on the argeument */ - if ( outLen < BN_num_bytes(a)) { - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_UNDERFLOW_CONDITION); - goto err; - } - - BN_bn2bin(a, (unsigned char *)argument->d + outLen - - BN_num_bytes(a)); - inLen = outLen; - - memset(result->d, 0, outLen); - - /* Perform the operation */ - - if ( (rc = p_icaRsaCrt(handle, inLen, (unsigned char *)argument->d, - privKey, &outLen, (unsigned char *)result->d)) != 0) - { - printf("rc = %d\n", rc); - IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT,IBMCA_R_REQUEST_FAILED); - goto err; - } - - /* Convert the response */ - - BN_bin2bn((unsigned char *)result->d, outLen, r); - to_return = 1; - - err: - BN_CTX_end(ctx); - return to_return; - - } - -#ifndef OPENSSL_NO_DSA -/* This code was liberated and adapted from the commented-out code in - * dsa_ossl.c. Because of the unoptimised form of the Ibmca acceleration - * (it doesn't have a CRT form for RSA), this function means that an - * Ibmca system running with a DSA server certificate can handshake - * around 5 or 6 times faster/more than an equivalent system running with - * RSA. Just check out the "signs" statistics from the RSA and DSA parts - * of "openssl speed -engine ibmca dsa1024 rsa1024". */ -static int ibmca_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, - BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, - BN_CTX *ctx, BN_MONT_CTX *in_mont) - { - BIGNUM t; - int to_return = 0; - - BN_init(&t); - /* let rr = a1 ^ p1 mod m */ - if (!ibmca_mod_exp(rr,a1,p1,m,ctx)) goto end; - /* let t = a2 ^ p2 mod m */ - if (!ibmca_mod_exp(&t,a2,p2,m,ctx)) goto end; - /* let rr = rr * t mod m */ - if (!BN_mod_mul(rr,rr,&t,m,ctx)) goto end; - to_return = 1; - end: - BN_free(&t); - return to_return; - } - - -static int ibmca_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a, - const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, - BN_MONT_CTX *m_ctx) - { - return ibmca_mod_exp(r, a, p, m, ctx); - } -#endif - -/* This function is aliased to mod_exp (with the mont stuff dropped). */ -static int ibmca_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) - { - return ibmca_mod_exp(r, a, p, m, ctx); - } - -#ifndef OPENSSL_NO_DH -/* This function is aliased to mod_exp (with the dh and mont dropped). */ -static int ibmca_mod_exp_dh(DH const *dh, BIGNUM *r, - const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) - { - return ibmca_mod_exp(r, a, p, m, ctx); - } -#endif - -/* Random bytes are good */ -static int ibmca_rand_bytes(unsigned char *buf, int num) - { - int to_return = 0; /* assume failure */ - unsigned int ret; - - - if(handle == 0) - { - IBMCAerr(IBMCA_F_IBMCA_RAND_BYTES,IBMCA_R_NOT_INITIALISED); - goto err; - } - - ret = p_icaRandomNumberGenerate(handle, num, buf); - if (ret < 0) - { - IBMCAerr(IBMCA_F_IBMCA_RAND_BYTES,IBMCA_R_REQUEST_FAILED); - goto err; - } - to_return = 1; - err: - return to_return; - } - -static int ibmca_rand_status(void) - { - return 1; - } - -/* This stuff is needed if this ENGINE is being compiled into a self-contained - * shared-library. */ -#ifdef ENGINE_DYNAMIC_SUPPORT -static int bind_fn(ENGINE *e, const char *id) - { - if(id && (strcmp(id, engine_ibmca_id) != 0)) /* WJH XXX */ - return 0; - if(!bind_helper(e)) - return 0; - return 1; - } -IMPLEMENT_DYNAMIC_CHECK_FN() -IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) -#endif /* ENGINE_DYNAMIC_SUPPORT */ - - -#endif /* !OPENSSL_NO_HW_IBMCA */ -#endif /* !OPENSSL_NO_HW */ +/* crypto/engine/hw_ibmca.c */ +/* + * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project + * 2000. + */ +/* ==================================================================== + * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* (C) COPYRIGHT International Business Machines Corp. 2001 */ + +#include +#include +#include +#include + +#ifndef OPENSSL_NO_HW +# ifndef OPENSSL_NO_HW_IBMCA + +# ifdef FLAT_INC +# include "ica_openssl_api.h" +# else +# include "vendor_defns/ica_openssl_api.h" +# endif + +# define IBMCA_LIB_NAME "ibmca engine" +# include "hw_ibmca_err.c" + +static int ibmca_destroy(ENGINE *e); +static int ibmca_init(ENGINE *e); +static int ibmca_finish(ENGINE *e); +static int ibmca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) ()); + +static const char *IBMCA_F1 = "icaOpenAdapter"; +static const char *IBMCA_F2 = "icaCloseAdapter"; +static const char *IBMCA_F3 = "icaRsaModExpo"; +static const char *IBMCA_F4 = "icaRandomNumberGenerate"; +static const char *IBMCA_F5 = "icaRsaCrt"; + +ICA_ADAPTER_HANDLE handle = 0; + +/* BIGNUM stuff */ +static int ibmca_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx); + +static int ibmca_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *q, const BIGNUM *dmp1, + const BIGNUM *dmq1, const BIGNUM *iqmp, + BN_CTX *ctx); + +# ifndef OPENSSL_NO_RSA +/* RSA stuff */ +static int ibmca_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa); +# endif + +/* This function is aliased to mod_exp (with the mont stuff dropped). */ +static int ibmca_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx); + +# ifndef OPENSSL_NO_DSA +/* DSA stuff */ +static int ibmca_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, + BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *in_mont); +static int ibmca_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx); +# endif + +# ifndef OPENSSL_NO_DH +/* DH stuff */ +/* This function is alised to mod_exp (with the DH and mont dropped). */ +static int ibmca_mod_exp_dh(const DH *dh, BIGNUM *r, + const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); +# endif + +/* RAND stuff */ +static int ibmca_rand_bytes(unsigned char *buf, int num); +static int ibmca_rand_status(void); + +/* WJH - check for more commands, like in nuron */ + +/* The definitions for control commands specific to this engine */ +# define IBMCA_CMD_SO_PATH ENGINE_CMD_BASE +static const ENGINE_CMD_DEFN ibmca_cmd_defns[] = { + {IBMCA_CMD_SO_PATH, + "SO_PATH", + "Specifies the path to the 'atasi' shared library", + ENGINE_CMD_FLAG_STRING}, + {0, NULL, NULL, 0} +}; + +# ifndef OPENSSL_NO_RSA +/* Our internal RSA_METHOD that we provide pointers to */ +static RSA_METHOD ibmca_rsa = { + "Ibmca RSA method", + NULL, + NULL, + NULL, + NULL, + ibmca_rsa_mod_exp, + ibmca_mod_exp_mont, + NULL, + NULL, + 0, + NULL, + NULL, + NULL +}; +# endif + +# ifndef OPENSSL_NO_DSA +/* Our internal DSA_METHOD that we provide pointers to */ +static DSA_METHOD ibmca_dsa = { + "Ibmca DSA method", + NULL, /* dsa_do_sign */ + NULL, /* dsa_sign_setup */ + NULL, /* dsa_do_verify */ + ibmca_dsa_mod_exp, /* dsa_mod_exp */ + ibmca_mod_exp_dsa, /* bn_mod_exp */ + NULL, /* init */ + NULL, /* finish */ + 0, /* flags */ + NULL /* app_data */ +}; +# endif + +# ifndef OPENSSL_NO_DH +/* Our internal DH_METHOD that we provide pointers to */ +static DH_METHOD ibmca_dh = { + "Ibmca DH method", + NULL, + NULL, + ibmca_mod_exp_dh, + NULL, + NULL, + 0, + NULL +}; +# endif + +static RAND_METHOD ibmca_rand = { + /* "IBMCA RAND method", */ + NULL, + ibmca_rand_bytes, + NULL, + NULL, + ibmca_rand_bytes, + ibmca_rand_status, +}; + +/* Constants used when creating the ENGINE */ +static const char *engine_ibmca_id = "ibmca"; +static const char *engine_ibmca_name = "Ibmca hardware engine support"; + +/* + * This internal function is used by ENGINE_ibmca() and possibly by the + * "dynamic" ENGINE support too + */ +static int bind_helper(ENGINE *e) +{ +# ifndef OPENSSL_NO_RSA + const RSA_METHOD *meth1; +# endif +# ifndef OPENSSL_NO_DSA + const DSA_METHOD *meth2; +# endif +# ifndef OPENSSL_NO_DH + const DH_METHOD *meth3; +# endif + if (!ENGINE_set_id(e, engine_ibmca_id) || + !ENGINE_set_name(e, engine_ibmca_name) || +# ifndef OPENSSL_NO_RSA + !ENGINE_set_RSA(e, &ibmca_rsa) || +# endif +# ifndef OPENSSL_NO_DSA + !ENGINE_set_DSA(e, &ibmca_dsa) || +# endif +# ifndef OPENSSL_NO_DH + !ENGINE_set_DH(e, &ibmca_dh) || +# endif + !ENGINE_set_RAND(e, &ibmca_rand) || + !ENGINE_set_destroy_function(e, ibmca_destroy) || + !ENGINE_set_init_function(e, ibmca_init) || + !ENGINE_set_finish_function(e, ibmca_finish) || + !ENGINE_set_ctrl_function(e, ibmca_ctrl) || + !ENGINE_set_cmd_defns(e, ibmca_cmd_defns)) + return 0; + +# ifndef OPENSSL_NO_RSA + /* + * We know that the "PKCS1_SSLeay()" functions hook properly to the + * ibmca-specific mod_exp and mod_exp_crt so we use those functions. NB: + * We don't use ENGINE_openssl() or anything "more generic" because + * something like the RSAref code may not hook properly, and if you own + * one of these cards then you have the right to do RSA operations on it + * anyway! + */ + meth1 = RSA_PKCS1_SSLeay(); + ibmca_rsa.rsa_pub_enc = meth1->rsa_pub_enc; + ibmca_rsa.rsa_pub_dec = meth1->rsa_pub_dec; + ibmca_rsa.rsa_priv_enc = meth1->rsa_priv_enc; + ibmca_rsa.rsa_priv_dec = meth1->rsa_priv_dec; +# endif + +# ifndef OPENSSL_NO_DSA + /* + * Use the DSA_OpenSSL() method and just hook the mod_exp-ish bits. + */ + meth2 = DSA_OpenSSL(); + ibmca_dsa.dsa_do_sign = meth2->dsa_do_sign; + ibmca_dsa.dsa_sign_setup = meth2->dsa_sign_setup; + ibmca_dsa.dsa_do_verify = meth2->dsa_do_verify; +# endif + +# ifndef OPENSSL_NO_DH + /* Much the same for Diffie-Hellman */ + meth3 = DH_OpenSSL(); + ibmca_dh.generate_key = meth3->generate_key; + ibmca_dh.compute_key = meth3->compute_key; +# endif + + /* Ensure the ibmca error handling is set up */ + ERR_load_IBMCA_strings(); + return 1; +} + +static ENGINE *engine_ibmca(void) +{ + ENGINE *ret = ENGINE_new(); + if (!ret) + return NULL; + if (!bind_helper(ret)) { + ENGINE_free(ret); + return NULL; + } + return ret; +} + +# ifdef ENGINE_DYNAMIC_SUPPORT +static +# endif +void ENGINE_load_ibmca(void) +{ + /* Copied from eng_[openssl|dyn].c */ + ENGINE *toadd = engine_ibmca(); + if (!toadd) + return; + ENGINE_add(toadd); + ENGINE_free(toadd); + ERR_clear_error(); +} + +/* Destructor (complements the "ENGINE_ibmca()" constructor) */ +static int ibmca_destroy(ENGINE *e) +{ + /* + * Unload the ibmca error strings so any error state including our functs + * or reasons won't lead to a segfault (they simply get displayed without + * corresponding string data because none will be found). + */ + ERR_unload_IBMCA_strings(); + return 1; +} + +/* + * This is a process-global DSO handle used for loading and unloading the + * Ibmca library. NB: This is only set (or unset) during an init() or + * finish() call (reference counts permitting) and they're operating with + * global locks, so this should be thread-safe implicitly. + */ + +static DSO *ibmca_dso = NULL; + +/* + * These are the function pointers that are (un)set when the library has + * successfully (un)loaded. + */ + +static unsigned int (ICA_CALL * p_icaOpenAdapter) (); +static unsigned int (ICA_CALL * p_icaCloseAdapter) (); +static unsigned int (ICA_CALL * p_icaRsaModExpo) (); +static unsigned int (ICA_CALL * p_icaRandomNumberGenerate) (); +static unsigned int (ICA_CALL * p_icaRsaCrt) (); + +/* utility function to obtain a context */ +static int get_context(ICA_ADAPTER_HANDLE * p_handle) +{ + unsigned int status = 0; + + status = p_icaOpenAdapter(0, p_handle); + if (status != 0) + return 0; + return 1; +} + +/* similarly to release one. */ +static void release_context(ICA_ADAPTER_HANDLE handle) +{ + p_icaCloseAdapter(handle); +} + +/* (de)initialisation functions. */ +static int ibmca_init(ENGINE *e) +{ + + void (*p1) (); + void (*p2) (); + void (*p3) (); + void (*p4) (); + void (*p5) (); + + if (ibmca_dso != NULL) { + IBMCAerr(IBMCA_F_IBMCA_INIT, IBMCA_R_ALREADY_LOADED); + goto err; + } + /* + * Attempt to load libatasi.so/atasi.dll/whatever. Needs to be changed + * unfortunately because the Ibmca drivers don't have standard library + * names that can be platform-translated well. + */ + /* + * TODO: Work out how to actually map to the names the Ibmca drivers + * really use - for now a symbollic link needs to be created on the host + * system from libatasi.so to atasi.so on unix variants. + */ + + /* WJH XXX check name translation */ + + ibmca_dso = DSO_load(NULL, IBMCA_LIBNAME, NULL, + /* + * DSO_FLAG_NAME_TRANSLATION + */ 0); + if (ibmca_dso == NULL) { + IBMCAerr(IBMCA_F_IBMCA_INIT, IBMCA_R_DSO_FAILURE); + goto err; + } + + if (!(p1 = DSO_bind_func(ibmca_dso, IBMCA_F1)) || + !(p2 = DSO_bind_func(ibmca_dso, IBMCA_F2)) || + !(p3 = DSO_bind_func(ibmca_dso, IBMCA_F3)) || + !(p4 = DSO_bind_func(ibmca_dso, IBMCA_F4)) || + !(p5 = DSO_bind_func(ibmca_dso, IBMCA_F5))) { + IBMCAerr(IBMCA_F_IBMCA_INIT, IBMCA_R_DSO_FAILURE); + goto err; + } + + /* Copy the pointers */ + + p_icaOpenAdapter = (unsigned int (ICA_CALL *) ())p1; + p_icaCloseAdapter = (unsigned int (ICA_CALL *) ())p2; + p_icaRsaModExpo = (unsigned int (ICA_CALL *) ())p3; + p_icaRandomNumberGenerate = (unsigned int (ICA_CALL *) ())p4; + p_icaRsaCrt = (unsigned int (ICA_CALL *) ())p5; + + if (!get_context(&handle)) { + IBMCAerr(IBMCA_F_IBMCA_INIT, IBMCA_R_UNIT_FAILURE); + goto err; + } + + return 1; + err: + if (ibmca_dso) + DSO_free(ibmca_dso); + + p_icaOpenAdapter = NULL; + p_icaCloseAdapter = NULL; + p_icaRsaModExpo = NULL; + p_icaRandomNumberGenerate = NULL; + + return 0; +} + +static int ibmca_finish(ENGINE *e) +{ + if (ibmca_dso == NULL) { + IBMCAerr(IBMCA_F_IBMCA_FINISH, IBMCA_R_NOT_LOADED); + return 0; + } + release_context(handle); + if (!DSO_free(ibmca_dso)) { + IBMCAerr(IBMCA_F_IBMCA_FINISH, IBMCA_R_DSO_FAILURE); + return 0; + } + ibmca_dso = NULL; + + return 1; +} + +static int ibmca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) ()) +{ + int initialised = ((ibmca_dso == NULL) ? 0 : 1); + switch (cmd) { + case IBMCA_CMD_SO_PATH: + if (p == NULL) { + IBMCAerr(IBMCA_F_IBMCA_CTRL, ERR_R_PASSED_NULL_PARAMETER); + return 0; + } + if (initialised) { + IBMCAerr(IBMCA_F_IBMCA_CTRL, IBMCA_R_ALREADY_LOADED); + return 0; + } + IBMCA_LIBNAME = (const char *)p; + return 1; + default: + break; + } + IBMCAerr(IBMCA_F_IBMCA_CTRL, IBMCA_R_CTRL_COMMAND_NOT_IMPLEMENTED); + return 0; +} + +static int ibmca_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx) +{ + /* + * I need somewhere to store temporary serialised values for use with the + * Ibmca API calls. A neat cheat - I'll use BIGNUMs from the BN_CTX but + * access their arrays directly as byte arrays . This way I don't + * have to clean anything up. + */ + + BIGNUM *argument = NULL; + BIGNUM *result = NULL; + BIGNUM *key = NULL; + int to_return; + int inLen, outLen, tmpLen; + + ICA_KEY_RSA_MODEXPO *publKey = NULL; + unsigned int rc; + + to_return = 0; /* expect failure */ + + if (!ibmca_dso) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP, IBMCA_R_NOT_LOADED); + goto err; + } + /* Prepare the params */ + BN_CTX_start(ctx); + argument = BN_CTX_get(ctx); + result = BN_CTX_get(ctx); + key = BN_CTX_get(ctx); + + if (!argument || !result || !key) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP, IBMCA_R_BN_CTX_FULL); + goto err; + } + + if (!bn_wexpand(argument, m->top) || !bn_wexpand(result, m->top) || + !bn_wexpand(key, sizeof(*publKey) / BN_BYTES)) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP, IBMCA_R_BN_EXPAND_FAIL); + goto err; + } + + publKey = (ICA_KEY_RSA_MODEXPO *)key->d; + + if (publKey == NULL) { + goto err; + } + memset(publKey, 0, sizeof(ICA_KEY_RSA_MODEXPO)); + + publKey->keyType = CORRECT_ENDIANNESS(ME_KEY_TYPE); + publKey->keyLength = CORRECT_ENDIANNESS(sizeof(ICA_KEY_RSA_MODEXPO)); + publKey->expOffset = (char *)publKey->keyRecord - (char *)publKey; + + /* + * A quirk of the card: the exponent length has to be the same as the + * modulus (key) length + */ + + outLen = BN_num_bytes(m); + +/* check for modulus length SAB*/ + if (outLen > 256) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP, IBMCA_R_MEXP_LENGTH_TO_LARGE); + goto err; + } +/* check for modulus length SAB*/ + + publKey->expLength = publKey->nLength = outLen; + /* + * SAB Check for underflow condition the size of the exponent is less + * than the size of the parameter then we have a big problem and will + * underflow the keyRecord buffer. Bad stuff could happen then + */ + if (outLen < BN_num_bytes(p)) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP, IBMCA_R_UNDERFLOW_KEYRECORD); + goto err; + } +/* SAB End check for underflow */ + + BN_bn2bin(p, &publKey->keyRecord[publKey->expLength - BN_num_bytes(p)]); + BN_bn2bin(m, &publKey->keyRecord[publKey->expLength]); + + publKey->modulusBitLength = CORRECT_ENDIANNESS(publKey->nLength * 8); + publKey->nOffset = CORRECT_ENDIANNESS(publKey->expOffset + + publKey->expLength); + + publKey->expOffset = CORRECT_ENDIANNESS((char *)publKey->keyRecord - + (char *)publKey); + + tmpLen = outLen; + publKey->expLength = publKey->nLength = CORRECT_ENDIANNESS(tmpLen); + + /* Prepare the argument */ + + memset(argument->d, 0, outLen); + BN_bn2bin(a, (unsigned char *)argument->d + outLen - BN_num_bytes(a)); + + inLen = outLen; + + /* Perform the operation */ + + if ((rc = p_icaRsaModExpo(handle, inLen, (unsigned char *)argument->d, + publKey, &outLen, (unsigned char *)result->d)) + != 0) { + printf("rc = %d\n", rc); + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP, IBMCA_R_REQUEST_FAILED); + goto err; + } + + /* Convert the response */ + BN_bin2bn((unsigned char *)result->d, outLen, r); + to_return = 1; + err: + BN_CTX_end(ctx); + return to_return; +} + +# ifndef OPENSSL_NO_RSA +static int ibmca_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) +{ + BN_CTX *ctx; + int to_return = 0; + + if ((ctx = BN_CTX_new()) == NULL) + goto err; + if (!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp) { + if (!rsa->d || !rsa->n) { + IBMCAerr(IBMCA_F_IBMCA_RSA_MOD_EXP, + IBMCA_R_MISSING_KEY_COMPONENTS); + goto err; + } + to_return = ibmca_mod_exp(r0, I, rsa->d, rsa->n, ctx); + } else { + to_return = ibmca_mod_exp_crt(r0, I, rsa->p, rsa->q, rsa->dmp1, + rsa->dmq1, rsa->iqmp, ctx); + } + err: + if (ctx) + BN_CTX_free(ctx); + return to_return; +} +# endif + +/* Ein kleines chinesisches "Restessen" */ +static int ibmca_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *q, const BIGNUM *dmp1, + const BIGNUM *dmq1, const BIGNUM *iqmp, + BN_CTX *ctx) +{ + + BIGNUM *argument = NULL; + BIGNUM *result = NULL; + BIGNUM *key = NULL; + + int to_return = 0; /* expect failure */ + + char *pkey = NULL; + ICA_KEY_RSA_CRT *privKey = NULL; + int inLen, outLen; + + int rc; + unsigned int offset, pSize, qSize; +/* SAB New variables */ + unsigned int keyRecordSize; + unsigned int pbytes = BN_num_bytes(p); + unsigned int qbytes = BN_num_bytes(q); + unsigned int dmp1bytes = BN_num_bytes(dmp1); + unsigned int dmq1bytes = BN_num_bytes(dmq1); + unsigned int iqmpbytes = BN_num_bytes(iqmp); + + /* Prepare the params */ + + BN_CTX_start(ctx); + argument = BN_CTX_get(ctx); + result = BN_CTX_get(ctx); + key = BN_CTX_get(ctx); + + if (!argument || !result || !key) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_BN_CTX_FULL); + goto err; + } + + if (!bn_wexpand(argument, p->top + q->top) || + !bn_wexpand(result, p->top + q->top) || + !bn_wexpand(key, sizeof(*privKey) / BN_BYTES)) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_BN_EXPAND_FAIL); + goto err; + } + + privKey = (ICA_KEY_RSA_CRT *)key->d; + /* + * SAB Add check for total size in bytes of the parms does not exceed the + * buffer space we have do this first + */ + keyRecordSize = pbytes + qbytes + dmp1bytes + dmq1bytes + iqmpbytes; + if (keyRecordSize > sizeof(privKey->keyRecord)) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_OPERANDS_TO_LARGE); + goto err; + } + + if ((qbytes + dmq1bytes) > 256) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_OPERANDS_TO_LARGE); + goto err; + } + + if (pbytes + dmp1bytes > 256) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_OPERANDS_TO_LARGE); + goto err; + } + +/* end SAB additions */ + + memset(privKey, 0, sizeof(ICA_KEY_RSA_CRT)); + privKey->keyType = CORRECT_ENDIANNESS(CRT_KEY_TYPE); + privKey->keyLength = CORRECT_ENDIANNESS(sizeof(ICA_KEY_RSA_CRT)); + privKey->modulusBitLength = CORRECT_ENDIANNESS(BN_num_bytes(q) * 2 * 8); + + /* + * p,dp & qInv are 1 QWORD Larger + */ + privKey->pLength = CORRECT_ENDIANNESS(BN_num_bytes(p) + 8); + privKey->qLength = CORRECT_ENDIANNESS(BN_num_bytes(q)); + privKey->dpLength = CORRECT_ENDIANNESS(BN_num_bytes(dmp1) + 8); + privKey->dqLength = CORRECT_ENDIANNESS(BN_num_bytes(dmq1)); + privKey->qInvLength = CORRECT_ENDIANNESS(BN_num_bytes(iqmp) + 8); + + offset = (char *)privKey->keyRecord - (char *)privKey; + + qSize = BN_num_bytes(q); + pSize = qSize + 8; /* 1 QWORD larger */ + + /* + * SAB probably aittle redundant, but we'll verify that each of the + * components which make up a key record sent ot the card does not exceed + * the space that is allocated for it. this handles the case where even + * if the total length does not exceed keyrecord zied, if the operands are + * funny sized they could cause potential side affects on either the card + * or the result + */ + + if ((pbytes > pSize) || (dmp1bytes > pSize) || + (iqmpbytes > pSize) || (qbytes > qSize) || (dmq1bytes > qSize)) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_OPERANDS_TO_LARGE); + goto err; + + } + + privKey->dpOffset = CORRECT_ENDIANNESS(offset); + + offset += pSize; + privKey->dqOffset = CORRECT_ENDIANNESS(offset); + + offset += qSize; + privKey->pOffset = CORRECT_ENDIANNESS(offset); + + offset += pSize; + privKey->qOffset = CORRECT_ENDIANNESS(offset); + + offset += qSize; + privKey->qInvOffset = CORRECT_ENDIANNESS(offset); + + pkey = (char *)privKey->keyRecord; + +/* SAB first check that we don;t under flow the buffer */ + if (pSize < pbytes) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_UNDERFLOW_CONDITION); + goto err; + } + + /* pkey += pSize - BN_num_bytes(p); WROING this should be dmp1) */ + pkey += pSize - BN_num_bytes(dmp1); + BN_bn2bin(dmp1, pkey); + pkey += BN_num_bytes(dmp1); /* move the pointer */ + + BN_bn2bin(dmq1, pkey); /* Copy over dmq1 */ + + pkey += qSize; /* move pointer */ + /* set up for zero padding of next field */ + pkey += pSize - BN_num_bytes(p); + + BN_bn2bin(p, pkey); + /* increment pointer by number of bytes moved */ + pkey += BN_num_bytes(p); + + BN_bn2bin(q, pkey); + pkey += qSize; /* move the pointer */ + pkey += pSize - BN_num_bytes(iqmp); /* Adjust for padding */ + BN_bn2bin(iqmp, pkey); + + /* Prepare the argument and response */ + + /* + * Correct endianess is used because the fields were converted above + */ + outLen = CORRECT_ENDIANNESS(privKey->qLength) * 2; + + if (outLen > 256) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_OUTLEN_TO_LARGE); + goto err; + } + + /* SAB check for underflow here on the argeument */ + if (outLen < BN_num_bytes(a)) { + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_UNDERFLOW_CONDITION); + goto err; + } + + BN_bn2bin(a, (unsigned char *)argument->d + outLen - BN_num_bytes(a)); + inLen = outLen; + + memset(result->d, 0, outLen); + + /* Perform the operation */ + + if ((rc = p_icaRsaCrt(handle, inLen, (unsigned char *)argument->d, + privKey, &outLen, (unsigned char *)result->d)) != 0) + { + printf("rc = %d\n", rc); + IBMCAerr(IBMCA_F_IBMCA_MOD_EXP_CRT, IBMCA_R_REQUEST_FAILED); + goto err; + } + + /* Convert the response */ + + BN_bin2bn((unsigned char *)result->d, outLen, r); + to_return = 1; + + err: + BN_CTX_end(ctx); + return to_return; + +} + +# ifndef OPENSSL_NO_DSA +/* + * This code was liberated and adapted from the commented-out code in + * dsa_ossl.c. Because of the unoptimised form of the Ibmca acceleration (it + * doesn't have a CRT form for RSA), this function means that an Ibmca system + * running with a DSA server certificate can handshake around 5 or 6 times + * faster/more than an equivalent system running with RSA. Just check out the + * "signs" statistics from the RSA and DSA parts of "openssl speed -engine + * ibmca dsa1024 rsa1024". + */ +static int ibmca_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, + BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *in_mont) +{ + BIGNUM t; + int to_return = 0; + + BN_init(&t); + /* let rr = a1 ^ p1 mod m */ + if (!ibmca_mod_exp(rr, a1, p1, m, ctx)) + goto end; + /* let t = a2 ^ p2 mod m */ + if (!ibmca_mod_exp(&t, a2, p2, m, ctx)) + goto end; + /* let rr = rr * t mod m */ + if (!BN_mod_mul(rr, rr, &t, m, ctx)) + goto end; + to_return = 1; + end: + BN_free(&t); + return to_return; +} + +static int ibmca_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx) +{ + return ibmca_mod_exp(r, a, p, m, ctx); +} +# endif + +/* This function is aliased to mod_exp (with the mont stuff dropped). */ +static int ibmca_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx) +{ + return ibmca_mod_exp(r, a, p, m, ctx); +} + +# ifndef OPENSSL_NO_DH +/* This function is aliased to mod_exp (with the dh and mont dropped). */ +static int ibmca_mod_exp_dh(DH const *dh, BIGNUM *r, + const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) +{ + return ibmca_mod_exp(r, a, p, m, ctx); +} +# endif + +/* Random bytes are good */ +static int ibmca_rand_bytes(unsigned char *buf, int num) +{ + int to_return = 0; /* assume failure */ + unsigned int ret; + + if (handle == 0) { + IBMCAerr(IBMCA_F_IBMCA_RAND_BYTES, IBMCA_R_NOT_INITIALISED); + goto err; + } + + ret = p_icaRandomNumberGenerate(handle, num, buf); + if (ret < 0) { + IBMCAerr(IBMCA_F_IBMCA_RAND_BYTES, IBMCA_R_REQUEST_FAILED); + goto err; + } + to_return = 1; + err: + return to_return; +} + +static int ibmca_rand_status(void) +{ + return 1; +} + +/* + * This stuff is needed if this ENGINE is being compiled into a + * self-contained shared-library. + */ +# ifdef ENGINE_DYNAMIC_SUPPORT +static int bind_fn(ENGINE *e, const char *id) +{ + if (id && (strcmp(id, engine_ibmca_id) != 0)) /* WJH XXX */ + return 0; + if (!bind_helper(e)) + return 0; + return 1; +} + +IMPLEMENT_DYNAMIC_CHECK_FN() + IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) +# endif /* ENGINE_DYNAMIC_SUPPORT */ +# endif /* !OPENSSL_NO_HW_IBMCA */ +#endif /* !OPENSSL_NO_HW */ diff --git a/openssl/demos/engines/ibmca/hw_ibmca_err.c b/openssl/demos/engines/ibmca/hw_ibmca_err.c index c4053f6d3..9bcb8004b 100644 --- a/openssl/demos/engines/ibmca/hw_ibmca_err.c +++ b/openssl/demos/engines/ibmca/hw_ibmca_err.c @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,7 +53,8 @@ * */ -/* NOTE: this file was auto generated by the mkerr.pl script: any changes +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes * made to it will be overwritten when the script next updates this file, * only reason strings will be preserved. */ @@ -64,91 +65,85 @@ /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -static ERR_STRING_DATA IBMCA_str_functs[]= - { -{ERR_PACK(0,IBMCA_F_IBMCA_CTRL,0), "IBMCA_CTRL"}, -{ERR_PACK(0,IBMCA_F_IBMCA_FINISH,0), "IBMCA_FINISH"}, -{ERR_PACK(0,IBMCA_F_IBMCA_INIT,0), "IBMCA_INIT"}, -{ERR_PACK(0,IBMCA_F_IBMCA_MOD_EXP,0), "IBMCA_MOD_EXP"}, -{ERR_PACK(0,IBMCA_F_IBMCA_MOD_EXP_CRT,0), "IBMCA_MOD_EXP_CRT"}, -{ERR_PACK(0,IBMCA_F_IBMCA_RAND_BYTES,0), "IBMCA_RAND_BYTES"}, -{ERR_PACK(0,IBMCA_F_IBMCA_RSA_MOD_EXP,0), "IBMCA_RSA_MOD_EXP"}, -{0,NULL} - }; +static ERR_STRING_DATA IBMCA_str_functs[] = { + {ERR_PACK(0, IBMCA_F_IBMCA_CTRL, 0), "IBMCA_CTRL"}, + {ERR_PACK(0, IBMCA_F_IBMCA_FINISH, 0), "IBMCA_FINISH"}, + {ERR_PACK(0, IBMCA_F_IBMCA_INIT, 0), "IBMCA_INIT"}, + {ERR_PACK(0, IBMCA_F_IBMCA_MOD_EXP, 0), "IBMCA_MOD_EXP"}, + {ERR_PACK(0, IBMCA_F_IBMCA_MOD_EXP_CRT, 0), "IBMCA_MOD_EXP_CRT"}, + {ERR_PACK(0, IBMCA_F_IBMCA_RAND_BYTES, 0), "IBMCA_RAND_BYTES"}, + {ERR_PACK(0, IBMCA_F_IBMCA_RSA_MOD_EXP, 0), "IBMCA_RSA_MOD_EXP"}, + {0, NULL} +}; -static ERR_STRING_DATA IBMCA_str_reasons[]= - { -{IBMCA_R_ALREADY_LOADED ,"already loaded"}, -{IBMCA_R_BN_CTX_FULL ,"bn ctx full"}, -{IBMCA_R_BN_EXPAND_FAIL ,"bn expand fail"}, -{IBMCA_R_CTRL_COMMAND_NOT_IMPLEMENTED ,"ctrl command not implemented"}, -{IBMCA_R_DSO_FAILURE ,"dso failure"}, -{IBMCA_R_MEXP_LENGTH_TO_LARGE ,"mexp length to large"}, -{IBMCA_R_MISSING_KEY_COMPONENTS ,"missing key components"}, -{IBMCA_R_NOT_INITIALISED ,"not initialised"}, -{IBMCA_R_NOT_LOADED ,"not loaded"}, -{IBMCA_R_OPERANDS_TO_LARGE ,"operands to large"}, -{IBMCA_R_OUTLEN_TO_LARGE ,"outlen to large"}, -{IBMCA_R_REQUEST_FAILED ,"request failed"}, -{IBMCA_R_UNDERFLOW_CONDITION ,"underflow condition"}, -{IBMCA_R_UNDERFLOW_KEYRECORD ,"underflow keyrecord"}, -{IBMCA_R_UNIT_FAILURE ,"unit failure"}, -{0,NULL} - }; +static ERR_STRING_DATA IBMCA_str_reasons[] = { + {IBMCA_R_ALREADY_LOADED, "already loaded"}, + {IBMCA_R_BN_CTX_FULL, "bn ctx full"}, + {IBMCA_R_BN_EXPAND_FAIL, "bn expand fail"}, + {IBMCA_R_CTRL_COMMAND_NOT_IMPLEMENTED, "ctrl command not implemented"}, + {IBMCA_R_DSO_FAILURE, "dso failure"}, + {IBMCA_R_MEXP_LENGTH_TO_LARGE, "mexp length to large"}, + {IBMCA_R_MISSING_KEY_COMPONENTS, "missing key components"}, + {IBMCA_R_NOT_INITIALISED, "not initialised"}, + {IBMCA_R_NOT_LOADED, "not loaded"}, + {IBMCA_R_OPERANDS_TO_LARGE, "operands to large"}, + {IBMCA_R_OUTLEN_TO_LARGE, "outlen to large"}, + {IBMCA_R_REQUEST_FAILED, "request failed"}, + {IBMCA_R_UNDERFLOW_CONDITION, "underflow condition"}, + {IBMCA_R_UNDERFLOW_KEYRECORD, "underflow keyrecord"}, + {IBMCA_R_UNIT_FAILURE, "unit failure"}, + {0, NULL} +}; #endif #ifdef IBMCA_LIB_NAME -static ERR_STRING_DATA IBMCA_lib_name[]= - { -{0 ,IBMCA_LIB_NAME}, -{0,NULL} - }; +static ERR_STRING_DATA IBMCA_lib_name[] = { + {0, IBMCA_LIB_NAME}, + {0, NULL} +}; #endif - -static int IBMCA_lib_error_code=0; -static int IBMCA_error_init=1; +static int IBMCA_lib_error_code = 0; +static int IBMCA_error_init = 1; static void ERR_load_IBMCA_strings(void) - { - if (IBMCA_lib_error_code == 0) - IBMCA_lib_error_code=ERR_get_next_error_library(); +{ + if (IBMCA_lib_error_code == 0) + IBMCA_lib_error_code = ERR_get_next_error_library(); - if (IBMCA_error_init) - { - IBMCA_error_init=0; + if (IBMCA_error_init) { + IBMCA_error_init = 0; #ifndef OPENSSL_NO_ERR - ERR_load_strings(IBMCA_lib_error_code,IBMCA_str_functs); - ERR_load_strings(IBMCA_lib_error_code,IBMCA_str_reasons); + ERR_load_strings(IBMCA_lib_error_code, IBMCA_str_functs); + ERR_load_strings(IBMCA_lib_error_code, IBMCA_str_reasons); #endif #ifdef IBMCA_LIB_NAME - IBMCA_lib_name->error = ERR_PACK(IBMCA_lib_error_code,0,0); - ERR_load_strings(0,IBMCA_lib_name); + IBMCA_lib_name->error = ERR_PACK(IBMCA_lib_error_code, 0, 0); + ERR_load_strings(0, IBMCA_lib_name); #endif - } - } + } +} static void ERR_unload_IBMCA_strings(void) - { - if (IBMCA_error_init == 0) - { +{ + if (IBMCA_error_init == 0) { #ifndef OPENSSL_NO_ERR - ERR_unload_strings(IBMCA_lib_error_code,IBMCA_str_functs); - ERR_unload_strings(IBMCA_lib_error_code,IBMCA_str_reasons); + ERR_unload_strings(IBMCA_lib_error_code, IBMCA_str_functs); + ERR_unload_strings(IBMCA_lib_error_code, IBMCA_str_reasons); #endif #ifdef IBMCA_LIB_NAME - ERR_unload_strings(0,IBMCA_lib_name); + ERR_unload_strings(0, IBMCA_lib_name); #endif - IBMCA_error_init=1; - } - } + IBMCA_error_init = 1; + } +} static void ERR_IBMCA_error(int function, int reason, char *file, int line) - { - if (IBMCA_lib_error_code == 0) - IBMCA_lib_error_code=ERR_get_next_error_library(); - ERR_PUT_error(IBMCA_lib_error_code,function,reason,file,line); - } +{ + if (IBMCA_lib_error_code == 0) + IBMCA_lib_error_code = ERR_get_next_error_library(); + ERR_PUT_error(IBMCA_lib_error_code, function, reason, file, line); +} diff --git a/openssl/demos/engines/ibmca/hw_ibmca_err.h b/openssl/demos/engines/ibmca/hw_ibmca_err.h index 2070f9579..c17e0c93b 100644 --- a/openssl/demos/engines/ibmca/hw_ibmca_err.h +++ b/openssl/demos/engines/ibmca/hw_ibmca_err.h @@ -6,7 +6,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,48 +53,49 @@ */ #ifndef HEADER_IBMCA_ERR_H -#define HEADER_IBMCA_ERR_H +# define HEADER_IBMCA_ERR_H #ifdef __cplusplus extern "C" { #endif /* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes +/* + * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ static void ERR_load_IBMCA_strings(void); static void ERR_unload_IBMCA_strings(void); static void ERR_IBMCA_error(int function, int reason, char *file, int line); -#define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),__FILE__,__LINE__) +# define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),__FILE__,__LINE__) /* Error codes for the IBMCA functions. */ /* Function codes. */ -#define IBMCA_F_IBMCA_CTRL 100 -#define IBMCA_F_IBMCA_FINISH 101 -#define IBMCA_F_IBMCA_INIT 102 -#define IBMCA_F_IBMCA_MOD_EXP 103 -#define IBMCA_F_IBMCA_MOD_EXP_CRT 104 -#define IBMCA_F_IBMCA_RAND_BYTES 105 -#define IBMCA_F_IBMCA_RSA_MOD_EXP 106 +# define IBMCA_F_IBMCA_CTRL 100 +# define IBMCA_F_IBMCA_FINISH 101 +# define IBMCA_F_IBMCA_INIT 102 +# define IBMCA_F_IBMCA_MOD_EXP 103 +# define IBMCA_F_IBMCA_MOD_EXP_CRT 104 +# define IBMCA_F_IBMCA_RAND_BYTES 105 +# define IBMCA_F_IBMCA_RSA_MOD_EXP 106 /* Reason codes. */ -#define IBMCA_R_ALREADY_LOADED 100 -#define IBMCA_R_BN_CTX_FULL 101 -#define IBMCA_R_BN_EXPAND_FAIL 102 -#define IBMCA_R_CTRL_COMMAND_NOT_IMPLEMENTED 103 -#define IBMCA_R_DSO_FAILURE 104 -#define IBMCA_R_MEXP_LENGTH_TO_LARGE 105 -#define IBMCA_R_MISSING_KEY_COMPONENTS 106 -#define IBMCA_R_NOT_INITIALISED 107 -#define IBMCA_R_NOT_LOADED 108 -#define IBMCA_R_OPERANDS_TO_LARGE 109 -#define IBMCA_R_OUTLEN_TO_LARGE 110 -#define IBMCA_R_REQUEST_FAILED 111 -#define IBMCA_R_UNDERFLOW_CONDITION 112 -#define IBMCA_R_UNDERFLOW_KEYRECORD 113 -#define IBMCA_R_UNIT_FAILURE 114 +# define IBMCA_R_ALREADY_LOADED 100 +# define IBMCA_R_BN_CTX_FULL 101 +# define IBMCA_R_BN_EXPAND_FAIL 102 +# define IBMCA_R_CTRL_COMMAND_NOT_IMPLEMENTED 103 +# define IBMCA_R_DSO_FAILURE 104 +# define IBMCA_R_MEXP_LENGTH_TO_LARGE 105 +# define IBMCA_R_MISSING_KEY_COMPONENTS 106 +# define IBMCA_R_NOT_INITIALISED 107 +# define IBMCA_R_NOT_LOADED 108 +# define IBMCA_R_OPERANDS_TO_LARGE 109 +# define IBMCA_R_OUTLEN_TO_LARGE 110 +# define IBMCA_R_REQUEST_FAILED 111 +# define IBMCA_R_UNDERFLOW_CONDITION 112 +# define IBMCA_R_UNDERFLOW_KEYRECORD 113 +# define IBMCA_R_UNIT_FAILURE 114 #ifdef __cplusplus } diff --git a/openssl/demos/engines/ibmca/ica_openssl_api.h b/openssl/demos/engines/ibmca/ica_openssl_api.h index c77e0fd5c..715bb928b 100644 --- a/openssl/demos/engines/ibmca/ica_openssl_api.h +++ b/openssl/demos/engines/ibmca/ica_openssl_api.h @@ -1,189 +1,183 @@ #ifndef __ICA_OPENSSL_API_H__ -#define __ICA_OPENSSL_API_H__ +# define __ICA_OPENSSL_API_H__ /** ** abstract data types for API **/ -#define ICA_ADAPTER_HANDLE int +# define ICA_ADAPTER_HANDLE int -#if defined(linux) || defined (_AIX) -#define ICA_CALL -#endif +# if defined(linux) || defined (_AIX) +# define ICA_CALL +# endif -#if defined(WIN32) || defined(_WIN32) -#define ICA_CALL __stdcall -#endif +# if defined(WIN32) || defined(_WIN32) +# define ICA_CALL __stdcall +# endif -/*------------------------------------------------* +/* -----------------------------------------------* | RSA defines and typedefs | *------------------------------------------------*/ /* - * All data elements of the RSA key are in big-endian format - * Modulus-Exponent form of key - * - */ - #define MAX_EXP_SIZE 256 - #define MAX_MODULUS_SIZE 256 - #define MAX_MODEXP_SIZE (MAX_EXP_SIZE + MAX_MODULUS_SIZE) + * All data elements of the RSA key are in big-endian format + * Modulus-Exponent form of key + * + */ +# define MAX_EXP_SIZE 256 +# define MAX_MODULUS_SIZE 256 +# define MAX_MODEXP_SIZE (MAX_EXP_SIZE + MAX_MODULUS_SIZE) - #define MAX_OPERAND_SIZE MAX_EXP_SIZE +# define MAX_OPERAND_SIZE MAX_EXP_SIZE - typedef unsigned char ICA_KEY_RSA_MODEXPO_REC[MAX_MODEXP_SIZE]; +typedef unsigned char ICA_KEY_RSA_MODEXPO_REC[MAX_MODEXP_SIZE]; /* - * All data elements of the RSA key are in big-endian format - * Chinese Remainder Thereom(CRT) form of key - * Used only for Decrypt, the encrypt form is typically Modulus-Exponent - * - */ - #define MAX_BP_SIZE 136 - #define MAX_BQ_SIZE 128 - #define MAX_NP_SIZE 136 - #define MAX_NQ_SIZE 128 - #define MAX_QINV_SIZE 136 - #define MAX_RSACRT_SIZE (MAX_BP_SIZE+MAX_BQ_SIZE+MAX_NP_SIZE+MAX_NQ_SIZE+MAX_QINV_SIZE) - -#define RSA_GEN_OPERAND_MAX 256 /* bytes */ + * All data elements of the RSA key are in big-endian format + * Chinese Remainder Thereom(CRT) form of key + * Used only for Decrypt, the encrypt form is typically Modulus-Exponent + * + */ +# define MAX_BP_SIZE 136 +# define MAX_BQ_SIZE 128 +# define MAX_NP_SIZE 136 +# define MAX_NQ_SIZE 128 +# define MAX_QINV_SIZE 136 +# define MAX_RSACRT_SIZE (MAX_BP_SIZE+MAX_BQ_SIZE+MAX_NP_SIZE+MAX_NQ_SIZE+MAX_QINV_SIZE) + +# define RSA_GEN_OPERAND_MAX 256/* bytes */ typedef unsigned char ICA_KEY_RSA_CRT_REC[MAX_RSACRT_SIZE]; -/*------------------------------------------------* +/* -----------------------------------------------* | RSA key token types | *------------------------------------------------*/ -#define RSA_PUBLIC_MODULUS_EXPONENT 3 -#define RSA_PKCS_PRIVATE_CHINESE_REMAINDER 6 +# define RSA_PUBLIC_MODULUS_EXPONENT 3 +# define RSA_PKCS_PRIVATE_CHINESE_REMAINDER 6 -#define KEYTYPE_MODEXPO 1 -#define KEYTYPE_PKCSCRT 2 +# define KEYTYPE_MODEXPO 1 +# define KEYTYPE_PKCSCRT 2 - -/*------------------------------------------------* +/* -----------------------------------------------* | RSA Key Token format | *------------------------------------------------*/ -/* +/*- * NOTE: All the fields in the ICA_KEY_RSA_MODEXPO structure * (lengths, offsets, exponents, modulus, etc.) are * stored in big-endian format */ -typedef struct _ICA_KEY_RSA_MODEXPO -{ unsigned int keyType; /* RSA key type. */ - unsigned int keyLength; /* Total length of the token. */ - unsigned int modulusBitLength; /* Modulus n bit length. */ - /* -- Start of the data length.*/ - unsigned int nLength; /* Modulus n = p * q */ - unsigned int expLength; /* exponent (public or private)*/ - /* e = 1/d * mod(p-1)(q-1) */ - /* -- Start of the data offsets*/ - unsigned int nOffset; /* Modulus n . */ - unsigned int expOffset; /* exponent (public or private)*/ - unsigned char reserved[112]; /* reserved area */ - /* -- Start of the variable -- */ - /* -- length token data. -- */ +typedef struct _ICA_KEY_RSA_MODEXPO { + unsigned int keyType; /* RSA key type. */ + unsigned int keyLength; /* Total length of the token. */ + unsigned int modulusBitLength; /* Modulus n bit length. */ + /* -- Start of the data length. */ + unsigned int nLength; /* Modulus n = p * q */ + unsigned int expLength; /* exponent (public or private) */ + /* e = 1/d * mod(p-1)(q-1) */ + /* -- Start of the data offsets */ + unsigned int nOffset; /* Modulus n . */ + unsigned int expOffset; /* exponent (public or private) */ + unsigned char reserved[112]; /* reserved area */ + /* -- Start of the variable -- */ + /* -- length token data. -- */ ICA_KEY_RSA_MODEXPO_REC keyRecord; } ICA_KEY_RSA_MODEXPO; -#define SZ_HEADER_MODEXPO (sizeof(ICA_KEY_RSA_MODEXPO) - sizeof(ICA_KEY_RSA_MODEXPO_REC)) +# define SZ_HEADER_MODEXPO (sizeof(ICA_KEY_RSA_MODEXPO) - sizeof(ICA_KEY_RSA_MODEXPO_REC)) -/* +/*- * NOTE: All the fields in the ICA_KEY_RSA_CRT structure * (lengths, offsets, exponents, modulus, etc.) are * stored in big-endian format */ -typedef struct _ICA_KEY_RSA_CRT -{ unsigned int keyType; /* RSA key type. */ - unsigned int keyLength; /* Total length of the token. */ - unsigned int modulusBitLength; /* Modulus n bit length. */ - /* -- Start of the data length.*/ -#if _AIX - unsigned int nLength; /* Modulus n = p * q */ -#endif - unsigned int pLength; /* Prime number p . */ - unsigned int qLength; /* Prime number q . */ - unsigned int dpLength; /* dp = d * mod(p-1) . */ - unsigned int dqLength; /* dq = d * mod(q-1) . */ - unsigned int qInvLength; /* PKCS: qInv = Ap/q */ - /* -- Start of the data offsets*/ -#if _AIX - unsigned int nOffset; /* Modulus n . */ -#endif - unsigned int pOffset; /* Prime number p . */ - unsigned int qOffset; /* Prime number q . */ - unsigned int dpOffset; /* dp . */ - unsigned int dqOffset; /* dq . */ - unsigned int qInvOffset; /* qInv for PKCS */ -#if _AIX - unsigned char reserved[80]; /* reserved area */ -#else - unsigned char reserved[88]; /* reserved area */ -#endif - /* -- Start of the variable -- */ - /* -- length token data. -- */ +typedef struct _ICA_KEY_RSA_CRT { + unsigned int keyType; /* RSA key type. */ + unsigned int keyLength; /* Total length of the token. */ + unsigned int modulusBitLength; /* Modulus n bit length. */ + /* -- Start of the data length. */ +# if _AIX + unsigned int nLength; /* Modulus n = p * q */ +# endif + unsigned int pLength; /* Prime number p . */ + unsigned int qLength; /* Prime number q . */ + unsigned int dpLength; /* dp = d * mod(p-1) . */ + unsigned int dqLength; /* dq = d * mod(q-1) . */ + unsigned int qInvLength; /* PKCS: qInv = Ap/q */ + /* -- Start of the data offsets */ +# if _AIX + unsigned int nOffset; /* Modulus n . */ +# endif + unsigned int pOffset; /* Prime number p . */ + unsigned int qOffset; /* Prime number q . */ + unsigned int dpOffset; /* dp . */ + unsigned int dqOffset; /* dq . */ + unsigned int qInvOffset; /* qInv for PKCS */ +# if _AIX + unsigned char reserved[80]; /* reserved area */ +# else + unsigned char reserved[88]; /* reserved area */ +# endif + /* -- Start of the variable -- */ + /* -- length token data. -- */ ICA_KEY_RSA_CRT_REC keyRecord; } ICA_KEY_RSA_CRT; -#define SZ_HEADER_CRT (sizeof(ICA_KEY_RSA_CRT) - sizeof(ICA_KEY_RSA_CRT_REC)) +# define SZ_HEADER_CRT (sizeof(ICA_KEY_RSA_CRT) - sizeof(ICA_KEY_RSA_CRT_REC)) unsigned int -icaOpenAdapter( unsigned int adapterId, - ICA_ADAPTER_HANDLE *pAdapterHandle ); +icaOpenAdapter(unsigned int adapterId, ICA_ADAPTER_HANDLE * pAdapterHandle); -unsigned int -icaCloseAdapter( ICA_ADAPTER_HANDLE adapterHandle ); +unsigned int icaCloseAdapter(ICA_ADAPTER_HANDLE adapterHandle); unsigned int -icaRsaModExpo( ICA_ADAPTER_HANDLE hAdapterHandle, - unsigned int inputDataLength, - unsigned char *pInputData, - ICA_KEY_RSA_MODEXPO *pKeyModExpo, - unsigned int *pOutputDataLength, - unsigned char *pOutputData ); +icaRsaModExpo(ICA_ADAPTER_HANDLE hAdapterHandle, + unsigned int inputDataLength, + unsigned char *pInputData, + ICA_KEY_RSA_MODEXPO *pKeyModExpo, + unsigned int *pOutputDataLength, unsigned char *pOutputData); unsigned int -icaRsaCrt( ICA_ADAPTER_HANDLE hAdapterHandle, - unsigned int inputDataLength, - unsigned char *pInputData, - ICA_KEY_RSA_CRT *pKeyCrt, - unsigned int *pOutputDataLength, - unsigned char *pOutputData ); +icaRsaCrt(ICA_ADAPTER_HANDLE hAdapterHandle, + unsigned int inputDataLength, + unsigned char *pInputData, + ICA_KEY_RSA_CRT *pKeyCrt, + unsigned int *pOutputDataLength, unsigned char *pOutputData); unsigned int -icaRandomNumberGenerate( ICA_ADAPTER_HANDLE hAdapterHandle, - unsigned int outputDataLength, - unsigned char *pOutputData ); +icaRandomNumberGenerate(ICA_ADAPTER_HANDLE hAdapterHandle, + unsigned int outputDataLength, + unsigned char *pOutputData); -/* Specific macros and definitions to not have IFDEF;s all over the - main code */ +/* + * Specific macros and definitions to not have IFDEF;s all over the main code + */ -#if (_AIX) +# if (_AIX) static const char *IBMCA_LIBNAME = "/lib/libica.a(shr.o)"; -#elif (WIN32) +# elif (WIN32) static const char *IBMCA_LIBNAME = "cryptica"; -#else +# else static const char *IBMCA_LIBNAME = "ica"; -#endif +# endif -#if (WIN32) +# if (WIN32) /* - The ICA_KEY_RSA_MODEXPO & ICA_KEY_RSA_CRT lengths and - offsets must be in big-endian format. - -*/ -#define CORRECT_ENDIANNESS(b) ( \ + * The ICA_KEY_RSA_MODEXPO & ICA_KEY_RSA_CRT lengths and offsets must be in + * big-endian format. + * + */ +# define CORRECT_ENDIANNESS(b) ( \ (((unsigned long) (b) & 0x000000ff) << 24) | \ (((unsigned long) (b) & 0x0000ff00) << 8) | \ (((unsigned long) (b) & 0x00ff0000) >> 8) | \ (((unsigned long) (b) & 0xff000000) >> 24) \ ) -#define CRT_KEY_TYPE RSA_PKCS_PRIVATE_CHINESE_REMAINDER -#define ME_KEY_TYPE RSA_PUBLIC_MODULUS_EXPONENT -#else -#define CORRECT_ENDIANNESS(b) (b) -#define CRT_KEY_TYPE KEYTYPE_PKCSCRT -#define ME_KEY_TYPE KEYTYPE_MODEXPO -#endif - - - -#endif /* __ICA_OPENSSL_API_H__ */ +# define CRT_KEY_TYPE RSA_PKCS_PRIVATE_CHINESE_REMAINDER +# define ME_KEY_TYPE RSA_PUBLIC_MODULUS_EXPONENT +# else +# define CORRECT_ENDIANNESS(b) (b) +# define CRT_KEY_TYPE KEYTYPE_PKCSCRT +# define ME_KEY_TYPE KEYTYPE_MODEXPO +# endif + +#endif /* __ICA_OPENSSL_API_H__ */ diff --git a/openssl/demos/engines/rsaref/rsaref.c b/openssl/demos/engines/rsaref/rsaref.c index f97974fc4..498cc7098 100644 --- a/openssl/demos/engines/rsaref/rsaref.c +++ b/openssl/demos/engines/rsaref/rsaref.c @@ -1,6 +1,8 @@ -/* Demo of how to construct your own engine and using it. The basis of this - engine is RSAref, an old reference of the RSA algorithm which can still - be found a little here and there. */ +/* + * Demo of how to construct your own engine and using it. The basis of this + * engine is RSAref, an old reference of the RSA algorithm which can still be + * found a little here and there. + */ #include #include @@ -35,177 +37,172 @@ static int rsaref_destroy(ENGINE *e); static int rsaref_init(ENGINE *e); static int rsaref_finish(ENGINE *e); #if 0 -static int rsaref_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); +static int rsaref_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) ()); #endif /***************************************************************************** * Engine commands **/ static const ENGINE_CMD_DEFN rsaref_cmd_defns[] = { - {0, NULL, NULL, 0} - }; + {0, NULL, NULL, 0} +}; /***************************************************************************** * RSA functions **/ static int rsaref_private_decrypt(int len, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); + unsigned char *to, RSA *rsa, int padding); static int rsaref_private_encrypt(int len, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); + unsigned char *to, RSA *rsa, int padding); static int rsaref_public_encrypt(int len, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); + unsigned char *to, RSA *rsa, int padding); static int rsaref_public_decrypt(int len, const unsigned char *from, - unsigned char *to, RSA *rsa, int padding); -static int bnref_mod_exp(BIGNUM *r,const BIGNUM *a,const BIGNUM *p,const BIGNUM *m, - BN_CTX *ctx, BN_MONT_CTX *m_ctx); + unsigned char *to, RSA *rsa, int padding); +static int bnref_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); static int rsaref_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa); /***************************************************************************** * Our RSA method **/ -static RSA_METHOD rsaref_rsa = -{ - "RSAref PKCS#1 RSA", - rsaref_public_encrypt, - rsaref_public_decrypt, - rsaref_private_encrypt, - rsaref_private_decrypt, - rsaref_mod_exp, - bnref_mod_exp, - NULL, - NULL, - 0, - NULL, - NULL, - NULL +static RSA_METHOD rsaref_rsa = { + "RSAref PKCS#1 RSA", + rsaref_public_encrypt, + rsaref_public_decrypt, + rsaref_private_encrypt, + rsaref_private_decrypt, + rsaref_mod_exp, + bnref_mod_exp, + NULL, + NULL, + 0, + NULL, + NULL, + NULL }; /***************************************************************************** * Symetric cipher and digest function registrars **/ static int rsaref_ciphers(ENGINE *e, const EVP_CIPHER **cipher, - const int **nids, int nid); + const int **nids, int nid); static int rsaref_digests(ENGINE *e, const EVP_MD **digest, - const int **nids, int nid); + const int **nids, int nid); static int rsaref_cipher_nids[] = - { NID_des_cbc, NID_des_ede3_cbc, NID_desx_cbc, 0 }; -static int rsaref_digest_nids[] = - { NID_md2, NID_md5, 0 }; + { NID_des_cbc, NID_des_ede3_cbc, NID_desx_cbc, 0 }; +static int rsaref_digest_nids[] = { NID_md2, NID_md5, 0 }; /***************************************************************************** * DES functions **/ static int cipher_des_cbc_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc); + const unsigned char *iv, int enc); static int cipher_des_cbc_code(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl); + const unsigned char *in, unsigned int inl); static int cipher_des_cbc_clean(EVP_CIPHER_CTX *); -static int cipher_des_ede3_cbc_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc); +static int cipher_des_ede3_cbc_init(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc); static int cipher_des_ede3_cbc_code(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl); + const unsigned char *in, + unsigned int inl); static int cipher_des_ede3_cbc_clean(EVP_CIPHER_CTX *); static int cipher_desx_cbc_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc); + const unsigned char *iv, int enc); static int cipher_desx_cbc_code(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl); + const unsigned char *in, unsigned int inl); static int cipher_desx_cbc_clean(EVP_CIPHER_CTX *); /***************************************************************************** * Our DES ciphers **/ -static const EVP_CIPHER cipher_des_cbc = - { - NID_des_cbc, - 8, 8, 8, - 0 | EVP_CIPH_CBC_MODE, - cipher_des_cbc_init, - cipher_des_cbc_code, - cipher_des_cbc_clean, - sizeof(DES_CBC_CTX), - NULL, - NULL, - NULL, - NULL - }; - -static const EVP_CIPHER cipher_des_ede3_cbc = - { - NID_des_ede3_cbc, - 8, 24, 8, - 0 | EVP_CIPH_CBC_MODE, - cipher_des_ede3_cbc_init, - cipher_des_ede3_cbc_code, - cipher_des_ede3_cbc_clean, - sizeof(DES3_CBC_CTX), - NULL, - NULL, - NULL, - NULL - }; - -static const EVP_CIPHER cipher_desx_cbc = - { - NID_desx_cbc, - 8, 24, 8, - 0 | EVP_CIPH_CBC_MODE, - cipher_desx_cbc_init, - cipher_desx_cbc_code, - cipher_desx_cbc_clean, - sizeof(DESX_CBC_CTX), - NULL, - NULL, - NULL, - NULL - }; +static const EVP_CIPHER cipher_des_cbc = { + NID_des_cbc, + 8, 8, 8, + 0 | EVP_CIPH_CBC_MODE, + cipher_des_cbc_init, + cipher_des_cbc_code, + cipher_des_cbc_clean, + sizeof(DES_CBC_CTX), + NULL, + NULL, + NULL, + NULL +}; + +static const EVP_CIPHER cipher_des_ede3_cbc = { + NID_des_ede3_cbc, + 8, 24, 8, + 0 | EVP_CIPH_CBC_MODE, + cipher_des_ede3_cbc_init, + cipher_des_ede3_cbc_code, + cipher_des_ede3_cbc_clean, + sizeof(DES3_CBC_CTX), + NULL, + NULL, + NULL, + NULL +}; + +static const EVP_CIPHER cipher_desx_cbc = { + NID_desx_cbc, + 8, 24, 8, + 0 | EVP_CIPH_CBC_MODE, + cipher_desx_cbc_init, + cipher_desx_cbc_code, + cipher_desx_cbc_clean, + sizeof(DESX_CBC_CTX), + NULL, + NULL, + NULL, + NULL +}; /***************************************************************************** * MD functions **/ static int digest_md2_init(EVP_MD_CTX *ctx); -static int digest_md2_update(EVP_MD_CTX *ctx,const void *data, - unsigned long count); -static int digest_md2_final(EVP_MD_CTX *ctx,unsigned char *md); +static int digest_md2_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count); +static int digest_md2_final(EVP_MD_CTX *ctx, unsigned char *md); static int digest_md5_init(EVP_MD_CTX *ctx); -static int digest_md5_update(EVP_MD_CTX *ctx,const void *data, - unsigned long count); -static int digest_md5_final(EVP_MD_CTX *ctx,unsigned char *md); +static int digest_md5_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count); +static int digest_md5_final(EVP_MD_CTX *ctx, unsigned char *md); /***************************************************************************** * Our MD digests **/ -static const EVP_MD digest_md2 = - { - NID_md2, - NID_md2WithRSAEncryption, - 16, - 0, - digest_md2_init, - digest_md2_update, - digest_md2_final, - NULL, - NULL, - EVP_PKEY_RSA_method, - 16, - sizeof(MD2_CTX) - }; - -static const EVP_MD digest_md5 = - { - NID_md5, - NID_md5WithRSAEncryption, - 16, - 0, - digest_md5_init, - digest_md5_update, - digest_md5_final, - NULL, - NULL, - EVP_PKEY_RSA_method, - 64, - sizeof(MD5_CTX) - }; +static const EVP_MD digest_md2 = { + NID_md2, + NID_md2WithRSAEncryption, + 16, + 0, + digest_md2_init, + digest_md2_update, + digest_md2_final, + NULL, + NULL, + EVP_PKEY_RSA_method, + 16, + sizeof(MD2_CTX) +}; + +static const EVP_MD digest_md5 = { + NID_md5, + NID_md5WithRSAEncryption, + 16, + 0, + digest_md5_init, + digest_md5_update, + digest_md5_final, + NULL, + NULL, + EVP_PKEY_RSA_method, + 64, + sizeof(MD5_CTX) +}; /***************************************************************************** *** Function definitions *** @@ -216,337 +213,359 @@ static const EVP_MD digest_md5 = **/ static int bind_rsaref(ENGINE *e) - { - const RSA_METHOD *meth1; - if(!ENGINE_set_id(e, engine_rsaref_id) - || !ENGINE_set_name(e, engine_rsaref_name) - || !ENGINE_set_RSA(e, &rsaref_rsa) - || !ENGINE_set_ciphers(e, rsaref_ciphers) - || !ENGINE_set_digests(e, rsaref_digests) - || !ENGINE_set_destroy_function(e, rsaref_destroy) - || !ENGINE_set_init_function(e, rsaref_init) - || !ENGINE_set_finish_function(e, rsaref_finish) - /* || !ENGINE_set_ctrl_function(e, rsaref_ctrl) */ - /* || !ENGINE_set_cmd_defns(e, rsaref_cmd_defns) */) - return 0; - - /* Ensure the rsaref error handling is set up */ - ERR_load_RSAREF_strings(); - return 1; - } +{ + const RSA_METHOD *meth1; + if (!ENGINE_set_id(e, engine_rsaref_id) + || !ENGINE_set_name(e, engine_rsaref_name) + || !ENGINE_set_RSA(e, &rsaref_rsa) + || !ENGINE_set_ciphers(e, rsaref_ciphers) + || !ENGINE_set_digests(e, rsaref_digests) + || !ENGINE_set_destroy_function(e, rsaref_destroy) + || !ENGINE_set_init_function(e, rsaref_init) + || !ENGINE_set_finish_function(e, rsaref_finish) + /* || !ENGINE_set_ctrl_function(e, rsaref_ctrl) */ + /* + * || !ENGINE_set_cmd_defns(e, rsaref_cmd_defns) + */ ) + return 0; + + /* Ensure the rsaref error handling is set up */ + ERR_load_RSAREF_strings(); + return 1; +} #ifdef ENGINE_DYNAMIC_SUPPORT static int bind_helper(ENGINE *e, const char *id) - { - if(id && (strcmp(id, engine_rsaref_id) != 0)) - return 0; - if(!bind_rsaref(e)) - return 0; - return 1; - } +{ + if (id && (strcmp(id, engine_rsaref_id) != 0)) + return 0; + if (!bind_rsaref(e)) + return 0; + return 1; +} + IMPLEMENT_DYNAMIC_CHECK_FN() -IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) + IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) #else static ENGINE *engine_rsaref(void) - { - ENGINE *ret = ENGINE_new(); - if(!ret) - return NULL; - if(!bind_rsaref(ret)) - { - ENGINE_free(ret); - return NULL; - } - return ret; - } +{ + ENGINE *ret = ENGINE_new(); + if (!ret) + return NULL; + if (!bind_rsaref(ret)) { + ENGINE_free(ret); + return NULL; + } + return ret; +} void ENGINE_load_rsaref(void) - { - /* Copied from eng_[openssl|dyn].c */ - ENGINE *toadd = engine_rsaref(); - if(!toadd) return; - ENGINE_add(toadd); - ENGINE_free(toadd); - ERR_clear_error(); - } +{ + /* Copied from eng_[openssl|dyn].c */ + ENGINE *toadd = engine_rsaref(); + if (!toadd) + return; + ENGINE_add(toadd); + ENGINE_free(toadd); + ERR_clear_error(); +} #endif /* Initiator which is only present to make sure this engine looks available */ static int rsaref_init(ENGINE *e) - { - return 1; - } +{ + return 1; +} /* Finisher which is only present to make sure this engine looks available */ static int rsaref_finish(ENGINE *e) - { - return 1; - } +{ + return 1; +} /* Destructor (complements the "ENGINE_ncipher()" constructor) */ static int rsaref_destroy(ENGINE *e) - { - ERR_unload_RSAREF_strings(); - return 1; - } +{ + ERR_unload_RSAREF_strings(); + return 1; +} /***************************************************************************** * RSA functions **/ static int rsaref_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) - { - RSAREFerr(RSAREF_F_RSAREF_MOD_EXP,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return(0); - } +{ + RSAREFerr(RSAREF_F_RSAREF_MOD_EXP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); + return (0); +} static int bnref_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) - { - RSAREFerr(RSAREF_F_BNREF_MOD_EXP,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return(0); - } + const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) +{ + RSAREFerr(RSAREF_F_BNREF_MOD_EXP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); + return (0); +} /* unsigned char *to: [max] */ static int RSAref_bn2bin(BIGNUM *from, unsigned char *to, int max) - { - int i; - - i=BN_num_bytes(from); - if (i > max) - { - RSAREFerr(RSAREF_F_RSAREF_BN2BIN,RSAREF_R_LEN); - return(0); - } - - memset(to,0,(unsigned int)max); - if (!BN_bn2bin(from,&(to[max-i]))) - return(0); - return(1); - } +{ + int i; + + i = BN_num_bytes(from); + if (i > max) { + RSAREFerr(RSAREF_F_RSAREF_BN2BIN, RSAREF_R_LEN); + return (0); + } + + memset(to, 0, (unsigned int)max); + if (!BN_bn2bin(from, &(to[max - i]))) + return (0); + return (1); +} #ifdef undef /* unsigned char *from: [max] */ static BIGNUM *RSAref_bin2bn(unsigned char *from, BIGNUM *to, int max) - { - int i; - BIGNUM *ret; - - for (i=0; in=RSAref_bin2bn(from->m,NULL,RSAref_MAX_LEN); - to->e=RSAref_bin2bn(from->e,NULL,RSAref_MAX_LEN); - if ((to->n == NULL) || (to->e == NULL)) return(0); - return(1); - } +{ + int i; + BIGNUM *ret; + + for (i = 0; i < max; i++) + if (from[i]) + break; + + ret = BN_bin2bn(&(from[i]), max - i, to); + return (ret); +} + +static int RSAref_Public_ref2eay(RSArefPublicKey * from, RSA *to) +{ + to->n = RSAref_bin2bn(from->m, NULL, RSAref_MAX_LEN); + to->e = RSAref_bin2bn(from->e, NULL, RSAref_MAX_LEN); + if ((to->n == NULL) || (to->e == NULL)) + return (0); + return (1); +} #endif -static int RSAref_Public_eay2ref(RSA *from, R_RSA_PUBLIC_KEY *to) - { - to->bits=BN_num_bits(from->n); - if (!RSAref_bn2bin(from->n,to->modulus,MAX_RSA_MODULUS_LEN)) return(0); - if (!RSAref_bn2bin(from->e,to->exponent,MAX_RSA_MODULUS_LEN)) return(0); - return(1); - } +static int RSAref_Public_eay2ref(RSA *from, R_RSA_PUBLIC_KEY * to) +{ + to->bits = BN_num_bits(from->n); + if (!RSAref_bn2bin(from->n, to->modulus, MAX_RSA_MODULUS_LEN)) + return (0); + if (!RSAref_bn2bin(from->e, to->exponent, MAX_RSA_MODULUS_LEN)) + return (0); + return (1); +} #ifdef undef -static int RSAref_Private_ref2eay(RSArefPrivateKey *from, RSA *to) - { - if ((to->n=RSAref_bin2bn(from->m,NULL,RSAref_MAX_LEN)) == NULL) - return(0); - if ((to->e=RSAref_bin2bn(from->e,NULL,RSAref_MAX_LEN)) == NULL) - return(0); - if ((to->d=RSAref_bin2bn(from->d,NULL,RSAref_MAX_LEN)) == NULL) - return(0); - if ((to->p=RSAref_bin2bn(from->prime[0],NULL,RSAref_MAX_PLEN)) == NULL) - return(0); - if ((to->q=RSAref_bin2bn(from->prime[1],NULL,RSAref_MAX_PLEN)) == NULL) - return(0); - if ((to->dmp1=RSAref_bin2bn(from->pexp[0],NULL,RSAref_MAX_PLEN)) - == NULL) - return(0); - if ((to->dmq1=RSAref_bin2bn(from->pexp[1],NULL,RSAref_MAX_PLEN)) - == NULL) - return(0); - if ((to->iqmp=RSAref_bin2bn(from->coef,NULL,RSAref_MAX_PLEN)) == NULL) - return(0); - return(1); - } +static int RSAref_Private_ref2eay(RSArefPrivateKey * from, RSA *to) +{ + if ((to->n = RSAref_bin2bn(from->m, NULL, RSAref_MAX_LEN)) == NULL) + return (0); + if ((to->e = RSAref_bin2bn(from->e, NULL, RSAref_MAX_LEN)) == NULL) + return (0); + if ((to->d = RSAref_bin2bn(from->d, NULL, RSAref_MAX_LEN)) == NULL) + return (0); + if ((to->p = + RSAref_bin2bn(from->prime[0], NULL, RSAref_MAX_PLEN)) == NULL) + return (0); + if ((to->q = + RSAref_bin2bn(from->prime[1], NULL, RSAref_MAX_PLEN)) == NULL) + return (0); + if ((to->dmp1 = RSAref_bin2bn(from->pexp[0], NULL, RSAref_MAX_PLEN)) + == NULL) + return (0); + if ((to->dmq1 = RSAref_bin2bn(from->pexp[1], NULL, RSAref_MAX_PLEN)) + == NULL) + return (0); + if ((to->iqmp = RSAref_bin2bn(from->coef, NULL, RSAref_MAX_PLEN)) == NULL) + return (0); + return (1); +} #endif -static int RSAref_Private_eay2ref(RSA *from, R_RSA_PRIVATE_KEY *to) - { - to->bits=BN_num_bits(from->n); - if (!RSAref_bn2bin(from->n,to->modulus,MAX_RSA_MODULUS_LEN)) return(0); - if (!RSAref_bn2bin(from->e,to->publicExponent,MAX_RSA_MODULUS_LEN)) return(0); - if (!RSAref_bn2bin(from->d,to->exponent,MAX_RSA_MODULUS_LEN)) return(0); - if (!RSAref_bn2bin(from->p,to->prime[0],MAX_RSA_PRIME_LEN)) return(0); - if (!RSAref_bn2bin(from->q,to->prime[1],MAX_RSA_PRIME_LEN)) return(0); - if (!RSAref_bn2bin(from->dmp1,to->primeExponent[0],MAX_RSA_PRIME_LEN)) return(0); - if (!RSAref_bn2bin(from->dmq1,to->primeExponent[1],MAX_RSA_PRIME_LEN)) return(0); - if (!RSAref_bn2bin(from->iqmp,to->coefficient,MAX_RSA_PRIME_LEN)) return(0); - return(1); - } - -static int rsaref_private_decrypt(int len, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) - { - int i,outlen= -1; - R_RSA_PRIVATE_KEY RSAkey; - - if (!RSAref_Private_eay2ref(rsa,&RSAkey)) - goto err; - if ((i=RSAPrivateDecrypt(to,(unsigned int *)&outlen,(unsigned char *)from,len,&RSAkey)) != 0) - { - RSAREFerr(RSAREF_F_RSAREF_PRIVATE_DECRYPT,i); - outlen= -1; - } -err: - memset(&RSAkey,0,sizeof(RSAkey)); - return(outlen); - } - -static int rsaref_private_encrypt(int len, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) - { - int i,outlen= -1; - R_RSA_PRIVATE_KEY RSAkey; - - if (padding != RSA_PKCS1_PADDING) - { - RSAREFerr(RSAREF_F_RSAREF_PRIVATE_ENCRYPT, RSA_R_UNKNOWN_PADDING_TYPE); - goto err; - } - if (!RSAref_Private_eay2ref(rsa,&RSAkey)) - goto err; - if ((i=RSAPrivateEncrypt(to,(unsigned int *)&outlen,(unsigned char *)from,len,&RSAkey)) != 0) - { - RSAREFerr(RSAREF_F_RSAREF_PRIVATE_ENCRYPT,i); - outlen= -1; - } -err: - memset(&RSAkey,0,sizeof(RSAkey)); - return(outlen); - } - -static int rsaref_public_decrypt(int len, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) - { - int i,outlen= -1; - R_RSA_PUBLIC_KEY RSAkey; - - if (!RSAref_Public_eay2ref(rsa,&RSAkey)) - goto err; - if ((i=RSAPublicDecrypt(to,(unsigned int *)&outlen,(unsigned char *)from,len,&RSAkey)) != 0) - { - RSAREFerr(RSAREF_F_RSAREF_PUBLIC_DECRYPT,i); - outlen= -1; - } -err: - memset(&RSAkey,0,sizeof(RSAkey)); - return(outlen); - } - -static int rsaref_public_encrypt(int len, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) - { - int outlen= -1; - int i; - R_RSA_PUBLIC_KEY RSAkey; - R_RANDOM_STRUCT rnd; - unsigned char buf[16]; - - if (padding != RSA_PKCS1_PADDING && padding != RSA_SSLV23_PADDING) - { - RSAREFerr(RSAREF_F_RSAREF_PUBLIC_ENCRYPT, RSA_R_UNKNOWN_PADDING_TYPE); - goto err; - } - - R_RandomInit(&rnd); - R_GetRandomBytesNeeded((unsigned int *)&i,&rnd); - while (i > 0) - { - if (RAND_bytes(buf,16) <= 0) - goto err; - R_RandomUpdate(&rnd,buf,(unsigned int)((i>16)?16:i)); - i-=16; - } - - if (!RSAref_Public_eay2ref(rsa,&RSAkey)) - goto err; - if ((i=RSAPublicEncrypt(to,(unsigned int *)&outlen,(unsigned char *)from,len,&RSAkey,&rnd)) != 0) - { - RSAREFerr(RSAREF_F_RSAREF_PUBLIC_ENCRYPT,i); - outlen= -1; - goto err; - } -err: - memset(&RSAkey,0,sizeof(RSAkey)); - R_RandomFinal(&rnd); - memset(&rnd,0,sizeof(rnd)); - return(outlen); - } +static int RSAref_Private_eay2ref(RSA *from, R_RSA_PRIVATE_KEY * to) +{ + to->bits = BN_num_bits(from->n); + if (!RSAref_bn2bin(from->n, to->modulus, MAX_RSA_MODULUS_LEN)) + return (0); + if (!RSAref_bn2bin(from->e, to->publicExponent, MAX_RSA_MODULUS_LEN)) + return (0); + if (!RSAref_bn2bin(from->d, to->exponent, MAX_RSA_MODULUS_LEN)) + return (0); + if (!RSAref_bn2bin(from->p, to->prime[0], MAX_RSA_PRIME_LEN)) + return (0); + if (!RSAref_bn2bin(from->q, to->prime[1], MAX_RSA_PRIME_LEN)) + return (0); + if (!RSAref_bn2bin(from->dmp1, to->primeExponent[0], MAX_RSA_PRIME_LEN)) + return (0); + if (!RSAref_bn2bin(from->dmq1, to->primeExponent[1], MAX_RSA_PRIME_LEN)) + return (0); + if (!RSAref_bn2bin(from->iqmp, to->coefficient, MAX_RSA_PRIME_LEN)) + return (0); + return (1); +} + +static int rsaref_private_decrypt(int len, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding) +{ + int i, outlen = -1; + R_RSA_PRIVATE_KEY RSAkey; + + if (!RSAref_Private_eay2ref(rsa, &RSAkey)) + goto err; + if ((i = + RSAPrivateDecrypt(to, (unsigned int *)&outlen, (unsigned char *)from, + len, &RSAkey)) != 0) { + RSAREFerr(RSAREF_F_RSAREF_PRIVATE_DECRYPT, i); + outlen = -1; + } + err: + memset(&RSAkey, 0, sizeof(RSAkey)); + return (outlen); +} + +static int rsaref_private_encrypt(int len, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding) +{ + int i, outlen = -1; + R_RSA_PRIVATE_KEY RSAkey; + + if (padding != RSA_PKCS1_PADDING) { + RSAREFerr(RSAREF_F_RSAREF_PRIVATE_ENCRYPT, + RSA_R_UNKNOWN_PADDING_TYPE); + goto err; + } + if (!RSAref_Private_eay2ref(rsa, &RSAkey)) + goto err; + if ((i = + RSAPrivateEncrypt(to, (unsigned int *)&outlen, (unsigned char *)from, + len, &RSAkey)) != 0) { + RSAREFerr(RSAREF_F_RSAREF_PRIVATE_ENCRYPT, i); + outlen = -1; + } + err: + memset(&RSAkey, 0, sizeof(RSAkey)); + return (outlen); +} + +static int rsaref_public_decrypt(int len, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding) +{ + int i, outlen = -1; + R_RSA_PUBLIC_KEY RSAkey; + + if (!RSAref_Public_eay2ref(rsa, &RSAkey)) + goto err; + if ((i = + RSAPublicDecrypt(to, (unsigned int *)&outlen, (unsigned char *)from, + len, &RSAkey)) != 0) { + RSAREFerr(RSAREF_F_RSAREF_PUBLIC_DECRYPT, i); + outlen = -1; + } + err: + memset(&RSAkey, 0, sizeof(RSAkey)); + return (outlen); +} + +static int rsaref_public_encrypt(int len, const unsigned char *from, + unsigned char *to, RSA *rsa, int padding) +{ + int outlen = -1; + int i; + R_RSA_PUBLIC_KEY RSAkey; + R_RANDOM_STRUCT rnd; + unsigned char buf[16]; + + if (padding != RSA_PKCS1_PADDING && padding != RSA_SSLV23_PADDING) { + RSAREFerr(RSAREF_F_RSAREF_PUBLIC_ENCRYPT, RSA_R_UNKNOWN_PADDING_TYPE); + goto err; + } + + R_RandomInit(&rnd); + R_GetRandomBytesNeeded((unsigned int *)&i, &rnd); + while (i > 0) { + if (RAND_bytes(buf, 16) <= 0) + goto err; + R_RandomUpdate(&rnd, buf, (unsigned int)((i > 16) ? 16 : i)); + i -= 16; + } + + if (!RSAref_Public_eay2ref(rsa, &RSAkey)) + goto err; + if ((i = + RSAPublicEncrypt(to, (unsigned int *)&outlen, (unsigned char *)from, + len, &RSAkey, &rnd)) != 0) { + RSAREFerr(RSAREF_F_RSAREF_PUBLIC_ENCRYPT, i); + outlen = -1; + goto err; + } + err: + memset(&RSAkey, 0, sizeof(RSAkey)); + R_RandomFinal(&rnd); + memset(&rnd, 0, sizeof(rnd)); + return (outlen); +} /***************************************************************************** * Symetric cipher and digest function registrars **/ static int rsaref_ciphers(ENGINE *e, const EVP_CIPHER **cipher, - const int **nids, int nid) - { - int ok = 1; - if(!cipher) - { - /* We are returning a list of supported nids */ - *nids = rsaref_cipher_nids; - return (sizeof(rsaref_cipher_nids)-1)/sizeof(rsaref_cipher_nids[0]); - } - /* We are being asked for a specific cipher */ - switch (nid) - { - case NID_des_cbc: - *cipher = &cipher_des_cbc; break; - case NID_des_ede3_cbc: - *cipher = &cipher_des_ede3_cbc; break; - case NID_desx_cbc: - *cipher = &cipher_desx_cbc; break; - default: - ok = 0; - *cipher = NULL; - break; - } - return ok; - } + const int **nids, int nid) +{ + int ok = 1; + if (!cipher) { + /* We are returning a list of supported nids */ + *nids = rsaref_cipher_nids; + return (sizeof(rsaref_cipher_nids) - + 1) / sizeof(rsaref_cipher_nids[0]); + } + /* We are being asked for a specific cipher */ + switch (nid) { + case NID_des_cbc: + *cipher = &cipher_des_cbc; + break; + case NID_des_ede3_cbc: + *cipher = &cipher_des_ede3_cbc; + break; + case NID_desx_cbc: + *cipher = &cipher_desx_cbc; + break; + default: + ok = 0; + *cipher = NULL; + break; + } + return ok; +} + static int rsaref_digests(ENGINE *e, const EVP_MD **digest, - const int **nids, int nid) - { - int ok = 1; - if(!digest) - { - /* We are returning a list of supported nids */ - *nids = rsaref_digest_nids; - return (sizeof(rsaref_digest_nids)-1)/sizeof(rsaref_digest_nids[0]); - } - /* We are being asked for a specific digest */ - switch (nid) - { - case NID_md2: - *digest = &digest_md2; break; - case NID_md5: - *digest = &digest_md5; break; - default: - ok = 0; - *digest = NULL; - break; - } - return ok; - } + const int **nids, int nid) +{ + int ok = 1; + if (!digest) { + /* We are returning a list of supported nids */ + *nids = rsaref_digest_nids; + return (sizeof(rsaref_digest_nids) - + 1) / sizeof(rsaref_digest_nids[0]); + } + /* We are being asked for a specific digest */ + switch (nid) { + case NID_md2: + *digest = &digest_md2; + break; + case NID_md5: + *digest = &digest_md5; + break; + default: + ok = 0; + *digest = NULL; + break; + } + return ok; +} /***************************************************************************** * DES functions @@ -554,94 +573,99 @@ static int rsaref_digests(ENGINE *e, const EVP_MD **digest, #undef data #define data(ctx) ((DES_CBC_CTX *)(ctx)->cipher_data) static int cipher_des_cbc_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) - { - DES_CBCInit(data(ctx), (unsigned char *)key, (unsigned char *)iv, enc); - return 1; - } + const unsigned char *iv, int enc) +{ + DES_CBCInit(data(ctx), (unsigned char *)key, (unsigned char *)iv, enc); + return 1; +} + static int cipher_des_cbc_code(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl) - { - int ret = DES_CBCUpdate(data(ctx), out, (unsigned char *)in, inl); - switch (ret) - { - case RE_LEN: - RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE,RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED); - break; - case 0: - break; - default: - RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE,RSAREF_R_UNKNOWN_FAULT); - } - return !ret; - } + const unsigned char *in, unsigned int inl) +{ + int ret = DES_CBCUpdate(data(ctx), out, (unsigned char *)in, inl); + switch (ret) { + case RE_LEN: + RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE, + RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED); + break; + case 0: + break; + default: + RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE, RSAREF_R_UNKNOWN_FAULT); + } + return !ret; +} + static int cipher_des_cbc_clean(EVP_CIPHER_CTX *ctx) - { - memset(data(ctx), 0, ctx->cipher->ctx_size); - return 1; - } +{ + memset(data(ctx), 0, ctx->cipher->ctx_size); + return 1; +} #undef data #define data(ctx) ((DES3_CBC_CTX *)(ctx)->cipher_data) -static int cipher_des_ede3_cbc_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) - { - DES3_CBCInit(data(ctx), (unsigned char *)key, (unsigned char *)iv, - enc); - return 1; - } +static int cipher_des_ede3_cbc_init(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc) +{ + DES3_CBCInit(data(ctx), (unsigned char *)key, (unsigned char *)iv, enc); + return 1; +} + static int cipher_des_ede3_cbc_code(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl) - { - int ret = DES3_CBCUpdate(data(ctx), out, (unsigned char *)in, inl); - switch (ret) - { - case RE_LEN: - RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE,RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED); - break; - case 0: - break; - default: - RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE,RSAREF_R_UNKNOWN_FAULT); - } - return !ret; - } + const unsigned char *in, unsigned int inl) +{ + int ret = DES3_CBCUpdate(data(ctx), out, (unsigned char *)in, inl); + switch (ret) { + case RE_LEN: + RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE, + RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED); + break; + case 0: + break; + default: + RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE, RSAREF_R_UNKNOWN_FAULT); + } + return !ret; +} + static int cipher_des_ede3_cbc_clean(EVP_CIPHER_CTX *ctx) - { - memset(data(ctx), 0, ctx->cipher->ctx_size); - return 1; - } +{ + memset(data(ctx), 0, ctx->cipher->ctx_size); + return 1; +} #undef data #define data(ctx) ((DESX_CBC_CTX *)(ctx)->cipher_data) static int cipher_desx_cbc_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) - { - DESX_CBCInit(data(ctx), (unsigned char *)key, (unsigned char *)iv, - enc); - return 1; - } + const unsigned char *iv, int enc) +{ + DESX_CBCInit(data(ctx), (unsigned char *)key, (unsigned char *)iv, enc); + return 1; +} + static int cipher_desx_cbc_code(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl) - { - int ret = DESX_CBCUpdate(data(ctx), out, (unsigned char *)in, inl); - switch (ret) - { - case RE_LEN: - RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE,RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED); - break; - case 0: - break; - default: - RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE,RSAREF_R_UNKNOWN_FAULT); - } - return !ret; - } + const unsigned char *in, unsigned int inl) +{ + int ret = DESX_CBCUpdate(data(ctx), out, (unsigned char *)in, inl); + switch (ret) { + case RE_LEN: + RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE, + RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED); + break; + case 0: + break; + default: + RSAREFerr(RSAREF_F_CIPHER_DES_CBC_CODE, RSAREF_R_UNKNOWN_FAULT); + } + return !ret; +} + static int cipher_desx_cbc_clean(EVP_CIPHER_CTX *ctx) - { - memset(data(ctx), 0, ctx->cipher->ctx_size); - return 1; - } +{ + memset(data(ctx), 0, ctx->cipher->ctx_size); + return 1; +} /***************************************************************************** * MD functions @@ -649,37 +673,41 @@ static int cipher_desx_cbc_clean(EVP_CIPHER_CTX *ctx) #undef data #define data(ctx) ((MD2_CTX *)(ctx)->md_data) static int digest_md2_init(EVP_MD_CTX *ctx) - { - MD2Init(data(ctx)); - return 1; - } -static int digest_md2_update(EVP_MD_CTX *ctx,const void *data, - unsigned long count) - { - MD2Update(data(ctx), (unsigned char *)data, (unsigned int)count); - return 1; - } -static int digest_md2_final(EVP_MD_CTX *ctx,unsigned char *md) - { - MD2Final(md, data(ctx)); - return 1; - } +{ + MD2Init(data(ctx)); + return 1; +} + +static int digest_md2_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count) +{ + MD2Update(data(ctx), (unsigned char *)data, (unsigned int)count); + return 1; +} + +static int digest_md2_final(EVP_MD_CTX *ctx, unsigned char *md) +{ + MD2Final(md, data(ctx)); + return 1; +} #undef data #define data(ctx) ((MD5_CTX *)(ctx)->md_data) static int digest_md5_init(EVP_MD_CTX *ctx) - { - MD5Init(data(ctx)); - return 1; - } -static int digest_md5_update(EVP_MD_CTX *ctx,const void *data, - unsigned long count) - { - MD5Update(data(ctx), (unsigned char *)data, (unsigned int)count); - return 1; - } -static int digest_md5_final(EVP_MD_CTX *ctx,unsigned char *md) - { - MD5Final(md, data(ctx)); - return 1; - } +{ + MD5Init(data(ctx)); + return 1; +} + +static int digest_md5_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count) +{ + MD5Update(data(ctx), (unsigned char *)data, (unsigned int)count); + return 1; +} + +static int digest_md5_final(EVP_MD_CTX *ctx, unsigned char *md) +{ + MD5Final(md, data(ctx)); + return 1; +} diff --git a/openssl/demos/engines/rsaref/rsaref_err.c b/openssl/demos/engines/rsaref/rsaref_err.c index ceaf05706..55df08c25 100644 --- a/openssl/demos/engines/rsaref/rsaref_err.c +++ b/openssl/demos/engines/rsaref/rsaref_err.c @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,7 +53,8 @@ * */ -/* NOTE: this file was auto generated by the mkerr.pl script: any changes +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes * made to it will be overwritten when the script next updates this file, * only reason strings will be preserved. */ @@ -64,98 +65,94 @@ /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -static ERR_STRING_DATA RSAREF_str_functs[]= - { -{ERR_PACK(0,RSAREF_F_BNREF_MOD_EXP,0), "BNREF_MOD_EXP"}, -{ERR_PACK(0,RSAREF_F_CIPHER_DES_CBC_CODE,0), "CIPHER_DES_CBC_CODE"}, -{ERR_PACK(0,RSAREF_F_RSAREF_BN2BIN,0), "RSAREF_BN2BIN"}, -{ERR_PACK(0,RSAREF_F_RSAREF_MOD_EXP,0), "RSAREF_MOD_EXP"}, -{ERR_PACK(0,RSAREF_F_RSAREF_PRIVATE_DECRYPT,0), "RSAREF_PRIVATE_DECRYPT"}, -{ERR_PACK(0,RSAREF_F_RSAREF_PRIVATE_ENCRYPT,0), "RSAREF_PRIVATE_ENCRYPT"}, -{ERR_PACK(0,RSAREF_F_RSAREF_PUBLIC_DECRYPT,0), "RSAREF_PUBLIC_DECRYPT"}, -{ERR_PACK(0,RSAREF_F_RSAREF_PUBLIC_ENCRYPT,0), "RSAREF_PUBLIC_ENCRYPT"}, -{ERR_PACK(0,RSAREF_F_RSA_BN2BIN,0), "RSA_BN2BIN"}, -{ERR_PACK(0,RSAREF_F_RSA_PRIVATE_DECRYPT,0), "RSA_PRIVATE_DECRYPT"}, -{ERR_PACK(0,RSAREF_F_RSA_PRIVATE_ENCRYPT,0), "RSA_PRIVATE_ENCRYPT"}, -{ERR_PACK(0,RSAREF_F_RSA_PUBLIC_DECRYPT,0), "RSA_PUBLIC_DECRYPT"}, -{ERR_PACK(0,RSAREF_F_RSA_PUBLIC_ENCRYPT,0), "RSA_PUBLIC_ENCRYPT"}, -{0,NULL} - }; +static ERR_STRING_DATA RSAREF_str_functs[] = { + {ERR_PACK(0, RSAREF_F_BNREF_MOD_EXP, 0), "BNREF_MOD_EXP"}, + {ERR_PACK(0, RSAREF_F_CIPHER_DES_CBC_CODE, 0), "CIPHER_DES_CBC_CODE"}, + {ERR_PACK(0, RSAREF_F_RSAREF_BN2BIN, 0), "RSAREF_BN2BIN"}, + {ERR_PACK(0, RSAREF_F_RSAREF_MOD_EXP, 0), "RSAREF_MOD_EXP"}, + {ERR_PACK(0, RSAREF_F_RSAREF_PRIVATE_DECRYPT, 0), + "RSAREF_PRIVATE_DECRYPT"}, + {ERR_PACK(0, RSAREF_F_RSAREF_PRIVATE_ENCRYPT, 0), + "RSAREF_PRIVATE_ENCRYPT"}, + {ERR_PACK(0, RSAREF_F_RSAREF_PUBLIC_DECRYPT, 0), "RSAREF_PUBLIC_DECRYPT"}, + {ERR_PACK(0, RSAREF_F_RSAREF_PUBLIC_ENCRYPT, 0), "RSAREF_PUBLIC_ENCRYPT"}, + {ERR_PACK(0, RSAREF_F_RSA_BN2BIN, 0), "RSA_BN2BIN"}, + {ERR_PACK(0, RSAREF_F_RSA_PRIVATE_DECRYPT, 0), "RSA_PRIVATE_DECRYPT"}, + {ERR_PACK(0, RSAREF_F_RSA_PRIVATE_ENCRYPT, 0), "RSA_PRIVATE_ENCRYPT"}, + {ERR_PACK(0, RSAREF_F_RSA_PUBLIC_DECRYPT, 0), "RSA_PUBLIC_DECRYPT"}, + {ERR_PACK(0, RSAREF_F_RSA_PUBLIC_ENCRYPT, 0), "RSA_PUBLIC_ENCRYPT"}, + {0, NULL} +}; -static ERR_STRING_DATA RSAREF_str_reasons[]= - { -{RSAREF_R_CONTENT_ENCODING ,"content encoding"}, -{RSAREF_R_DATA ,"data"}, -{RSAREF_R_DIGEST_ALGORITHM ,"digest algorithm"}, -{RSAREF_R_ENCODING ,"encoding"}, -{RSAREF_R_ENCRYPTION_ALGORITHM ,"encryption algorithm"}, -{RSAREF_R_KEY ,"key"}, -{RSAREF_R_KEY_ENCODING ,"key encoding"}, -{RSAREF_R_LEN ,"len"}, -{RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED ,"length not block aligned"}, -{RSAREF_R_MODULUS_LEN ,"modulus len"}, -{RSAREF_R_NEED_RANDOM ,"need random"}, -{RSAREF_R_PRIVATE_KEY ,"private key"}, -{RSAREF_R_PUBLIC_KEY ,"public key"}, -{RSAREF_R_SIGNATURE ,"signature"}, -{RSAREF_R_SIGNATURE_ENCODING ,"signature encoding"}, -{RSAREF_R_UNKNOWN_FAULT ,"unknown fault"}, -{0,NULL} - }; +static ERR_STRING_DATA RSAREF_str_reasons[] = { + {RSAREF_R_CONTENT_ENCODING, "content encoding"}, + {RSAREF_R_DATA, "data"}, + {RSAREF_R_DIGEST_ALGORITHM, "digest algorithm"}, + {RSAREF_R_ENCODING, "encoding"}, + {RSAREF_R_ENCRYPTION_ALGORITHM, "encryption algorithm"}, + {RSAREF_R_KEY, "key"}, + {RSAREF_R_KEY_ENCODING, "key encoding"}, + {RSAREF_R_LEN, "len"}, + {RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED, "length not block aligned"}, + {RSAREF_R_MODULUS_LEN, "modulus len"}, + {RSAREF_R_NEED_RANDOM, "need random"}, + {RSAREF_R_PRIVATE_KEY, "private key"}, + {RSAREF_R_PUBLIC_KEY, "public key"}, + {RSAREF_R_SIGNATURE, "signature"}, + {RSAREF_R_SIGNATURE_ENCODING, "signature encoding"}, + {RSAREF_R_UNKNOWN_FAULT, "unknown fault"}, + {0, NULL} +}; #endif #ifdef RSAREF_LIB_NAME -static ERR_STRING_DATA RSAREF_lib_name[]= - { -{0 ,RSAREF_LIB_NAME}, -{0,NULL} - }; +static ERR_STRING_DATA RSAREF_lib_name[] = { + {0, RSAREF_LIB_NAME}, + {0, NULL} +}; #endif - -static int RSAREF_lib_error_code=0; -static int RSAREF_error_init=1; +static int RSAREF_lib_error_code = 0; +static int RSAREF_error_init = 1; static void ERR_load_RSAREF_strings(void) - { - if (RSAREF_lib_error_code == 0) - RSAREF_lib_error_code=ERR_get_next_error_library(); +{ + if (RSAREF_lib_error_code == 0) + RSAREF_lib_error_code = ERR_get_next_error_library(); - if (RSAREF_error_init) - { - RSAREF_error_init=0; + if (RSAREF_error_init) { + RSAREF_error_init = 0; #ifndef OPENSSL_NO_ERR - ERR_load_strings(RSAREF_lib_error_code,RSAREF_str_functs); - ERR_load_strings(RSAREF_lib_error_code,RSAREF_str_reasons); + ERR_load_strings(RSAREF_lib_error_code, RSAREF_str_functs); + ERR_load_strings(RSAREF_lib_error_code, RSAREF_str_reasons); #endif #ifdef RSAREF_LIB_NAME - RSAREF_lib_name->error = ERR_PACK(RSAREF_lib_error_code,0,0); - ERR_load_strings(0,RSAREF_lib_name); + RSAREF_lib_name->error = ERR_PACK(RSAREF_lib_error_code, 0, 0); + ERR_load_strings(0, RSAREF_lib_name); #endif - } - } + } +} static void ERR_unload_RSAREF_strings(void) - { - if (RSAREF_error_init == 0) - { +{ + if (RSAREF_error_init == 0) { #ifndef OPENSSL_NO_ERR - ERR_unload_strings(RSAREF_lib_error_code,RSAREF_str_functs); - ERR_unload_strings(RSAREF_lib_error_code,RSAREF_str_reasons); + ERR_unload_strings(RSAREF_lib_error_code, RSAREF_str_functs); + ERR_unload_strings(RSAREF_lib_error_code, RSAREF_str_reasons); #endif #ifdef RSAREF_LIB_NAME - ERR_unload_strings(0,RSAREF_lib_name); + ERR_unload_strings(0, RSAREF_lib_name); #endif - RSAREF_error_init=1; - } - } + RSAREF_error_init = 1; + } +} static void ERR_RSAREF_error(int function, int reason, char *file, int line) - { - if (RSAREF_lib_error_code == 0) - RSAREF_lib_error_code=ERR_get_next_error_library(); - ERR_PUT_error(RSAREF_lib_error_code,function,reason,file,line); - } +{ + if (RSAREF_lib_error_code == 0) + RSAREF_lib_error_code = ERR_get_next_error_library(); + ERR_PUT_error(RSAREF_lib_error_code, function, reason, file, line); +} diff --git a/openssl/demos/engines/rsaref/rsaref_err.h b/openssl/demos/engines/rsaref/rsaref_err.h index 19759709b..4356815c4 100644 --- a/openssl/demos/engines/rsaref/rsaref_err.h +++ b/openssl/demos/engines/rsaref/rsaref_err.h @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -54,54 +54,55 @@ */ #ifndef HEADER_RSAREF_ERR_H -#define HEADER_RSAREF_ERR_H +# define HEADER_RSAREF_ERR_H #ifdef __cplusplus extern "C" { #endif /* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes +/* + * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ static void ERR_load_RSAREF_strings(void); static void ERR_unload_RSAREF_strings(void); static void ERR_RSAREF_error(int function, int reason, char *file, int line); -#define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),__FILE__,__LINE__) +# define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),__FILE__,__LINE__) /* Error codes for the RSAREF functions. */ /* Function codes. */ -#define RSAREF_F_BNREF_MOD_EXP 100 -#define RSAREF_F_CIPHER_DES_CBC_CODE 112 -#define RSAREF_F_RSAREF_BN2BIN 101 -#define RSAREF_F_RSAREF_MOD_EXP 102 -#define RSAREF_F_RSAREF_PRIVATE_DECRYPT 103 -#define RSAREF_F_RSAREF_PRIVATE_ENCRYPT 104 -#define RSAREF_F_RSAREF_PUBLIC_DECRYPT 105 -#define RSAREF_F_RSAREF_PUBLIC_ENCRYPT 106 -#define RSAREF_F_RSA_BN2BIN 107 -#define RSAREF_F_RSA_PRIVATE_DECRYPT 108 -#define RSAREF_F_RSA_PRIVATE_ENCRYPT 109 -#define RSAREF_F_RSA_PUBLIC_DECRYPT 110 -#define RSAREF_F_RSA_PUBLIC_ENCRYPT 111 +# define RSAREF_F_BNREF_MOD_EXP 100 +# define RSAREF_F_CIPHER_DES_CBC_CODE 112 +# define RSAREF_F_RSAREF_BN2BIN 101 +# define RSAREF_F_RSAREF_MOD_EXP 102 +# define RSAREF_F_RSAREF_PRIVATE_DECRYPT 103 +# define RSAREF_F_RSAREF_PRIVATE_ENCRYPT 104 +# define RSAREF_F_RSAREF_PUBLIC_DECRYPT 105 +# define RSAREF_F_RSAREF_PUBLIC_ENCRYPT 106 +# define RSAREF_F_RSA_BN2BIN 107 +# define RSAREF_F_RSA_PRIVATE_DECRYPT 108 +# define RSAREF_F_RSA_PRIVATE_ENCRYPT 109 +# define RSAREF_F_RSA_PUBLIC_DECRYPT 110 +# define RSAREF_F_RSA_PUBLIC_ENCRYPT 111 /* Reason codes. */ -#define RSAREF_R_CONTENT_ENCODING 100 -#define RSAREF_R_DATA 101 -#define RSAREF_R_DIGEST_ALGORITHM 102 -#define RSAREF_R_ENCODING 103 -#define RSAREF_R_ENCRYPTION_ALGORITHM 104 -#define RSAREF_R_KEY 105 -#define RSAREF_R_KEY_ENCODING 106 -#define RSAREF_R_LEN 107 -#define RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED 114 -#define RSAREF_R_MODULUS_LEN 108 -#define RSAREF_R_NEED_RANDOM 109 -#define RSAREF_R_PRIVATE_KEY 110 -#define RSAREF_R_PUBLIC_KEY 111 -#define RSAREF_R_SIGNATURE 112 -#define RSAREF_R_SIGNATURE_ENCODING 113 -#define RSAREF_R_UNKNOWN_FAULT 115 +# define RSAREF_R_CONTENT_ENCODING 100 +# define RSAREF_R_DATA 101 +# define RSAREF_R_DIGEST_ALGORITHM 102 +# define RSAREF_R_ENCODING 103 +# define RSAREF_R_ENCRYPTION_ALGORITHM 104 +# define RSAREF_R_KEY 105 +# define RSAREF_R_KEY_ENCODING 106 +# define RSAREF_R_LEN 107 +# define RSAREF_R_LENGTH_NOT_BLOCK_ALIGNED 114 +# define RSAREF_R_MODULUS_LEN 108 +# define RSAREF_R_NEED_RANDOM 109 +# define RSAREF_R_PRIVATE_KEY 110 +# define RSAREF_R_PUBLIC_KEY 111 +# define RSAREF_R_SIGNATURE 112 +# define RSAREF_R_SIGNATURE_ENCODING 113 +# define RSAREF_R_UNKNOWN_FAULT 115 #ifdef __cplusplus } diff --git a/openssl/demos/engines/zencod/hw_zencod.c b/openssl/demos/engines/zencod/hw_zencod.c index 4234b93cb..0c0f524d4 100644 --- a/openssl/demos/engines/zencod/hw_zencod.c +++ b/openssl/demos/engines/zencod/hw_zencod.c @@ -1,12 +1,10 @@ /* crypto/engine/hw_zencod.c */ - /* Written by Fred Donnat (frederic.donnat@zencod.com) for "zencod" - * engine integration in order to redirect crypto computing on a crypto - * hardware accelerator zenssl32 ;-) - * - * Date : 25 jun 2002 - * Revision : 17 Ju7 2002 - * Version : zencod_engine-0.9.7 - */ + /* + * Written by Fred Donnat (frederic.donnat@zencod.com) for "zencod" * engine + * integration in order to redirect crypto computing on a crypto * hardware + * accelerator zenssl32 ;-) * * Date : 25 jun 2002 * Revision : 17 Ju7 2002 + * * Version : zencod_engine-0.9.7 + */ /* ==================================================================== * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. @@ -62,7 +60,6 @@ * */ - /* ENGINE general include */ #include #include @@ -70,1670 +67,1743 @@ #include #ifndef OPENSSL_NO_HW -#ifndef OPENSSL_NO_HW_ZENCOD - -#ifdef FLAT_INC -# include "hw_zencod.h" -#else -# include "vendor_defns/hw_zencod.h" -#endif +# ifndef OPENSSL_NO_HW_ZENCOD -#define ZENCOD_LIB_NAME "zencod engine" -#include "hw_zencod_err.c" +# ifdef FLAT_INC +# include "hw_zencod.h" +# else +# include "vendor_defns/hw_zencod.h" +# endif -#define FAIL_TO_SOFTWARE -15 +# define ZENCOD_LIB_NAME "zencod engine" +# include "hw_zencod_err.c" -#define ZEN_LIBRARY "zenbridge" +# define FAIL_TO_SOFTWARE -15 -#if 0 -# define PERROR(s) perror(s) -# define CHEESE() fputs("## [ZenEngine] ## " __FUNCTION__ "\n", stderr) -#else -# define PERROR(s) -# define CHEESE() -#endif +# define ZEN_LIBRARY "zenbridge" +# if 0 +# define PERROR(s) perror(s) +# define CHEESE() fputs("## [ZenEngine] ## " __FUNCTION__ "\n", stderr) +# else +# define PERROR(s) +# define CHEESE() +# endif /* Sorry ;) */ -#ifndef WIN32 -static inline void esrever ( unsigned char *d, int l ) +# ifndef WIN32 +static inline void esrever(unsigned char *d, int l) { - for(;--l>0;--l,d++){*d^=*(d+l);*(d+l)^=*d;*d^=*(d+l);} + for (; --l > 0; --l, d++) { + *d ^= *(d + l); + *(d + l) ^= *d; + *d ^= *(d + l); + } } -static inline void ypcmem ( unsigned char *d, const unsigned char *s, int l ) +static inline void ypcmem(unsigned char *d, const unsigned char *s, int l) { - for(d+=l;l--;)*--d=*s++; + for (d += l; l--;) + *--d = *s++; } -#else -static __inline void esrever ( unsigned char *d, int l ) +# else +static __inline void esrever(unsigned char *d, int l) { - for(;--l>0;--l,d++){*d^=*(d+l);*(d+l)^=*d;*d^=*(d+l);} + for (; --l > 0; --l, d++) { + *d ^= *(d + l); + *(d + l) ^= *d; + *d ^= *(d + l); + } } -static __inline void ypcmem ( unsigned char *d, const unsigned char *s, int l ) +static __inline void ypcmem(unsigned char *d, const unsigned char *s, int l) { - for(d+=l;l--;)*--d=*s++; + for (d += l; l--;) + *--d = *s++; } -#endif +# endif +# define BIGNUM2ZEN(n, bn) (ptr_zencod_init_number((n), \ + (unsigned long) ((bn)->top * BN_BITS2), \ + (unsigned char *) ((bn)->d))) -#define BIGNUM2ZEN(n, bn) (ptr_zencod_init_number((n), \ - (unsigned long) ((bn)->top * BN_BITS2), \ - (unsigned char *) ((bn)->d))) - -#define ZEN_BITS(n, bytes) (ptr_zencod_bytes2bits((unsigned char *) (n), (unsigned long) (bytes))) -#define ZEN_BYTES(bits) (ptr_zencod_bits2bytes((unsigned long) (bits))) - +# define ZEN_BITS(n, bytes) (ptr_zencod_bytes2bits((unsigned char *) (n), (unsigned long) (bytes))) +# define ZEN_BYTES(bits) (ptr_zencod_bits2bytes((unsigned long) (bits))) /* Function for ENGINE detection and control */ -static int zencod_destroy ( ENGINE *e ) ; -static int zencod_init ( ENGINE *e ) ; -static int zencod_finish ( ENGINE *e ) ; -static int zencod_ctrl ( ENGINE *e, int cmd, long i, void *p, void (*f) () ) ; +static int zencod_destroy(ENGINE *e); +static int zencod_init(ENGINE *e); +static int zencod_finish(ENGINE *e); +static int zencod_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) ()); /* BIGNUM stuff */ -static int zencod_bn_mod_exp ( BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx ) ; +static int zencod_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx); /* RSA stuff */ -#ifndef OPENSSL_NO_RSA -static int RSA_zencod_rsa_mod_exp ( BIGNUM *r0, const BIGNUM *I, RSA *rsa ) ; -static int RSA_zencod_bn_mod_exp ( BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx ) ; -#endif +# ifndef OPENSSL_NO_RSA +static int RSA_zencod_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa); +static int RSA_zencod_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx); +# endif /* DSA stuff */ -#ifndef OPENSSL_NO_DSA -static int DSA_zencod_bn_mod_exp ( DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, - BN_MONT_CTX *m_ctx ) ; +# ifndef OPENSSL_NO_DSA +static int DSA_zencod_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx); -static DSA_SIG *DSA_zencod_do_sign ( const unsigned char *dgst, int dlen, DSA *dsa ) ; -static int DSA_zencod_do_verify ( const unsigned char *dgst, int dgst_len, DSA_SIG *sig, - DSA *dsa ) ; -#endif +static DSA_SIG *DSA_zencod_do_sign(const unsigned char *dgst, int dlen, + DSA *dsa); +static int DSA_zencod_do_verify(const unsigned char *dgst, int dgst_len, + DSA_SIG *sig, DSA *dsa); +# endif /* DH stuff */ -#ifndef OPENSSL_NO_DH -static int DH_zencod_bn_mod_exp ( const DH *dh, BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, - BN_MONT_CTX *m_ctx ) ; -static int DH_zencod_generate_key ( DH *dh ) ; -static int DH_zencod_compute_key ( unsigned char *key, const BIGNUM *pub_key, DH *dh ) ; -#endif +# ifndef OPENSSL_NO_DH +static int DH_zencod_bn_mod_exp(const DH *dh, BIGNUM *r, const BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx); +static int DH_zencod_generate_key(DH *dh); +static int DH_zencod_compute_key(unsigned char *key, const BIGNUM *pub_key, + DH *dh); +# endif /* Rand stuff */ -static void RAND_zencod_seed ( const void *buf, int num ) ; -static int RAND_zencod_rand_bytes ( unsigned char *buf, int num ) ; -static int RAND_zencod_rand_status ( void ) ; +static void RAND_zencod_seed(const void *buf, int num); +static int RAND_zencod_rand_bytes(unsigned char *buf, int num); +static int RAND_zencod_rand_status(void); /* Digest Stuff */ -static int engine_digests ( ENGINE *e, const EVP_MD **digest, const int **nids, int nid ) ; +static int engine_digests(ENGINE *e, const EVP_MD **digest, const int **nids, + int nid); /* Cipher Stuff */ -static int engine_ciphers ( ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid ) ; - - -#define ZENCOD_CMD_SO_PATH ENGINE_CMD_BASE -static const ENGINE_CMD_DEFN zencod_cmd_defns [ ] = -{ - { ZENCOD_CMD_SO_PATH, - "SO_PATH", - "Specifies the path to the 'zenbridge' shared library", - ENGINE_CMD_FLAG_STRING}, - { 0, NULL, NULL, 0 } -} ; - - -#ifndef OPENSSL_NO_RSA -/* Our internal RSA_METHOD specific to zencod ENGINE providing pointers to our function */ -static RSA_METHOD zencod_rsa = -{ - "ZENCOD RSA method", - NULL, - NULL, - NULL, - NULL, - RSA_zencod_rsa_mod_exp, - RSA_zencod_bn_mod_exp, - NULL, - NULL, - 0, - NULL, - NULL, - NULL -} ; -#endif - -#ifndef OPENSSL_NO_DSA -/* Our internal DSA_METHOD specific to zencod ENGINE providing pointers to our function */ -static DSA_METHOD zencod_dsa = -{ - "ZENCOD DSA method", - DSA_zencod_do_sign, - NULL, - DSA_zencod_do_verify, - NULL, - DSA_zencod_bn_mod_exp, - NULL, - NULL, - 0, - NULL -} ; -#endif - -#ifndef OPENSSL_NO_DH -/* Our internal DH_METHOD specific to zencod ENGINE providing pointers to our function */ -static DH_METHOD zencod_dh = -{ - "ZENCOD DH method", - DH_zencod_generate_key, - DH_zencod_compute_key, - DH_zencod_bn_mod_exp, - NULL, - NULL, - 0, - NULL -} ; -#endif - -/* Our internal RAND_meth specific to zencod ZNGINE providing pointers to our function */ -static RAND_METHOD zencod_rand = -{ - RAND_zencod_seed, - RAND_zencod_rand_bytes, - NULL, - NULL, - RAND_zencod_rand_bytes, - RAND_zencod_rand_status -} ; +static int engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, + const int **nids, int nid); + +# define ZENCOD_CMD_SO_PATH ENGINE_CMD_BASE +static const ENGINE_CMD_DEFN zencod_cmd_defns[] = { + {ZENCOD_CMD_SO_PATH, + "SO_PATH", + "Specifies the path to the 'zenbridge' shared library", + ENGINE_CMD_FLAG_STRING}, + {0, NULL, NULL, 0} +}; + +# ifndef OPENSSL_NO_RSA +/* + * Our internal RSA_METHOD specific to zencod ENGINE providing pointers to + * our function + */ +static RSA_METHOD zencod_rsa = { + "ZENCOD RSA method", + NULL, + NULL, + NULL, + NULL, + RSA_zencod_rsa_mod_exp, + RSA_zencod_bn_mod_exp, + NULL, + NULL, + 0, + NULL, + NULL, + NULL +}; +# endif + +# ifndef OPENSSL_NO_DSA +/* + * Our internal DSA_METHOD specific to zencod ENGINE providing pointers to + * our function + */ +static DSA_METHOD zencod_dsa = { + "ZENCOD DSA method", + DSA_zencod_do_sign, + NULL, + DSA_zencod_do_verify, + NULL, + DSA_zencod_bn_mod_exp, + NULL, + NULL, + 0, + NULL +}; +# endif + +# ifndef OPENSSL_NO_DH +/* + * Our internal DH_METHOD specific to zencod ENGINE providing pointers to our + * function + */ +static DH_METHOD zencod_dh = { + "ZENCOD DH method", + DH_zencod_generate_key, + DH_zencod_compute_key, + DH_zencod_bn_mod_exp, + NULL, + NULL, + 0, + NULL +}; +# endif +/* + * Our internal RAND_meth specific to zencod ZNGINE providing pointers to our + * function + */ +static RAND_METHOD zencod_rand = { + RAND_zencod_seed, + RAND_zencod_rand_bytes, + NULL, + NULL, + RAND_zencod_rand_bytes, + RAND_zencod_rand_status +}; /* Constants used when creating the ENGINE */ static const char *engine_zencod_id = "zencod"; static const char *engine_zencod_name = "ZENCOD hardware engine support"; - -/* This internal function is used by ENGINE_zencod () and possibly by the - * "dynamic" ENGINE support too ;-) +/* + * This internal function is used by ENGINE_zencod () and possibly by the + * "dynamic" ENGINE support too ;-) */ -static int bind_helper ( ENGINE *e ) +static int bind_helper(ENGINE *e) { -#ifndef OPENSSL_NO_RSA - const RSA_METHOD *meth_rsa ; -#endif -#ifndef OPENSSL_NO_DSA - const DSA_METHOD *meth_dsa ; -#endif -#ifndef OPENSSL_NO_DH - const DH_METHOD *meth_dh ; -#endif - - const RAND_METHOD *meth_rand ; - - - if ( !ENGINE_set_id ( e, engine_zencod_id ) || - !ENGINE_set_name ( e, engine_zencod_name ) || -#ifndef OPENSSL_NO_RSA - !ENGINE_set_RSA ( e, &zencod_rsa ) || -#endif -#ifndef OPENSSL_NO_DSA - !ENGINE_set_DSA ( e, &zencod_dsa ) || -#endif -#ifndef OPENSSL_NO_DH - !ENGINE_set_DH ( e, &zencod_dh ) || -#endif - !ENGINE_set_RAND ( e, &zencod_rand ) || - - !ENGINE_set_destroy_function ( e, zencod_destroy ) || - !ENGINE_set_init_function ( e, zencod_init ) || - !ENGINE_set_finish_function ( e, zencod_finish ) || - !ENGINE_set_ctrl_function ( e, zencod_ctrl ) || - !ENGINE_set_cmd_defns ( e, zencod_cmd_defns ) || - !ENGINE_set_digests ( e, engine_digests ) || - !ENGINE_set_ciphers ( e, engine_ciphers ) ) { - return 0 ; - } - -#ifndef OPENSSL_NO_RSA - /* We know that the "PKCS1_SSLeay()" functions hook properly - * to the Zencod-specific mod_exp and mod_exp_crt so we use - * those functions. NB: We don't use ENGINE_openssl() or - * anything "more generic" because something like the RSAref - * code may not hook properly, and if you own one of these - * cards then you have the right to do RSA operations on it - * anyway! - */ - meth_rsa = RSA_PKCS1_SSLeay () ; - - zencod_rsa.rsa_pub_enc = meth_rsa->rsa_pub_enc ; - zencod_rsa.rsa_pub_dec = meth_rsa->rsa_pub_dec ; - zencod_rsa.rsa_priv_enc = meth_rsa->rsa_priv_enc ; - zencod_rsa.rsa_priv_dec = meth_rsa->rsa_priv_dec ; - /* meth_rsa->rsa_mod_exp */ - /* meth_rsa->bn_mod_exp */ - zencod_rsa.init = meth_rsa->init ; - zencod_rsa.finish = meth_rsa->finish ; -#endif - -#ifndef OPENSSL_NO_DSA - /* We use OpenSSL meth to supply what we don't provide ;-*) - */ - meth_dsa = DSA_OpenSSL () ; - - /* meth_dsa->dsa_do_sign */ - zencod_dsa.dsa_sign_setup = meth_dsa->dsa_sign_setup ; - /* meth_dsa->dsa_do_verify */ - zencod_dsa.dsa_mod_exp = meth_dsa->dsa_mod_exp ; - /* zencod_dsa.bn_mod_exp = meth_dsa->bn_mod_exp ; */ - zencod_dsa.init = meth_dsa->init ; - zencod_dsa.finish = meth_dsa->finish ; -#endif - -#ifndef OPENSSL_NO_DH - /* We use OpenSSL meth to supply what we don't provide ;-*) - */ - meth_dh = DH_OpenSSL () ; - - /* zencod_dh.generate_key = meth_dh->generate_key ; */ - /* zencod_dh.compute_key = meth_dh->compute_key ; */ - /* zencod_dh.bn_mod_exp = meth_dh->bn_mod_exp ; */ - zencod_dh.init = meth_dh->init ; - zencod_dh.finish = meth_dh->finish ; - -#endif - - /* We use OpenSSL (SSLeay) meth to supply what we don't provide ;-*) - */ - meth_rand = RAND_SSLeay () ; - - /* meth_rand->seed ; */ - /* zencod_rand.seed = meth_rand->seed ; */ - /* meth_rand->bytes ; */ - /* zencod_rand.bytes = meth_rand->bytes ; */ - zencod_rand.cleanup = meth_rand->cleanup ; - zencod_rand.add = meth_rand->add ; - /* meth_rand->pseudorand ; */ - /* zencod_rand.pseudorand = meth_rand->pseudorand ; */ - /* zencod_rand.status = meth_rand->status ; */ - /* meth_rand->status ; */ - - /* Ensure the zencod error handling is set up */ - ERR_load_ZENCOD_strings () ; - return 1 ; +# ifndef OPENSSL_NO_RSA + const RSA_METHOD *meth_rsa; +# endif +# ifndef OPENSSL_NO_DSA + const DSA_METHOD *meth_dsa; +# endif +# ifndef OPENSSL_NO_DH + const DH_METHOD *meth_dh; +# endif + + const RAND_METHOD *meth_rand; + + if (!ENGINE_set_id(e, engine_zencod_id) || + !ENGINE_set_name(e, engine_zencod_name) || +# ifndef OPENSSL_NO_RSA + !ENGINE_set_RSA(e, &zencod_rsa) || +# endif +# ifndef OPENSSL_NO_DSA + !ENGINE_set_DSA(e, &zencod_dsa) || +# endif +# ifndef OPENSSL_NO_DH + !ENGINE_set_DH(e, &zencod_dh) || +# endif + !ENGINE_set_RAND(e, &zencod_rand) || + !ENGINE_set_destroy_function(e, zencod_destroy) || + !ENGINE_set_init_function(e, zencod_init) || + !ENGINE_set_finish_function(e, zencod_finish) || + !ENGINE_set_ctrl_function(e, zencod_ctrl) || + !ENGINE_set_cmd_defns(e, zencod_cmd_defns) || + !ENGINE_set_digests(e, engine_digests) || + !ENGINE_set_ciphers(e, engine_ciphers)) { + return 0; + } +# ifndef OPENSSL_NO_RSA + /* + * We know that the "PKCS1_SSLeay()" functions hook properly to the + * Zencod-specific mod_exp and mod_exp_crt so we use those functions. NB: + * We don't use ENGINE_openssl() or anything "more generic" because + * something like the RSAref code may not hook properly, and if you own + * one of these cards then you have the right to do RSA operations on it + * anyway! + */ + meth_rsa = RSA_PKCS1_SSLeay(); + + zencod_rsa.rsa_pub_enc = meth_rsa->rsa_pub_enc; + zencod_rsa.rsa_pub_dec = meth_rsa->rsa_pub_dec; + zencod_rsa.rsa_priv_enc = meth_rsa->rsa_priv_enc; + zencod_rsa.rsa_priv_dec = meth_rsa->rsa_priv_dec; + /* meth_rsa->rsa_mod_exp */ + /* meth_rsa->bn_mod_exp */ + zencod_rsa.init = meth_rsa->init; + zencod_rsa.finish = meth_rsa->finish; +# endif + +# ifndef OPENSSL_NO_DSA + /* + * We use OpenSSL meth to supply what we don't provide ;-*) + */ + meth_dsa = DSA_OpenSSL(); + + /* meth_dsa->dsa_do_sign */ + zencod_dsa.dsa_sign_setup = meth_dsa->dsa_sign_setup; + /* meth_dsa->dsa_do_verify */ + zencod_dsa.dsa_mod_exp = meth_dsa->dsa_mod_exp; + /* zencod_dsa.bn_mod_exp = meth_dsa->bn_mod_exp ; */ + zencod_dsa.init = meth_dsa->init; + zencod_dsa.finish = meth_dsa->finish; +# endif + +# ifndef OPENSSL_NO_DH + /* + * We use OpenSSL meth to supply what we don't provide ;-*) + */ + meth_dh = DH_OpenSSL(); + + /* zencod_dh.generate_key = meth_dh->generate_key ; */ + /* zencod_dh.compute_key = meth_dh->compute_key ; */ + /* zencod_dh.bn_mod_exp = meth_dh->bn_mod_exp ; */ + zencod_dh.init = meth_dh->init; + zencod_dh.finish = meth_dh->finish; + +# endif + + /* + * We use OpenSSL (SSLeay) meth to supply what we don't provide ;-*) + */ + meth_rand = RAND_SSLeay(); + + /* meth_rand->seed ; */ + /* zencod_rand.seed = meth_rand->seed ; */ + /* meth_rand->bytes ; */ + /* zencod_rand.bytes = meth_rand->bytes ; */ + zencod_rand.cleanup = meth_rand->cleanup; + zencod_rand.add = meth_rand->add; + /* meth_rand->pseudorand ; */ + /* zencod_rand.pseudorand = meth_rand->pseudorand ; */ + /* zencod_rand.status = meth_rand->status ; */ + /* meth_rand->status ; */ + + /* Ensure the zencod error handling is set up */ + ERR_load_ZENCOD_strings(); + return 1; } - -/* As this is only ever called once, there's no need for locking - * (indeed - the lock will already be held by our caller!!!) +/* + * As this is only ever called once, there's no need for locking (indeed - + * the lock will already be held by our caller!!!) */ -static ENGINE *ENGINE_zencod ( void ) +static ENGINE *ENGINE_zencod(void) { - ENGINE *eng = ENGINE_new () ; + ENGINE *eng = ENGINE_new(); - if ( !eng ) { - return NULL ; - } - if ( !bind_helper ( eng ) ) { - ENGINE_free ( eng ) ; - return NULL ; - } + if (!eng) { + return NULL; + } + if (!bind_helper(eng)) { + ENGINE_free(eng); + return NULL; + } - return eng ; + return eng; } - -#ifdef ENGINE_DYNAMIC_SUPPORT +# ifdef ENGINE_DYNAMIC_SUPPORT static -#endif -void ENGINE_load_zencod ( void ) +# endif +void ENGINE_load_zencod(void) { - /* Copied from eng_[openssl|dyn].c */ - ENGINE *toadd = ENGINE_zencod ( ) ; - if ( !toadd ) return ; - ENGINE_add ( toadd ) ; - ENGINE_free ( toadd ) ; - ERR_clear_error ( ) ; + /* Copied from eng_[openssl|dyn].c */ + ENGINE *toadd = ENGINE_zencod(); + if (!toadd) + return; + ENGINE_add(toadd); + ENGINE_free(toadd); + ERR_clear_error(); } - -/* This is a process-global DSO handle used for loading and unloading - * the ZENBRIDGE library. - * NB: This is only set (or unset) during an * init () or finish () call - * (reference counts permitting) and they're * operating with global locks, - * so this should be thread-safe * implicitly. +/* + * This is a process-global DSO handle used for loading and unloading the + * ZENBRIDGE library. NB: This is only set (or unset) during an * init () or + * finish () call (reference counts permitting) and they're * operating with + * global locks, so this should be thread-safe * implicitly. */ -static DSO *zencod_dso = NULL ; - -static t_zencod_test *ptr_zencod_test = NULL ; -static t_zencod_bytes2bits *ptr_zencod_bytes2bits = NULL ; -static t_zencod_bits2bytes *ptr_zencod_bits2bytes = NULL ; -static t_zencod_new_number *ptr_zencod_new_number = NULL ; -static t_zencod_init_number *ptr_zencod_init_number = NULL ; - -static t_zencod_rsa_mod_exp *ptr_zencod_rsa_mod_exp = NULL ; -static t_zencod_rsa_mod_exp_crt *ptr_zencod_rsa_mod_exp_crt = NULL ; -static t_zencod_dsa_do_sign *ptr_zencod_dsa_do_sign = NULL ; -static t_zencod_dsa_do_verify *ptr_zencod_dsa_do_verify = NULL ; -static t_zencod_dh_generate_key *ptr_zencod_dh_generate_key = NULL ; -static t_zencod_dh_compute_key *ptr_zencod_dh_compute_key = NULL ; -static t_zencod_rand_bytes *ptr_zencod_rand_bytes = NULL ; -static t_zencod_math_mod_exp *ptr_zencod_math_mod_exp = NULL ; - -static t_zencod_md5_init *ptr_zencod_md5_init = NULL ; -static t_zencod_md5_update *ptr_zencod_md5_update = NULL ; -static t_zencod_md5_do_final *ptr_zencod_md5_do_final = NULL ; -static t_zencod_sha1_init *ptr_zencod_sha1_init = NULL ; -static t_zencod_sha1_update *ptr_zencod_sha1_update = NULL ; -static t_zencod_sha1_do_final *ptr_zencod_sha1_do_final = NULL ; - -static t_zencod_xdes_cipher *ptr_zencod_xdes_cipher = NULL ; -static t_zencod_rc4_cipher *ptr_zencod_rc4_cipher = NULL ; - -/* These are the static string constants for the DSO file name and the function - * symbol names to bind to. +static DSO *zencod_dso = NULL; + +static t_zencod_test *ptr_zencod_test = NULL; +static t_zencod_bytes2bits *ptr_zencod_bytes2bits = NULL; +static t_zencod_bits2bytes *ptr_zencod_bits2bytes = NULL; +static t_zencod_new_number *ptr_zencod_new_number = NULL; +static t_zencod_init_number *ptr_zencod_init_number = NULL; + +static t_zencod_rsa_mod_exp *ptr_zencod_rsa_mod_exp = NULL; +static t_zencod_rsa_mod_exp_crt *ptr_zencod_rsa_mod_exp_crt = NULL; +static t_zencod_dsa_do_sign *ptr_zencod_dsa_do_sign = NULL; +static t_zencod_dsa_do_verify *ptr_zencod_dsa_do_verify = NULL; +static t_zencod_dh_generate_key *ptr_zencod_dh_generate_key = NULL; +static t_zencod_dh_compute_key *ptr_zencod_dh_compute_key = NULL; +static t_zencod_rand_bytes *ptr_zencod_rand_bytes = NULL; +static t_zencod_math_mod_exp *ptr_zencod_math_mod_exp = NULL; + +static t_zencod_md5_init *ptr_zencod_md5_init = NULL; +static t_zencod_md5_update *ptr_zencod_md5_update = NULL; +static t_zencod_md5_do_final *ptr_zencod_md5_do_final = NULL; +static t_zencod_sha1_init *ptr_zencod_sha1_init = NULL; +static t_zencod_sha1_update *ptr_zencod_sha1_update = NULL; +static t_zencod_sha1_do_final *ptr_zencod_sha1_do_final = NULL; + +static t_zencod_xdes_cipher *ptr_zencod_xdes_cipher = NULL; +static t_zencod_rc4_cipher *ptr_zencod_rc4_cipher = NULL; + +/* + * These are the static string constants for the DSO file name and the + * function symbol names to bind to. */ -static const char *ZENCOD_LIBNAME = ZEN_LIBRARY ; - -static const char *ZENCOD_Fct_0 = "test_device" ; -static const char *ZENCOD_Fct_1 = "zenbridge_bytes2bits" ; -static const char *ZENCOD_Fct_2 = "zenbridge_bits2bytes" ; -static const char *ZENCOD_Fct_3 = "zenbridge_new_number" ; -static const char *ZENCOD_Fct_4 = "zenbridge_init_number" ; - -static const char *ZENCOD_Fct_exp_1 = "zenbridge_rsa_mod_exp" ; -static const char *ZENCOD_Fct_exp_2 = "zenbridge_rsa_mod_exp_crt" ; -static const char *ZENCOD_Fct_dsa_1 = "zenbridge_dsa_do_sign" ; -static const char *ZENCOD_Fct_dsa_2 = "zenbridge_dsa_do_verify" ; -static const char *ZENCOD_Fct_dh_1 = "zenbridge_dh_generate_key" ; -static const char *ZENCOD_Fct_dh_2 = "zenbridge_dh_compute_key" ; -static const char *ZENCOD_Fct_rand_1 = "zenbridge_rand_bytes" ; -static const char *ZENCOD_Fct_math_1 = "zenbridge_math_mod_exp" ; - -static const char *ZENCOD_Fct_md5_1 = "zenbridge_md5_init" ; -static const char *ZENCOD_Fct_md5_2 = "zenbridge_md5_update" ; -static const char *ZENCOD_Fct_md5_3 = "zenbridge_md5_do_final" ; -static const char *ZENCOD_Fct_sha1_1 = "zenbridge_sha1_init" ; -static const char *ZENCOD_Fct_sha1_2 = "zenbridge_sha1_update" ; -static const char *ZENCOD_Fct_sha1_3 = "zenbridge_sha1_do_final" ; - -static const char *ZENCOD_Fct_xdes_1 = "zenbridge_xdes_cipher" ; -static const char *ZENCOD_Fct_rc4_1 = "zenbridge_rc4_cipher" ; - -/* Destructor (complements the "ENGINE_zencod ()" constructor) +static const char *ZENCOD_LIBNAME = ZEN_LIBRARY; + +static const char *ZENCOD_Fct_0 = "test_device"; +static const char *ZENCOD_Fct_1 = "zenbridge_bytes2bits"; +static const char *ZENCOD_Fct_2 = "zenbridge_bits2bytes"; +static const char *ZENCOD_Fct_3 = "zenbridge_new_number"; +static const char *ZENCOD_Fct_4 = "zenbridge_init_number"; + +static const char *ZENCOD_Fct_exp_1 = "zenbridge_rsa_mod_exp"; +static const char *ZENCOD_Fct_exp_2 = "zenbridge_rsa_mod_exp_crt"; +static const char *ZENCOD_Fct_dsa_1 = "zenbridge_dsa_do_sign"; +static const char *ZENCOD_Fct_dsa_2 = "zenbridge_dsa_do_verify"; +static const char *ZENCOD_Fct_dh_1 = "zenbridge_dh_generate_key"; +static const char *ZENCOD_Fct_dh_2 = "zenbridge_dh_compute_key"; +static const char *ZENCOD_Fct_rand_1 = "zenbridge_rand_bytes"; +static const char *ZENCOD_Fct_math_1 = "zenbridge_math_mod_exp"; + +static const char *ZENCOD_Fct_md5_1 = "zenbridge_md5_init"; +static const char *ZENCOD_Fct_md5_2 = "zenbridge_md5_update"; +static const char *ZENCOD_Fct_md5_3 = "zenbridge_md5_do_final"; +static const char *ZENCOD_Fct_sha1_1 = "zenbridge_sha1_init"; +static const char *ZENCOD_Fct_sha1_2 = "zenbridge_sha1_update"; +static const char *ZENCOD_Fct_sha1_3 = "zenbridge_sha1_do_final"; + +static const char *ZENCOD_Fct_xdes_1 = "zenbridge_xdes_cipher"; +static const char *ZENCOD_Fct_rc4_1 = "zenbridge_rc4_cipher"; + +/* + * Destructor (complements the "ENGINE_zencod ()" constructor) */ -static int zencod_destroy (ENGINE *e ) +static int zencod_destroy(ENGINE *e) { - ERR_unload_ZENCOD_strings () ; + ERR_unload_ZENCOD_strings(); - return 1 ; + return 1; } - -/* (de)initialisation functions. Control Function +/* + * (de)initialisation functions. Control Function */ -static int zencod_init ( ENGINE *e ) +static int zencod_init(ENGINE *e) { - t_zencod_test *ptr_0 ; - t_zencod_bytes2bits *ptr_1 ; - t_zencod_bits2bytes *ptr_2 ; - t_zencod_new_number *ptr_3 ; - t_zencod_init_number *ptr_4 ; - t_zencod_rsa_mod_exp *ptr_exp_1 ; - t_zencod_rsa_mod_exp_crt *ptr_exp_2 ; - t_zencod_dsa_do_sign *ptr_dsa_1 ; - t_zencod_dsa_do_verify *ptr_dsa_2 ; - t_zencod_dh_generate_key *ptr_dh_1 ; - t_zencod_dh_compute_key *ptr_dh_2 ; - t_zencod_rand_bytes *ptr_rand_1 ; - t_zencod_math_mod_exp *ptr_math_1 ; - t_zencod_md5_init *ptr_md5_1 ; - t_zencod_md5_update *ptr_md5_2 ; - t_zencod_md5_do_final *ptr_md5_3 ; - t_zencod_sha1_init *ptr_sha1_1 ; - t_zencod_sha1_update *ptr_sha1_2 ; - t_zencod_sha1_do_final *ptr_sha1_3 ; - t_zencod_xdes_cipher *ptr_xdes_1 ; - t_zencod_rc4_cipher *ptr_rc4_1 ; - - CHEESE () ; - - /* - * We Should add some tests for non NULL parameters or bad value !! - * Stuff to be done ... - */ - - if ( zencod_dso != NULL ) { - ZENCODerr ( ZENCOD_F_ZENCOD_INIT, ZENCOD_R_ALREADY_LOADED ) ; - goto err ; - } - /* Trying to load the Library "cryptozen" - */ - zencod_dso = DSO_load ( NULL, ZENCOD_LIBNAME, NULL, 0 ) ; - if ( zencod_dso == NULL ) { - ZENCODerr ( ZENCOD_F_ZENCOD_INIT, ZENCOD_R_DSO_FAILURE ) ; - goto err ; - } - - /* Trying to load Function from the Library - */ - if ( ! ( ptr_1 = (t_zencod_bytes2bits*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_1 ) ) || - ! ( ptr_2 = (t_zencod_bits2bytes*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_2 ) ) || - ! ( ptr_3 = (t_zencod_new_number*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_3 ) ) || - ! ( ptr_4 = (t_zencod_init_number*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_4 ) ) || - ! ( ptr_exp_1 = (t_zencod_rsa_mod_exp*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_exp_1 ) ) || - ! ( ptr_exp_2 = (t_zencod_rsa_mod_exp_crt*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_exp_2 ) ) || - ! ( ptr_dsa_1 = (t_zencod_dsa_do_sign*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_dsa_1 ) ) || - ! ( ptr_dsa_2 = (t_zencod_dsa_do_verify*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_dsa_2 ) ) || - ! ( ptr_dh_1 = (t_zencod_dh_generate_key*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_dh_1 ) ) || - ! ( ptr_dh_2 = (t_zencod_dh_compute_key*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_dh_2 ) ) || - ! ( ptr_rand_1 = (t_zencod_rand_bytes*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_rand_1 ) ) || - ! ( ptr_math_1 = (t_zencod_math_mod_exp*) DSO_bind_func ( zencod_dso, ZENCOD_Fct_math_1 ) ) || - ! ( ptr_0 = (t_zencod_test *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_0 ) ) || - ! ( ptr_md5_1 = (t_zencod_md5_init *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_md5_1 ) ) || - ! ( ptr_md5_2 = (t_zencod_md5_update *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_md5_2 ) ) || - ! ( ptr_md5_3 = (t_zencod_md5_do_final *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_md5_3 ) ) || - ! ( ptr_sha1_1 = (t_zencod_sha1_init *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_sha1_1 ) ) || - ! ( ptr_sha1_2 = (t_zencod_sha1_update *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_sha1_2 ) ) || - ! ( ptr_sha1_3 = (t_zencod_sha1_do_final *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_sha1_3 ) ) || - ! ( ptr_xdes_1 = (t_zencod_xdes_cipher *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_xdes_1 ) ) || - ! ( ptr_rc4_1 = (t_zencod_rc4_cipher *) DSO_bind_func ( zencod_dso, ZENCOD_Fct_rc4_1 ) ) ) { - - ZENCODerr ( ZENCOD_F_ZENCOD_INIT, ZENCOD_R_DSO_FAILURE ) ; - goto err ; - } - - /* The function from "cryptozen" Library have been correctly loaded so copy them - */ - ptr_zencod_test = ptr_0 ; - ptr_zencod_bytes2bits = ptr_1 ; - ptr_zencod_bits2bytes = ptr_2 ; - ptr_zencod_new_number = ptr_3 ; - ptr_zencod_init_number = ptr_4 ; - ptr_zencod_rsa_mod_exp = ptr_exp_1 ; - ptr_zencod_rsa_mod_exp_crt = ptr_exp_2 ; - ptr_zencod_dsa_do_sign = ptr_dsa_1 ; - ptr_zencod_dsa_do_verify = ptr_dsa_2 ; - ptr_zencod_dh_generate_key = ptr_dh_1 ; - ptr_zencod_dh_compute_key = ptr_dh_2 ; - ptr_zencod_rand_bytes = ptr_rand_1 ; - ptr_zencod_math_mod_exp = ptr_math_1 ; - ptr_zencod_test = ptr_0 ; - ptr_zencod_md5_init = ptr_md5_1 ; - ptr_zencod_md5_update = ptr_md5_2 ; - ptr_zencod_md5_do_final = ptr_md5_3 ; - ptr_zencod_sha1_init = ptr_sha1_1 ; - ptr_zencod_sha1_update = ptr_sha1_2 ; - ptr_zencod_sha1_do_final = ptr_sha1_3 ; - ptr_zencod_xdes_cipher = ptr_xdes_1 ; - ptr_zencod_rc4_cipher = ptr_rc4_1 ; - - /* We should peform a test to see if there is actually any unit runnig on the system ... - * Even if the cryptozen library is loaded the module coul not be loaded on the system ... - * For now we may just open and close the device !! - */ - - if ( ptr_zencod_test () != 0 ) { - ZENCODerr ( ZENCOD_F_ZENCOD_INIT, ZENCOD_R_UNIT_FAILURE ) ; - goto err ; - } - - return 1 ; -err : - if ( zencod_dso ) { - DSO_free ( zencod_dso ) ; - } - zencod_dso = NULL ; - ptr_zencod_bytes2bits = NULL ; - ptr_zencod_bits2bytes = NULL ; - ptr_zencod_new_number = NULL ; - ptr_zencod_init_number = NULL ; - ptr_zencod_rsa_mod_exp = NULL ; - ptr_zencod_rsa_mod_exp_crt = NULL ; - ptr_zencod_dsa_do_sign = NULL ; - ptr_zencod_dsa_do_verify = NULL ; - ptr_zencod_dh_generate_key = NULL ; - ptr_zencod_dh_compute_key = NULL ; - ptr_zencod_rand_bytes = NULL ; - ptr_zencod_math_mod_exp = NULL ; - ptr_zencod_test = NULL ; - ptr_zencod_md5_init = NULL ; - ptr_zencod_md5_update = NULL ; - ptr_zencod_md5_do_final = NULL ; - ptr_zencod_sha1_init = NULL ; - ptr_zencod_sha1_update = NULL ; - ptr_zencod_sha1_do_final = NULL ; - ptr_zencod_xdes_cipher = NULL ; - ptr_zencod_rc4_cipher = NULL ; - - return 0 ; + t_zencod_test *ptr_0; + t_zencod_bytes2bits *ptr_1; + t_zencod_bits2bytes *ptr_2; + t_zencod_new_number *ptr_3; + t_zencod_init_number *ptr_4; + t_zencod_rsa_mod_exp *ptr_exp_1; + t_zencod_rsa_mod_exp_crt *ptr_exp_2; + t_zencod_dsa_do_sign *ptr_dsa_1; + t_zencod_dsa_do_verify *ptr_dsa_2; + t_zencod_dh_generate_key *ptr_dh_1; + t_zencod_dh_compute_key *ptr_dh_2; + t_zencod_rand_bytes *ptr_rand_1; + t_zencod_math_mod_exp *ptr_math_1; + t_zencod_md5_init *ptr_md5_1; + t_zencod_md5_update *ptr_md5_2; + t_zencod_md5_do_final *ptr_md5_3; + t_zencod_sha1_init *ptr_sha1_1; + t_zencod_sha1_update *ptr_sha1_2; + t_zencod_sha1_do_final *ptr_sha1_3; + t_zencod_xdes_cipher *ptr_xdes_1; + t_zencod_rc4_cipher *ptr_rc4_1; + + CHEESE(); + + /* + * We Should add some tests for non NULL parameters or bad value !! + * Stuff to be done ... + */ + + if (zencod_dso != NULL) { + ZENCODerr(ZENCOD_F_ZENCOD_INIT, ZENCOD_R_ALREADY_LOADED); + goto err; + } + /* + * Trying to load the Library "cryptozen" + */ + zencod_dso = DSO_load(NULL, ZENCOD_LIBNAME, NULL, 0); + if (zencod_dso == NULL) { + ZENCODerr(ZENCOD_F_ZENCOD_INIT, ZENCOD_R_DSO_FAILURE); + goto err; + } + + /* + * Trying to load Function from the Library + */ + if (! + (ptr_1 = + (t_zencod_bytes2bits *) DSO_bind_func(zencod_dso, ZENCOD_Fct_1)) +|| !(ptr_2 = (t_zencod_bits2bytes *) DSO_bind_func(zencod_dso, ZENCOD_Fct_2)) +|| !(ptr_3 = (t_zencod_new_number *) DSO_bind_func(zencod_dso, ZENCOD_Fct_3)) +|| !(ptr_4 = (t_zencod_init_number *) DSO_bind_func(zencod_dso, ZENCOD_Fct_4)) +|| !(ptr_exp_1 = + (t_zencod_rsa_mod_exp *) DSO_bind_func(zencod_dso, ZENCOD_Fct_exp_1)) +|| !(ptr_exp_2 = + (t_zencod_rsa_mod_exp_crt *) DSO_bind_func(zencod_dso, ZENCOD_Fct_exp_2)) +|| !(ptr_dsa_1 = + (t_zencod_dsa_do_sign *) DSO_bind_func(zencod_dso, ZENCOD_Fct_dsa_1)) +|| !(ptr_dsa_2 = + (t_zencod_dsa_do_verify *) DSO_bind_func(zencod_dso, ZENCOD_Fct_dsa_2)) +|| !(ptr_dh_1 = + (t_zencod_dh_generate_key *) DSO_bind_func(zencod_dso, ZENCOD_Fct_dh_1)) +|| !(ptr_dh_2 = + (t_zencod_dh_compute_key *) DSO_bind_func(zencod_dso, ZENCOD_Fct_dh_2)) +|| !(ptr_rand_1 = + (t_zencod_rand_bytes *) DSO_bind_func(zencod_dso, ZENCOD_Fct_rand_1)) +|| !(ptr_math_1 = + (t_zencod_math_mod_exp *) DSO_bind_func(zencod_dso, ZENCOD_Fct_math_1)) +|| !(ptr_0 = (t_zencod_test *) DSO_bind_func(zencod_dso, ZENCOD_Fct_0)) +|| !(ptr_md5_1 = + (t_zencod_md5_init *) DSO_bind_func(zencod_dso, ZENCOD_Fct_md5_1)) +|| !(ptr_md5_2 = + (t_zencod_md5_update *) DSO_bind_func(zencod_dso, ZENCOD_Fct_md5_2)) +|| !(ptr_md5_3 = + (t_zencod_md5_do_final *) DSO_bind_func(zencod_dso, ZENCOD_Fct_md5_3)) +|| !(ptr_sha1_1 = + (t_zencod_sha1_init *) DSO_bind_func(zencod_dso, ZENCOD_Fct_sha1_1)) +|| !(ptr_sha1_2 = + (t_zencod_sha1_update *) DSO_bind_func(zencod_dso, ZENCOD_Fct_sha1_2)) +|| !(ptr_sha1_3 = + (t_zencod_sha1_do_final *) DSO_bind_func(zencod_dso, ZENCOD_Fct_sha1_3)) +|| !(ptr_xdes_1 = + (t_zencod_xdes_cipher *) DSO_bind_func(zencod_dso, ZENCOD_Fct_xdes_1)) +|| !(ptr_rc4_1 = + (t_zencod_rc4_cipher *) DSO_bind_func(zencod_dso, ZENCOD_Fct_rc4_1))) { + + ZENCODerr(ZENCOD_F_ZENCOD_INIT, ZENCOD_R_DSO_FAILURE); + goto err; + } + + /* + * The function from "cryptozen" Library have been correctly loaded so + * copy them + */ + ptr_zencod_test = ptr_0; + ptr_zencod_bytes2bits = ptr_1; + ptr_zencod_bits2bytes = ptr_2; + ptr_zencod_new_number = ptr_3; + ptr_zencod_init_number = ptr_4; + ptr_zencod_rsa_mod_exp = ptr_exp_1; + ptr_zencod_rsa_mod_exp_crt = ptr_exp_2; + ptr_zencod_dsa_do_sign = ptr_dsa_1; + ptr_zencod_dsa_do_verify = ptr_dsa_2; + ptr_zencod_dh_generate_key = ptr_dh_1; + ptr_zencod_dh_compute_key = ptr_dh_2; + ptr_zencod_rand_bytes = ptr_rand_1; + ptr_zencod_math_mod_exp = ptr_math_1; + ptr_zencod_test = ptr_0; + ptr_zencod_md5_init = ptr_md5_1; + ptr_zencod_md5_update = ptr_md5_2; + ptr_zencod_md5_do_final = ptr_md5_3; + ptr_zencod_sha1_init = ptr_sha1_1; + ptr_zencod_sha1_update = ptr_sha1_2; + ptr_zencod_sha1_do_final = ptr_sha1_3; + ptr_zencod_xdes_cipher = ptr_xdes_1; + ptr_zencod_rc4_cipher = ptr_rc4_1; + + /* + * We should peform a test to see if there is actually any unit runnig on + * the system ... Even if the cryptozen library is loaded the module coul + * not be loaded on the system ... For now we may just open and close the + * device !! + */ + + if (ptr_zencod_test() != 0) { + ZENCODerr(ZENCOD_F_ZENCOD_INIT, ZENCOD_R_UNIT_FAILURE); + goto err; + } + + return 1; + err: + if (zencod_dso) { + DSO_free(zencod_dso); + } + zencod_dso = NULL; + ptr_zencod_bytes2bits = NULL; + ptr_zencod_bits2bytes = NULL; + ptr_zencod_new_number = NULL; + ptr_zencod_init_number = NULL; + ptr_zencod_rsa_mod_exp = NULL; + ptr_zencod_rsa_mod_exp_crt = NULL; + ptr_zencod_dsa_do_sign = NULL; + ptr_zencod_dsa_do_verify = NULL; + ptr_zencod_dh_generate_key = NULL; + ptr_zencod_dh_compute_key = NULL; + ptr_zencod_rand_bytes = NULL; + ptr_zencod_math_mod_exp = NULL; + ptr_zencod_test = NULL; + ptr_zencod_md5_init = NULL; + ptr_zencod_md5_update = NULL; + ptr_zencod_md5_do_final = NULL; + ptr_zencod_sha1_init = NULL; + ptr_zencod_sha1_update = NULL; + ptr_zencod_sha1_do_final = NULL; + ptr_zencod_xdes_cipher = NULL; + ptr_zencod_rc4_cipher = NULL; + + return 0; } - -static int zencod_finish ( ENGINE *e ) +static int zencod_finish(ENGINE *e) { - CHEESE () ; - - /* - * We Should add some tests for non NULL parameters or bad value !! - * Stuff to be done ... - */ - if ( zencod_dso == NULL ) { - ZENCODerr ( ZENCOD_F_ZENCOD_FINISH, ZENCOD_R_NOT_LOADED ) ; - return 0 ; - } - if ( !DSO_free ( zencod_dso ) ) { - ZENCODerr ( ZENCOD_F_ZENCOD_FINISH, ZENCOD_R_DSO_FAILURE ) ; - return 0 ; - } - - zencod_dso = NULL ; - - ptr_zencod_bytes2bits = NULL ; - ptr_zencod_bits2bytes = NULL ; - ptr_zencod_new_number = NULL ; - ptr_zencod_init_number = NULL ; - ptr_zencod_rsa_mod_exp = NULL ; - ptr_zencod_rsa_mod_exp_crt = NULL ; - ptr_zencod_dsa_do_sign = NULL ; - ptr_zencod_dsa_do_verify = NULL ; - ptr_zencod_dh_generate_key = NULL ; - ptr_zencod_dh_compute_key = NULL ; - ptr_zencod_rand_bytes = NULL ; - ptr_zencod_math_mod_exp = NULL ; - ptr_zencod_test = NULL ; - ptr_zencod_md5_init = NULL ; - ptr_zencod_md5_update = NULL ; - ptr_zencod_md5_do_final = NULL ; - ptr_zencod_sha1_init = NULL ; - ptr_zencod_sha1_update = NULL ; - ptr_zencod_sha1_do_final = NULL ; - ptr_zencod_xdes_cipher = NULL ; - ptr_zencod_rc4_cipher = NULL ; - - return 1 ; + CHEESE(); + + /* + * We Should add some tests for non NULL parameters or bad value !! + * Stuff to be done ... + */ + if (zencod_dso == NULL) { + ZENCODerr(ZENCOD_F_ZENCOD_FINISH, ZENCOD_R_NOT_LOADED); + return 0; + } + if (!DSO_free(zencod_dso)) { + ZENCODerr(ZENCOD_F_ZENCOD_FINISH, ZENCOD_R_DSO_FAILURE); + return 0; + } + + zencod_dso = NULL; + + ptr_zencod_bytes2bits = NULL; + ptr_zencod_bits2bytes = NULL; + ptr_zencod_new_number = NULL; + ptr_zencod_init_number = NULL; + ptr_zencod_rsa_mod_exp = NULL; + ptr_zencod_rsa_mod_exp_crt = NULL; + ptr_zencod_dsa_do_sign = NULL; + ptr_zencod_dsa_do_verify = NULL; + ptr_zencod_dh_generate_key = NULL; + ptr_zencod_dh_compute_key = NULL; + ptr_zencod_rand_bytes = NULL; + ptr_zencod_math_mod_exp = NULL; + ptr_zencod_test = NULL; + ptr_zencod_md5_init = NULL; + ptr_zencod_md5_update = NULL; + ptr_zencod_md5_do_final = NULL; + ptr_zencod_sha1_init = NULL; + ptr_zencod_sha1_update = NULL; + ptr_zencod_sha1_do_final = NULL; + ptr_zencod_xdes_cipher = NULL; + ptr_zencod_rc4_cipher = NULL; + + return 1; } - -static int zencod_ctrl ( ENGINE *e, int cmd, long i, void *p, void (*f) () ) +static int zencod_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) ()) { - int initialised = ( ( zencod_dso == NULL ) ? 0 : 1 ) ; - - CHEESE () ; - - /* - * We Should add some tests for non NULL parameters or bad value !! - * Stuff to be done ... - */ - switch ( cmd ) { - case ZENCOD_CMD_SO_PATH : - if ( p == NULL ) { - ZENCODerr ( ZENCOD_F_ZENCOD_CTRL, ERR_R_PASSED_NULL_PARAMETER ) ; - return 0 ; - } - if ( initialised ) { - ZENCODerr ( ZENCOD_F_ZENCOD_CTRL, ZENCOD_R_ALREADY_LOADED ) ; - return 0 ; - } - ZENCOD_LIBNAME = (const char *) p ; - return 1 ; - default : - break ; - } - - ZENCODerr ( ZENCOD_F_ZENCOD_CTRL, ZENCOD_R_CTRL_COMMAND_NOT_IMPLEMENTED ) ; - - return 0 ; + int initialised = ((zencod_dso == NULL) ? 0 : 1); + + CHEESE(); + + /* + * We Should add some tests for non NULL parameters or bad value !! + * Stuff to be done ... + */ + switch (cmd) { + case ZENCOD_CMD_SO_PATH: + if (p == NULL) { + ZENCODerr(ZENCOD_F_ZENCOD_CTRL, ERR_R_PASSED_NULL_PARAMETER); + return 0; + } + if (initialised) { + ZENCODerr(ZENCOD_F_ZENCOD_CTRL, ZENCOD_R_ALREADY_LOADED); + return 0; + } + ZENCOD_LIBNAME = (const char *)p; + return 1; + default: + break; + } + + ZENCODerr(ZENCOD_F_ZENCOD_CTRL, ZENCOD_R_CTRL_COMMAND_NOT_IMPLEMENTED); + + return 0; } - -/* BIGNUM stuff Functions +/* + * BIGNUM stuff Functions */ -static int zencod_bn_mod_exp ( BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx ) +static int zencod_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx) { - zen_nb_t y, x, e, n; - int ret; + zen_nb_t y, x, e, n; + int ret; - CHEESE () ; + CHEESE(); - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_BN_MOD_EXP, ZENCOD_R_NOT_LOADED); - return 0; - } + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_BN_MOD_EXP, ZENCOD_R_NOT_LOADED); + return 0; + } - if ( !bn_wexpand(r, m->top + 1) ) { - ENGINEerr(ZENCOD_F_ZENCOD_BN_MOD_EXP, ZENCOD_R_BN_EXPAND_FAIL); - return 0; - } + if (!bn_wexpand(r, m->top + 1)) { + ENGINEerr(ZENCOD_F_ZENCOD_BN_MOD_EXP, ZENCOD_R_BN_EXPAND_FAIL); + return 0; + } - memset(r->d, 0, BN_num_bytes(m)); + memset(r->d, 0, BN_num_bytes(m)); - ptr_zencod_init_number ( &y, (r->dmax - 1) * sizeof (BN_ULONG) * 8, (unsigned char *) r->d ) ; - BIGNUM2ZEN ( &x, a ) ; - BIGNUM2ZEN ( &e, p ) ; - BIGNUM2ZEN ( &n, m ) ; + ptr_zencod_init_number(&y, (r->dmax - 1) * sizeof(BN_ULONG) * 8, + (unsigned char *)r->d); + BIGNUM2ZEN(&x, a); + BIGNUM2ZEN(&e, p); + BIGNUM2ZEN(&n, m); - /* Must invert x and e parameter due to BN mod exp prototype ... */ - ret = ptr_zencod_math_mod_exp ( &y, &e, &x, &n ) ; + /* Must invert x and e parameter due to BN mod exp prototype ... */ + ret = ptr_zencod_math_mod_exp(&y, &e, &x, &n); - if ( ret ) { - PERROR("zenbridge_math_mod_exp"); - ENGINEerr(ZENCOD_F_ZENCOD_BN_MOD_EXP, ZENCOD_R_REQUEST_FAILED); - return 0; - } + if (ret) { + PERROR("zenbridge_math_mod_exp"); + ENGINEerr(ZENCOD_F_ZENCOD_BN_MOD_EXP, ZENCOD_R_REQUEST_FAILED); + return 0; + } - r->top = (BN_num_bits(m) + BN_BITS2 - 1) / BN_BITS2; + r->top = (BN_num_bits(m) + BN_BITS2 - 1) / BN_BITS2; - return 1; + return 1; } - -/* RSA stuff Functions +/* + * RSA stuff Functions */ -#ifndef OPENSSL_NO_RSA -static int RSA_zencod_rsa_mod_exp ( BIGNUM *r0, const BIGNUM *i, RSA *rsa ) +# ifndef OPENSSL_NO_RSA +static int RSA_zencod_rsa_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa) { - CHEESE () ; - - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, ZENCOD_R_NOT_LOADED); - return 0; - } - - if ( !rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp ) { - ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, ZENCOD_R_BAD_KEY_COMPONENTS); - return 0; - } - - /* Do in software if argument is too large for hardware */ - if ( RSA_size(rsa) * 8 > ZENBRIDGE_MAX_KEYSIZE_RSA_CRT ) { - const RSA_METHOD *meth; - - meth = RSA_PKCS1_SSLeay(); - return meth->rsa_mod_exp(r0, i, rsa); - } else { - zen_nb_t y, x, p, q, dmp1, dmq1, iqmp; - - if ( !bn_expand(r0, RSA_size(rsa) * 8) ) { - ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, ZENCOD_R_BN_EXPAND_FAIL); - return 0; - } - r0->top = (RSA_size(rsa) * 8 + BN_BITS2 - 1) / BN_BITS2; - - BIGNUM2ZEN ( &x, i ) ; - BIGNUM2ZEN ( &y, r0 ) ; - BIGNUM2ZEN ( &p, rsa->p ) ; - BIGNUM2ZEN ( &q, rsa->q ) ; - BIGNUM2ZEN ( &dmp1, rsa->dmp1 ) ; - BIGNUM2ZEN ( &dmq1, rsa->dmq1 ) ; - BIGNUM2ZEN ( &iqmp, rsa->iqmp ) ; - - if ( ptr_zencod_rsa_mod_exp_crt ( &y, &x, &p, &q, &dmp1, &dmq1, &iqmp ) < 0 ) { - PERROR("zenbridge_rsa_mod_exp_crt"); - ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, ZENCOD_R_REQUEST_FAILED); - return 0; - } - - return 1; - } + CHEESE(); + + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, ZENCOD_R_NOT_LOADED); + return 0; + } + + if (!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp) { + ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, + ZENCOD_R_BAD_KEY_COMPONENTS); + return 0; + } + + /* Do in software if argument is too large for hardware */ + if (RSA_size(rsa) * 8 > ZENBRIDGE_MAX_KEYSIZE_RSA_CRT) { + const RSA_METHOD *meth; + + meth = RSA_PKCS1_SSLeay(); + return meth->rsa_mod_exp(r0, i, rsa); + } else { + zen_nb_t y, x, p, q, dmp1, dmq1, iqmp; + + if (!bn_expand(r0, RSA_size(rsa) * 8)) { + ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, + ZENCOD_R_BN_EXPAND_FAIL); + return 0; + } + r0->top = (RSA_size(rsa) * 8 + BN_BITS2 - 1) / BN_BITS2; + + BIGNUM2ZEN(&x, i); + BIGNUM2ZEN(&y, r0); + BIGNUM2ZEN(&p, rsa->p); + BIGNUM2ZEN(&q, rsa->q); + BIGNUM2ZEN(&dmp1, rsa->dmp1); + BIGNUM2ZEN(&dmq1, rsa->dmq1); + BIGNUM2ZEN(&iqmp, rsa->iqmp); + + if (ptr_zencod_rsa_mod_exp_crt(&y, &x, &p, &q, &dmp1, &dmq1, &iqmp) < + 0) { + PERROR("zenbridge_rsa_mod_exp_crt"); + ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, + ZENCOD_R_REQUEST_FAILED); + return 0; + } + + return 1; + } } - -/* This function is aliased to RSA_mod_exp (with the mont stuff dropped). +/* + * This function is aliased to RSA_mod_exp (with the mont stuff dropped). */ -static int RSA_zencod_bn_mod_exp ( BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx ) +static int RSA_zencod_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx) { - CHEESE () ; - - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP, ZENCOD_R_NOT_LOADED); - return 0; - } - - /* Do in software if argument is too large for hardware */ - if ( BN_num_bits(m) > ZENBRIDGE_MAX_KEYSIZE_RSA ) { - const RSA_METHOD *meth; - - meth = RSA_PKCS1_SSLeay(); - return meth->bn_mod_exp(r, a, p, m, ctx, m_ctx); - } else { - zen_nb_t y, x, e, n; - - if ( !bn_expand(r, BN_num_bits(m)) ) { - ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP, ZENCOD_R_BN_EXPAND_FAIL); - return 0; - } - r->top = (BN_num_bits(m) + BN_BITS2 - 1) / BN_BITS2; - - BIGNUM2ZEN ( &x, a ) ; - BIGNUM2ZEN ( &y, r ) ; - BIGNUM2ZEN ( &e, p ) ; - BIGNUM2ZEN ( &n, m ) ; - - if ( ptr_zencod_rsa_mod_exp ( &y, &x, &n, &e ) < 0 ) { - PERROR("zenbridge_rsa_mod_exp"); - ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP, ZENCOD_R_REQUEST_FAILED); - return 0; - } - - return 1; - } + CHEESE(); + + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP, ZENCOD_R_NOT_LOADED); + return 0; + } + + /* Do in software if argument is too large for hardware */ + if (BN_num_bits(m) > ZENBRIDGE_MAX_KEYSIZE_RSA) { + const RSA_METHOD *meth; + + meth = RSA_PKCS1_SSLeay(); + return meth->bn_mod_exp(r, a, p, m, ctx, m_ctx); + } else { + zen_nb_t y, x, e, n; + + if (!bn_expand(r, BN_num_bits(m))) { + ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP, ZENCOD_R_BN_EXPAND_FAIL); + return 0; + } + r->top = (BN_num_bits(m) + BN_BITS2 - 1) / BN_BITS2; + + BIGNUM2ZEN(&x, a); + BIGNUM2ZEN(&y, r); + BIGNUM2ZEN(&e, p); + BIGNUM2ZEN(&n, m); + + if (ptr_zencod_rsa_mod_exp(&y, &x, &n, &e) < 0) { + PERROR("zenbridge_rsa_mod_exp"); + ENGINEerr(ZENCOD_F_ZENCOD_RSA_MOD_EXP, ZENCOD_R_REQUEST_FAILED); + return 0; + } + + return 1; + } } -#endif /* !OPENSSL_NO_RSA */ - +# endif /* !OPENSSL_NO_RSA */ -#ifndef OPENSSL_NO_DSA -/* DSA stuff Functions +# ifndef OPENSSL_NO_DSA +/* + * DSA stuff Functions */ -static DSA_SIG *DSA_zencod_do_sign ( const unsigned char *dgst, int dlen, DSA *dsa ) +static DSA_SIG *DSA_zencod_do_sign(const unsigned char *dgst, int dlen, + DSA *dsa) { - zen_nb_t p, q, g, x, y, r, s, data; - DSA_SIG *sig; - BIGNUM *bn_r = NULL; - BIGNUM *bn_s = NULL; - char msg[20]; - - CHEESE(); - - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_NOT_LOADED); - goto FAILED; - } - - if ( dlen > 160 ) { - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); - goto FAILED; - } - - /* Do in software if argument is too large for hardware */ - if ( BN_num_bits(dsa->p) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN || - BN_num_bits(dsa->g) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN ) { - const DSA_METHOD *meth; - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BAD_KEY_COMPONENTS); - meth = DSA_OpenSSL(); - return meth->dsa_do_sign(dgst, dlen, dsa); - } - - if ( !(bn_s = BN_new()) || !(bn_r = BN_new()) ) { - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BAD_KEY_COMPONENTS); - goto FAILED; - } - - if ( !bn_expand(bn_r, 160) || !bn_expand(bn_s, 160) ) { - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BN_EXPAND_FAIL); - goto FAILED; - } - - bn_r->top = bn_s->top = (160 + BN_BITS2 - 1) / BN_BITS2; - BIGNUM2ZEN ( &p, dsa->p ) ; - BIGNUM2ZEN ( &q, dsa->q ) ; - BIGNUM2ZEN ( &g, dsa->g ) ; - BIGNUM2ZEN ( &x, dsa->priv_key ) ; - BIGNUM2ZEN ( &y, dsa->pub_key ) ; - BIGNUM2ZEN ( &r, bn_r ) ; - BIGNUM2ZEN ( &s, bn_s ) ; - q.len = x.len = 160; - - ypcmem(msg, dgst, 20); - ptr_zencod_init_number ( &data, 160, msg ) ; - - if ( ptr_zencod_dsa_do_sign ( 0, &data, &y, &p, &q, &g, &x, &r, &s ) < 0 ) { - PERROR("zenbridge_dsa_do_sign"); - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); - goto FAILED; - } - - if ( !( sig = DSA_SIG_new () ) ) { - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); - goto FAILED; - } - sig->r = bn_r; - sig->s = bn_s; - return sig; + zen_nb_t p, q, g, x, y, r, s, data; + DSA_SIG *sig; + BIGNUM *bn_r = NULL; + BIGNUM *bn_s = NULL; + char msg[20]; + + CHEESE(); + + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_NOT_LOADED); + goto FAILED; + } + + if (dlen > 160) { + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); + goto FAILED; + } + + /* Do in software if argument is too large for hardware */ + if (BN_num_bits(dsa->p) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN || + BN_num_bits(dsa->g) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN) { + const DSA_METHOD *meth; + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BAD_KEY_COMPONENTS); + meth = DSA_OpenSSL(); + return meth->dsa_do_sign(dgst, dlen, dsa); + } + + if (!(bn_s = BN_new()) || !(bn_r = BN_new())) { + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BAD_KEY_COMPONENTS); + goto FAILED; + } + + if (!bn_expand(bn_r, 160) || !bn_expand(bn_s, 160)) { + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BN_EXPAND_FAIL); + goto FAILED; + } + + bn_r->top = bn_s->top = (160 + BN_BITS2 - 1) / BN_BITS2; + BIGNUM2ZEN(&p, dsa->p); + BIGNUM2ZEN(&q, dsa->q); + BIGNUM2ZEN(&g, dsa->g); + BIGNUM2ZEN(&x, dsa->priv_key); + BIGNUM2ZEN(&y, dsa->pub_key); + BIGNUM2ZEN(&r, bn_r); + BIGNUM2ZEN(&s, bn_s); + q.len = x.len = 160; + + ypcmem(msg, dgst, 20); + ptr_zencod_init_number(&data, 160, msg); + + if (ptr_zencod_dsa_do_sign(0, &data, &y, &p, &q, &g, &x, &r, &s) < 0) { + PERROR("zenbridge_dsa_do_sign"); + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); + goto FAILED; + } + + if (!(sig = DSA_SIG_new())) { + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); + goto FAILED; + } + sig->r = bn_r; + sig->s = bn_s; + return sig; FAILED: - if (bn_r) - BN_free(bn_r); - if (bn_s) - BN_free(bn_s); - return NULL; + if (bn_r) + BN_free(bn_r); + if (bn_s) + BN_free(bn_s); + return NULL; } - -static int DSA_zencod_do_verify ( const unsigned char *dgst, int dlen, DSA_SIG *sig, DSA *dsa ) +static int DSA_zencod_do_verify(const unsigned char *dgst, int dlen, + DSA_SIG *sig, DSA *dsa) { - zen_nb_t data, p, q, g, y, r, s, v; - char msg[20]; - char v_data[20]; - int ret; - - CHEESE(); - - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_VERIFY, ZENCOD_R_NOT_LOADED); - return 0; - } - - if ( dlen > 160 ) { - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); - return 0; - } - - /* Do in software if argument is too large for hardware */ - if ( BN_num_bits(dsa->p) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN || - BN_num_bits(dsa->g) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN ) { - const DSA_METHOD *meth; - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BAD_KEY_COMPONENTS); - meth = DSA_OpenSSL(); - return meth->dsa_do_verify(dgst, dlen, sig, dsa); - } - - BIGNUM2ZEN ( &p, dsa->p ) ; - BIGNUM2ZEN ( &q, dsa->q ) ; - BIGNUM2ZEN ( &g, dsa->g ) ; - BIGNUM2ZEN ( &y, dsa->pub_key ) ; - BIGNUM2ZEN ( &r, sig->r ) ; - BIGNUM2ZEN ( &s, sig->s ) ; - ptr_zencod_init_number ( &v, 160, v_data ) ; - ypcmem(msg, dgst, 20); - ptr_zencod_init_number ( &data, 160, msg ) ; - - if ( ( ret = ptr_zencod_dsa_do_verify ( 0, &data, &p, &q, &g, &y, &r, &s, &v ) ) < 0 ) { - PERROR("zenbridge_dsa_do_verify"); - ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_VERIFY, ZENCOD_R_REQUEST_FAILED); - return 0; - } - - return ( ( ret == 0 ) ? 1 : ret ) ; + zen_nb_t data, p, q, g, y, r, s, v; + char msg[20]; + char v_data[20]; + int ret; + + CHEESE(); + + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_VERIFY, ZENCOD_R_NOT_LOADED); + return 0; + } + + if (dlen > 160) { + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_REQUEST_FAILED); + return 0; + } + + /* Do in software if argument is too large for hardware */ + if (BN_num_bits(dsa->p) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN || + BN_num_bits(dsa->g) > ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN) { + const DSA_METHOD *meth; + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_SIGN, ZENCOD_R_BAD_KEY_COMPONENTS); + meth = DSA_OpenSSL(); + return meth->dsa_do_verify(dgst, dlen, sig, dsa); + } + + BIGNUM2ZEN(&p, dsa->p); + BIGNUM2ZEN(&q, dsa->q); + BIGNUM2ZEN(&g, dsa->g); + BIGNUM2ZEN(&y, dsa->pub_key); + BIGNUM2ZEN(&r, sig->r); + BIGNUM2ZEN(&s, sig->s); + ptr_zencod_init_number(&v, 160, v_data); + ypcmem(msg, dgst, 20); + ptr_zencod_init_number(&data, 160, msg); + + if ((ret = + ptr_zencod_dsa_do_verify(0, &data, &p, &q, &g, &y, &r, &s, + &v)) < 0) { + PERROR("zenbridge_dsa_do_verify"); + ENGINEerr(ZENCOD_F_ZENCOD_DSA_DO_VERIFY, ZENCOD_R_REQUEST_FAILED); + return 0; + } + + return ((ret == 0) ? 1 : ret); } - -static int DSA_zencod_bn_mod_exp ( DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p, const BIGNUM *m, - BN_CTX *ctx, BN_MONT_CTX *m_ctx ) +static int DSA_zencod_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, + BN_CTX *ctx, BN_MONT_CTX *m_ctx) { - CHEESE () ; + CHEESE(); - return zencod_bn_mod_exp ( r, a, p, m, ctx ) ; + return zencod_bn_mod_exp(r, a, p, m, ctx); } -#endif /* !OPENSSL_NO_DSA */ +# endif /* !OPENSSL_NO_DSA */ - -#ifndef OPENSSl_NO_DH -/* DH stuff Functions +# ifndef OPENSSl_NO_DH +/* + * DH stuff Functions */ -static int DH_zencod_generate_key ( DH *dh ) +static int DH_zencod_generate_key(DH *dh) { - BIGNUM *bn_prv = NULL; - BIGNUM *bn_pub = NULL; - zen_nb_t y, x, g, p; - int generate_x; - - CHEESE(); - - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_NOT_LOADED); - return 0; - } - - /* Private key */ - if ( dh->priv_key ) { - bn_prv = dh->priv_key; - generate_x = 0; - } else { - if (!(bn_prv = BN_new())) { - ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_BN_EXPAND_FAIL); - goto FAILED; - } - generate_x = 1; - } - - /* Public key */ - if ( dh->pub_key ) - bn_pub = dh->pub_key; - else - if ( !( bn_pub = BN_new () ) ) { - ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_BN_EXPAND_FAIL); - goto FAILED; - } - - /* Expand */ - if ( !bn_wexpand ( bn_prv, dh->p->dmax ) || - !bn_wexpand ( bn_pub, dh->p->dmax ) ) { - ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_BN_EXPAND_FAIL); - goto FAILED; - } - bn_prv->top = dh->p->top; - bn_pub->top = dh->p->top; - - /* Convert all keys */ - BIGNUM2ZEN ( &p, dh->p ) ; - BIGNUM2ZEN ( &g, dh->g ) ; - BIGNUM2ZEN ( &y, bn_pub ) ; - BIGNUM2ZEN ( &x, bn_prv ) ; - x.len = DH_size(dh) * 8; - - /* Adjust the lengths of P and G */ - p.len = ptr_zencod_bytes2bits ( p.data, ZEN_BYTES ( p.len ) ) ; - g.len = ptr_zencod_bytes2bits ( g.data, ZEN_BYTES ( g.len ) ) ; - - /* Send the request to the driver */ - if ( ptr_zencod_dh_generate_key ( &y, &x, &g, &p, generate_x ) < 0 ) { - perror("zenbridge_dh_generate_key"); - ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_REQUEST_FAILED); - goto FAILED; - } - - dh->priv_key = bn_prv; - dh->pub_key = bn_pub; - - return 1; + BIGNUM *bn_prv = NULL; + BIGNUM *bn_pub = NULL; + zen_nb_t y, x, g, p; + int generate_x; + + CHEESE(); + + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_NOT_LOADED); + return 0; + } + + /* Private key */ + if (dh->priv_key) { + bn_prv = dh->priv_key; + generate_x = 0; + } else { + if (!(bn_prv = BN_new())) { + ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_BN_EXPAND_FAIL); + goto FAILED; + } + generate_x = 1; + } + + /* Public key */ + if (dh->pub_key) + bn_pub = dh->pub_key; + else if (!(bn_pub = BN_new())) { + ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_BN_EXPAND_FAIL); + goto FAILED; + } + + /* Expand */ + if (!bn_wexpand(bn_prv, dh->p->dmax) || !bn_wexpand(bn_pub, dh->p->dmax)) { + ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_BN_EXPAND_FAIL); + goto FAILED; + } + bn_prv->top = dh->p->top; + bn_pub->top = dh->p->top; + + /* Convert all keys */ + BIGNUM2ZEN(&p, dh->p); + BIGNUM2ZEN(&g, dh->g); + BIGNUM2ZEN(&y, bn_pub); + BIGNUM2ZEN(&x, bn_prv); + x.len = DH_size(dh) * 8; + + /* Adjust the lengths of P and G */ + p.len = ptr_zencod_bytes2bits(p.data, ZEN_BYTES(p.len)); + g.len = ptr_zencod_bytes2bits(g.data, ZEN_BYTES(g.len)); + + /* Send the request to the driver */ + if (ptr_zencod_dh_generate_key(&y, &x, &g, &p, generate_x) < 0) { + perror("zenbridge_dh_generate_key"); + ENGINEerr(ZENCOD_F_ZENCOD_DH_GENERATE, ZENCOD_R_REQUEST_FAILED); + goto FAILED; + } + + dh->priv_key = bn_prv; + dh->pub_key = bn_pub; + + return 1; FAILED: - if (!dh->priv_key && bn_prv) - BN_free(bn_prv); - if (!dh->pub_key && bn_pub) - BN_free(bn_pub); + if (!dh->priv_key && bn_prv) + BN_free(bn_prv); + if (!dh->pub_key && bn_pub) + BN_free(bn_pub); - return 0; + return 0; } - -static int DH_zencod_compute_key ( unsigned char *key, const BIGNUM *pub_key, DH *dh ) +static int DH_zencod_compute_key(unsigned char *key, const BIGNUM *pub_key, + DH *dh) { - zen_nb_t y, x, p, k; - - CHEESE(); - - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_DH_COMPUTE, ZENCOD_R_NOT_LOADED); - return 0; - } - - if ( !dh->priv_key ) { - ENGINEerr(ZENCOD_F_ZENCOD_DH_COMPUTE, ZENCOD_R_BAD_KEY_COMPONENTS); - return 0; - } - - /* Convert all keys */ - BIGNUM2ZEN ( &y, pub_key ) ; - BIGNUM2ZEN ( &x, dh->priv_key ) ; - BIGNUM2ZEN ( &p, dh->p ) ; - ptr_zencod_init_number ( &k, p.len, key ) ; - - /* Adjust the lengths */ - p.len = ptr_zencod_bytes2bits ( p.data, ZEN_BYTES ( p.len ) ) ; - y.len = ptr_zencod_bytes2bits ( y.data, ZEN_BYTES ( y.len ) ) ; - x.len = ptr_zencod_bytes2bits ( x.data, ZEN_BYTES ( x.len ) ) ; - - /* Call the hardware */ - if ( ptr_zencod_dh_compute_key ( &k, &y, &x, &p ) < 0 ) { - ENGINEerr(ZENCOD_F_ZENCOD_DH_COMPUTE, ZENCOD_R_REQUEST_FAILED); - return 0; - } - - /* The key must be written MSB -> LSB */ - k.len = ptr_zencod_bytes2bits ( k.data, ZEN_BYTES ( k.len ) ) ; - esrever ( key, ZEN_BYTES ( k.len ) ) ; - - return ZEN_BYTES ( k.len ) ; + zen_nb_t y, x, p, k; + + CHEESE(); + + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_DH_COMPUTE, ZENCOD_R_NOT_LOADED); + return 0; + } + + if (!dh->priv_key) { + ENGINEerr(ZENCOD_F_ZENCOD_DH_COMPUTE, ZENCOD_R_BAD_KEY_COMPONENTS); + return 0; + } + + /* Convert all keys */ + BIGNUM2ZEN(&y, pub_key); + BIGNUM2ZEN(&x, dh->priv_key); + BIGNUM2ZEN(&p, dh->p); + ptr_zencod_init_number(&k, p.len, key); + + /* Adjust the lengths */ + p.len = ptr_zencod_bytes2bits(p.data, ZEN_BYTES(p.len)); + y.len = ptr_zencod_bytes2bits(y.data, ZEN_BYTES(y.len)); + x.len = ptr_zencod_bytes2bits(x.data, ZEN_BYTES(x.len)); + + /* Call the hardware */ + if (ptr_zencod_dh_compute_key(&k, &y, &x, &p) < 0) { + ENGINEerr(ZENCOD_F_ZENCOD_DH_COMPUTE, ZENCOD_R_REQUEST_FAILED); + return 0; + } + + /* The key must be written MSB -> LSB */ + k.len = ptr_zencod_bytes2bits(k.data, ZEN_BYTES(k.len)); + esrever(key, ZEN_BYTES(k.len)); + + return ZEN_BYTES(k.len); } - -static int DH_zencod_bn_mod_exp ( const DH *dh, BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, - BN_MONT_CTX *m_ctx ) +static int DH_zencod_bn_mod_exp(const DH *dh, BIGNUM *r, const BIGNUM *a, + const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *m_ctx) { - CHEESE () ; + CHEESE(); - return zencod_bn_mod_exp ( r, a, p, m, ctx ) ; + return zencod_bn_mod_exp(r, a, p, m, ctx); } -#endif /* !OPENSSL_NO_DH */ - +# endif /* !OPENSSL_NO_DH */ -/* RAND stuff Functions +/* + * RAND stuff Functions */ -static void RAND_zencod_seed ( const void *buf, int num ) +static void RAND_zencod_seed(const void *buf, int num) { - /* Nothing to do cause our crypto accelerator provide a true random generator */ + /* + * Nothing to do cause our crypto accelerator provide a true random + * generator + */ } - -static int RAND_zencod_rand_bytes ( unsigned char *buf, int num ) +static int RAND_zencod_rand_bytes(unsigned char *buf, int num) { - zen_nb_t r; + zen_nb_t r; - CHEESE(); + CHEESE(); - if ( !zencod_dso ) { - ENGINEerr(ZENCOD_F_ZENCOD_RAND, ZENCOD_R_NOT_LOADED); - return 0; - } + if (!zencod_dso) { + ENGINEerr(ZENCOD_F_ZENCOD_RAND, ZENCOD_R_NOT_LOADED); + return 0; + } - ptr_zencod_init_number ( &r, num * 8, buf ) ; + ptr_zencod_init_number(&r, num * 8, buf); - if ( ptr_zencod_rand_bytes ( &r, ZENBRIDGE_RNG_DIRECT ) < 0 ) { - PERROR("zenbridge_rand_bytes"); - ENGINEerr(ZENCOD_F_ZENCOD_RAND, ZENCOD_R_REQUEST_FAILED); - return 0; - } + if (ptr_zencod_rand_bytes(&r, ZENBRIDGE_RNG_DIRECT) < 0) { + PERROR("zenbridge_rand_bytes"); + ENGINEerr(ZENCOD_F_ZENCOD_RAND, ZENCOD_R_REQUEST_FAILED); + return 0; + } - return 1; + return 1; } - -static int RAND_zencod_rand_status ( void ) +static int RAND_zencod_rand_status(void) { - CHEESE () ; + CHEESE(); - return 1; + return 1; } - -/* This stuff is needed if this ENGINE is being compiled into a self-contained - * shared-library. +/* + * This stuff is needed if this ENGINE is being compiled into a + * self-contained shared-library. */ -#ifdef ENGINE_DYNAMIC_SUPPORT -static int bind_fn ( ENGINE *e, const char *id ) +# ifdef ENGINE_DYNAMIC_SUPPORT +static int bind_fn(ENGINE *e, const char *id) { - if ( id && ( strcmp ( id, engine_zencod_id ) != 0 ) ) { - return 0 ; - } - if ( !bind_helper ( e ) ) { - return 0 ; - } + if (id && (strcmp(id, engine_zencod_id) != 0)) { + return 0; + } + if (!bind_helper(e)) { + return 0; + } - return 1 ; + return 1; } -IMPLEMENT_DYNAMIC_CHECK_FN () -IMPLEMENT_DYNAMIC_BIND_FN ( bind_fn ) -#endif /* ENGINE_DYNAMIC_SUPPORT */ - - - - -/* - * Adding "Digest" and "Cipher" tools ... - * This is in development ... ;-) - * In orfer to code this, i refer to hw_openbsd_dev_crypto and openssl engine made by Geoff Thorpe (if i'm rigth), - * and evp, sha md5 definitions etc ... - */ +IMPLEMENT_DYNAMIC_CHECK_FN() + IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) +# endif /* ENGINE_DYNAMIC_SUPPORT */ + /* + * Adding "Digest" and "Cipher" tools ... + * This is in development ... ;-) + * In orfer to code this, i refer to hw_openbsd_dev_crypto and openssl engine made by Geoff Thorpe (if i'm rigth), + * and evp, sha md5 definitions etc ... + */ /* First add some include ... */ -#include -#include -#include -#include -#include - - +# include +# include +# include +# include +# include /* Some variables declaration ... */ -/* DONS: - * Disable symetric computation except DES and 3DES, but let part of the code - */ + /* + * DONS: Disable symetric computation except DES and 3DES, but let part + * of the code + */ /* static int engine_digest_nids [ ] = { NID_sha1, NID_md5 } ; */ -static int engine_digest_nids [ ] = { } ; -static int engine_digest_nids_num = 0 ; -/* static int engine_cipher_nids [ ] = { NID_rc4, NID_rc4_40, NID_des_cbc, NID_des_ede3_cbc } ; */ -static int engine_cipher_nids [ ] = { NID_des_cbc, NID_des_ede3_cbc } ; -static int engine_cipher_nids_num = 2 ; +static int engine_digest_nids[] = { }; +static int engine_digest_nids_num = 0; +/* + * static int engine_cipher_nids [ ] = { NID_rc4, NID_rc4_40, NID_des_cbc, + * NID_des_ede3_cbc } ; + */ +static int engine_cipher_nids[] = { NID_des_cbc, NID_des_ede3_cbc }; + +static int engine_cipher_nids_num = 2; /* Function prototype ... */ /* SHA stuff */ -static int engine_sha1_init ( EVP_MD_CTX *ctx ) ; -static int engine_sha1_update ( EVP_MD_CTX *ctx, const void *data, unsigned long count ) ; -static int engine_sha1_final ( EVP_MD_CTX *ctx, unsigned char *md ) ; +static int engine_sha1_init(EVP_MD_CTX *ctx); +static int engine_sha1_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count); +static int engine_sha1_final(EVP_MD_CTX *ctx, unsigned char *md); /* MD5 stuff */ -static int engine_md5_init ( EVP_MD_CTX *ctx ) ; -static int engine_md5_update ( EVP_MD_CTX *ctx, const void *data, unsigned long count ) ; -static int engine_md5_final ( EVP_MD_CTX *ctx, unsigned char *md ) ; - -static int engine_md_cleanup ( EVP_MD_CTX *ctx ) ; -static int engine_md_copy ( EVP_MD_CTX *to, const EVP_MD_CTX *from ) ; +static int engine_md5_init(EVP_MD_CTX *ctx); +static int engine_md5_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count); +static int engine_md5_final(EVP_MD_CTX *ctx, unsigned char *md); +static int engine_md_cleanup(EVP_MD_CTX *ctx); +static int engine_md_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from); /* RC4 Stuff */ -static int engine_rc4_init_key ( EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc ) ; -static int engine_rc4_cipher ( EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl ) ; +static int engine_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc); +static int engine_rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, unsigned int inl); /* DES Stuff */ -static int engine_des_init_key ( EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc ) ; -static int engine_des_cbc_cipher ( EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl ) ; +static int engine_des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc); +static int engine_des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, unsigned int inl); /* 3DES Stuff */ -static int engine_des_ede3_init_key ( EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc ) ; -static int engine_des_ede3_cbc_cipher ( EVP_CIPHER_CTX *ctx, unsigned char *out,const unsigned char *in, unsigned int inl ) ; - -static int engine_cipher_cleanup ( EVP_CIPHER_CTX *ctx ) ; /* cleanup ctx */ +static int engine_des_ede3_init_key(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc); +static int engine_des_ede3_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, + unsigned int inl); +static int engine_cipher_cleanup(EVP_CIPHER_CTX *ctx); /* cleanup ctx */ /* The one for SHA ... */ -static const EVP_MD engine_sha1_md = -{ - NID_sha1, - NID_sha1WithRSAEncryption, - SHA_DIGEST_LENGTH, - EVP_MD_FLAG_ONESHOT, - /* 0, */ /* EVP_MD_FLAG_ONESHOT = x0001 digest can only handle a single block - * XXX: set according to device info ... */ - engine_sha1_init, - engine_sha1_update, - engine_sha1_final, - engine_md_copy, /* dev_crypto_sha_copy */ - engine_md_cleanup, /* dev_crypto_sha_cleanup */ - EVP_PKEY_RSA_method, - SHA_CBLOCK, - /* sizeof ( EVP_MD * ) + sizeof ( SHA_CTX ) */ - sizeof ( ZEN_MD_DATA ) - /* sizeof ( MD_CTX_DATA ) The message digest data structure ... */ -} ; +static const EVP_MD engine_sha1_md = { + NID_sha1, + NID_sha1WithRSAEncryption, + SHA_DIGEST_LENGTH, + EVP_MD_FLAG_ONESHOT, + /* + * 0, + *//* + * EVP_MD_FLAG_ONESHOT = x0001 digest can only handle a single block * + * XXX: set according to device info ... + */ + engine_sha1_init, + engine_sha1_update, + engine_sha1_final, + engine_md_copy, /* dev_crypto_sha_copy */ + engine_md_cleanup, /* dev_crypto_sha_cleanup */ + EVP_PKEY_RSA_method, + SHA_CBLOCK, + /* sizeof ( EVP_MD * ) + sizeof ( SHA_CTX ) */ + sizeof(ZEN_MD_DATA) + /* + * sizeof ( MD_CTX_DATA ) The message digest data structure ... + */ +}; /* The one for MD5 ... */ -static const EVP_MD engine_md5_md = -{ - NID_md5, - NID_md5WithRSAEncryption, - MD5_DIGEST_LENGTH, - EVP_MD_FLAG_ONESHOT, - /* 0, */ /* EVP_MD_FLAG_ONESHOT = x0001 digest can only handle a single block - * XXX: set according to device info ... */ - engine_md5_init, - engine_md5_update, - engine_md5_final, - engine_md_copy, /* dev_crypto_md5_copy */ - engine_md_cleanup, /* dev_crypto_md5_cleanup */ - EVP_PKEY_RSA_method, - MD5_CBLOCK, - /* sizeof ( EVP_MD * ) + sizeof ( MD5_CTX ) */ - sizeof ( ZEN_MD_DATA ) - /* sizeof ( MD_CTX_DATA ) The message digest data structure ... */ -} ; - +static const EVP_MD engine_md5_md = { + NID_md5, + NID_md5WithRSAEncryption, + MD5_DIGEST_LENGTH, + EVP_MD_FLAG_ONESHOT, + /* + * 0, + *//* + * EVP_MD_FLAG_ONESHOT = x0001 digest can only handle a single block * + * XXX: set according to device info ... + */ + engine_md5_init, + engine_md5_update, + engine_md5_final, + engine_md_copy, /* dev_crypto_md5_copy */ + engine_md_cleanup, /* dev_crypto_md5_cleanup */ + EVP_PKEY_RSA_method, + MD5_CBLOCK, + /* sizeof ( EVP_MD * ) + sizeof ( MD5_CTX ) */ + sizeof(ZEN_MD_DATA) + /* + * sizeof ( MD_CTX_DATA ) The message digest data structure ... + */ +}; /* The one for RC4 ... */ -#define EVP_RC4_KEY_SIZE 16 +# define EVP_RC4_KEY_SIZE 16 /* Try something static ... */ -typedef struct -{ - unsigned int len ; - unsigned int first ; - unsigned char rc4_state [ 260 ] ; -} NEW_ZEN_RC4_KEY ; - -#define rc4_data(ctx) ( (EVP_RC4_KEY *) ( ctx )->cipher_data ) - -static const EVP_CIPHER engine_rc4 = -{ - NID_rc4, - 1, - 16, /* EVP_RC4_KEY_SIZE should be 128 bits */ - 0, /* FIXME: key should be up to 256 bytes */ - EVP_CIPH_VARIABLE_LENGTH, - engine_rc4_init_key, - engine_rc4_cipher, - engine_cipher_cleanup, - sizeof ( NEW_ZEN_RC4_KEY ), - NULL, - NULL, - NULL -} ; +typedef struct { + unsigned int len; + unsigned int first; + unsigned char rc4_state[260]; +} NEW_ZEN_RC4_KEY; + +# define rc4_data(ctx) ( (EVP_RC4_KEY *) ( ctx )->cipher_data ) + +static const EVP_CIPHER engine_rc4 = { + NID_rc4, + 1, + 16, /* EVP_RC4_KEY_SIZE should be 128 bits */ + 0, /* FIXME: key should be up to 256 bytes */ + EVP_CIPH_VARIABLE_LENGTH, + engine_rc4_init_key, + engine_rc4_cipher, + engine_cipher_cleanup, + sizeof(NEW_ZEN_RC4_KEY), + NULL, + NULL, + NULL +}; /* The one for RC4_40 ... */ -static const EVP_CIPHER engine_rc4_40 = -{ - NID_rc4_40, - 1, - 5, /* 40 bits */ - 0, - EVP_CIPH_VARIABLE_LENGTH, - engine_rc4_init_key, - engine_rc4_cipher, - engine_cipher_cleanup, - sizeof ( NEW_ZEN_RC4_KEY ), - NULL, - NULL, - NULL -} ; +static const EVP_CIPHER engine_rc4_40 = { + NID_rc4_40, + 1, + 5, /* 40 bits */ + 0, + EVP_CIPH_VARIABLE_LENGTH, + engine_rc4_init_key, + engine_rc4_cipher, + engine_cipher_cleanup, + sizeof(NEW_ZEN_RC4_KEY), + NULL, + NULL, + NULL +}; /* The one for DES ... */ /* Try something static ... */ -typedef struct -{ - unsigned char des_key [ 24 ] ; - unsigned char des_iv [ 8 ] ; -} ZEN_DES_KEY ; - -static const EVP_CIPHER engine_des_cbc = - { - NID_des_cbc, - 8, 8, 8, - 0 | EVP_CIPH_CBC_MODE, - engine_des_init_key, - engine_des_cbc_cipher, - engine_cipher_cleanup, - sizeof(ZEN_DES_KEY), - EVP_CIPHER_set_asn1_iv, - EVP_CIPHER_get_asn1_iv, - NULL, - NULL - }; +typedef struct { + unsigned char des_key[24]; + unsigned char des_iv[8]; +} ZEN_DES_KEY; + +static const EVP_CIPHER engine_des_cbc = { + NID_des_cbc, + 8, 8, 8, + 0 | EVP_CIPH_CBC_MODE, + engine_des_init_key, + engine_des_cbc_cipher, + engine_cipher_cleanup, + sizeof(ZEN_DES_KEY), + EVP_CIPHER_set_asn1_iv, + EVP_CIPHER_get_asn1_iv, + NULL, + NULL +}; /* The one for 3DES ... */ /* Try something static ... */ -typedef struct -{ - unsigned char des3_key [ 24 ] ; - unsigned char des3_iv [ 8 ] ; -} ZEN_3DES_KEY ; - -#define des_data(ctx) ( (DES_EDE_KEY *) ( ctx )->cipher_data ) - -static const EVP_CIPHER engine_des_ede3_cbc = - { - NID_des_ede3_cbc, - 8, 8, 8, - 0 | EVP_CIPH_CBC_MODE, - engine_des_ede3_init_key, - engine_des_ede3_cbc_cipher, - engine_cipher_cleanup, - sizeof(ZEN_3DES_KEY), - EVP_CIPHER_set_asn1_iv, - EVP_CIPHER_get_asn1_iv, - NULL, - NULL - }; - +typedef struct { + unsigned char des3_key[24]; + unsigned char des3_iv[8]; +} ZEN_3DES_KEY; + +# define des_data(ctx) ( (DES_EDE_KEY *) ( ctx )->cipher_data ) + +static const EVP_CIPHER engine_des_ede3_cbc = { + NID_des_ede3_cbc, + 8, 8, 8, + 0 | EVP_CIPH_CBC_MODE, + engine_des_ede3_init_key, + engine_des_ede3_cbc_cipher, + engine_cipher_cleanup, + sizeof(ZEN_3DES_KEY), + EVP_CIPHER_set_asn1_iv, + EVP_CIPHER_get_asn1_iv, + NULL, + NULL +}; /* General function cloned on hw_openbsd_dev_crypto one ... */ -static int engine_digests ( ENGINE *e, const EVP_MD **digest, const int **nids, int nid ) +static int engine_digests(ENGINE *e, const EVP_MD **digest, const int **nids, + int nid) { -#ifdef DEBUG_ZENCOD_MD - fprintf ( stderr, "\t=>Function : static int engine_digests () called !\n" ) ; -#endif - - if ( !digest ) { - /* We are returning a list of supported nids */ - *nids = engine_digest_nids ; - return engine_digest_nids_num ; - } - /* We are being asked for a specific digest */ - if ( nid == NID_md5 ) { - *digest = &engine_md5_md ; - } - else if ( nid == NID_sha1 ) { - *digest = &engine_sha1_md ; - } - else { - *digest = NULL ; - return 0 ; - } - return 1 ; +# ifdef DEBUG_ZENCOD_MD + fprintf(stderr, "\t=>Function : static int engine_digests () called !\n"); +# endif + + if (!digest) { + /* We are returning a list of supported nids */ + *nids = engine_digest_nids; + return engine_digest_nids_num; + } + /* We are being asked for a specific digest */ + if (nid == NID_md5) { + *digest = &engine_md5_md; + } else if (nid == NID_sha1) { + *digest = &engine_sha1_md; + } else { + *digest = NULL; + return 0; + } + return 1; } - -/* SHA stuff Functions +/* + * SHA stuff Functions */ -static int engine_sha1_init ( EVP_MD_CTX *ctx ) +static int engine_sha1_init(EVP_MD_CTX *ctx) { - int to_return = 0 ; + int to_return = 0; - /* Test with zenbridge library ... */ - to_return = ptr_zencod_sha1_init ( (ZEN_MD_DATA *) ctx->md_data ) ; - to_return = !to_return ; + /* Test with zenbridge library ... */ + to_return = ptr_zencod_sha1_init((ZEN_MD_DATA *)ctx->md_data); + to_return = !to_return; - return to_return ; + return to_return; } - -static int engine_sha1_update ( EVP_MD_CTX *ctx, const void *data, unsigned long count ) +static int engine_sha1_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count) { - zen_nb_t input ; - int to_return = 0 ; + zen_nb_t input; + int to_return = 0; - /* Convert parameters ... */ - input.len = count ; - input.data = (unsigned char *) data ; + /* Convert parameters ... */ + input.len = count; + input.data = (unsigned char *)data; - /* Test with zenbridge library ... */ - to_return = ptr_zencod_sha1_update ( (ZEN_MD_DATA *) ctx->md_data, (const zen_nb_t *) &input ) ; - to_return = !to_return ; + /* Test with zenbridge library ... */ + to_return = + ptr_zencod_sha1_update((ZEN_MD_DATA *)ctx->md_data, + (const zen_nb_t *)&input); + to_return = !to_return; - return to_return ; + return to_return; } - -static int engine_sha1_final ( EVP_MD_CTX *ctx, unsigned char *md ) +static int engine_sha1_final(EVP_MD_CTX *ctx, unsigned char *md) { - zen_nb_t output ; - int to_return = 0 ; + zen_nb_t output; + int to_return = 0; - /* Convert parameters ... */ - output.len = SHA_DIGEST_LENGTH ; - output.data = md ; + /* Convert parameters ... */ + output.len = SHA_DIGEST_LENGTH; + output.data = md; - /* Test with zenbridge library ... */ - to_return = ptr_zencod_sha1_do_final ( (ZEN_MD_DATA *) ctx->md_data, (zen_nb_t *) &output ) ; - to_return = !to_return ; + /* Test with zenbridge library ... */ + to_return = + ptr_zencod_sha1_do_final((ZEN_MD_DATA *)ctx->md_data, + (zen_nb_t *) & output); + to_return = !to_return; - return to_return ; + return to_return; } - - -/* MD5 stuff Functions +/* + * MD5 stuff Functions */ -static int engine_md5_init ( EVP_MD_CTX *ctx ) +static int engine_md5_init(EVP_MD_CTX *ctx) { - int to_return = 0 ; + int to_return = 0; - /* Test with zenbridge library ... */ - to_return = ptr_zencod_md5_init ( (ZEN_MD_DATA *) ctx->md_data ) ; - to_return = !to_return ; + /* Test with zenbridge library ... */ + to_return = ptr_zencod_md5_init((ZEN_MD_DATA *)ctx->md_data); + to_return = !to_return; - return to_return ; + return to_return; } - -static int engine_md5_update ( EVP_MD_CTX *ctx, const void *data, unsigned long count ) +static int engine_md5_update(EVP_MD_CTX *ctx, const void *data, + unsigned long count) { - zen_nb_t input ; - int to_return = 0 ; + zen_nb_t input; + int to_return = 0; - /* Convert parameters ... */ - input.len = count ; - input.data = (unsigned char *) data ; + /* Convert parameters ... */ + input.len = count; + input.data = (unsigned char *)data; - /* Test with zenbridge library ... */ - to_return = ptr_zencod_md5_update ( (ZEN_MD_DATA *) ctx->md_data, (const zen_nb_t *) &input ) ; - to_return = !to_return ; + /* Test with zenbridge library ... */ + to_return = + ptr_zencod_md5_update((ZEN_MD_DATA *)ctx->md_data, + (const zen_nb_t *)&input); + to_return = !to_return; - return to_return ; + return to_return; } - -static int engine_md5_final ( EVP_MD_CTX *ctx, unsigned char *md ) +static int engine_md5_final(EVP_MD_CTX *ctx, unsigned char *md) { - zen_nb_t output ; - int to_return = 0 ; + zen_nb_t output; + int to_return = 0; - /* Convert parameters ... */ - output.len = MD5_DIGEST_LENGTH ; - output.data = md ; + /* Convert parameters ... */ + output.len = MD5_DIGEST_LENGTH; + output.data = md; - /* Test with zenbridge library ... */ - to_return = ptr_zencod_md5_do_final ( (ZEN_MD_DATA *) ctx->md_data, (zen_nb_t *) &output ) ; - to_return = !to_return ; + /* Test with zenbridge library ... */ + to_return = + ptr_zencod_md5_do_final((ZEN_MD_DATA *)ctx->md_data, + (zen_nb_t *) & output); + to_return = !to_return; - return to_return ; + return to_return; } - -static int engine_md_cleanup ( EVP_MD_CTX *ctx ) +static int engine_md_cleanup(EVP_MD_CTX *ctx) { - ZEN_MD_DATA *zen_md_data = (ZEN_MD_DATA *) ctx->md_data ; + ZEN_MD_DATA *zen_md_data = (ZEN_MD_DATA *)ctx->md_data; - if ( zen_md_data->HashBuffer != NULL ) { - OPENSSL_free ( zen_md_data->HashBuffer ) ; - zen_md_data->HashBufferSize = 0 ; - ctx->md_data = NULL ; - } + if (zen_md_data->HashBuffer != NULL) { + OPENSSL_free(zen_md_data->HashBuffer); + zen_md_data->HashBufferSize = 0; + ctx->md_data = NULL; + } - return 1 ; + return 1; } - -static int engine_md_copy ( EVP_MD_CTX *to, const EVP_MD_CTX *from ) +static int engine_md_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) { - const ZEN_MD_DATA *from_md = (ZEN_MD_DATA *) from->md_data ; - ZEN_MD_DATA *to_md = (ZEN_MD_DATA *) to->md_data ; + const ZEN_MD_DATA *from_md = (ZEN_MD_DATA *)from->md_data; + ZEN_MD_DATA *to_md = (ZEN_MD_DATA *)to->md_data; - to_md->HashBuffer = OPENSSL_malloc ( from_md->HashBufferSize ) ; - memcpy ( to_md->HashBuffer, from_md->HashBuffer, from_md->HashBufferSize ) ; + to_md->HashBuffer = OPENSSL_malloc(from_md->HashBufferSize); + memcpy(to_md->HashBuffer, from_md->HashBuffer, from_md->HashBufferSize); - return 1; + return 1; } - /* General function cloned on hw_openbsd_dev_crypto one ... */ -static int engine_ciphers ( ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid ) +static int engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, + const int **nids, int nid) { - if ( !cipher ) { - /* We are returning a list of supported nids */ - *nids = engine_cipher_nids ; - return engine_cipher_nids_num ; - } - /* We are being asked for a specific cipher */ - if ( nid == NID_rc4 ) { - *cipher = &engine_rc4 ; - } - else if ( nid == NID_rc4_40 ) { - *cipher = &engine_rc4_40 ; - } - else if ( nid == NID_des_cbc ) { - *cipher = &engine_des_cbc ; - } - else if ( nid == NID_des_ede3_cbc ) { - *cipher = &engine_des_ede3_cbc ; - } - else { - *cipher = NULL ; - return 0 ; - } - - return 1 ; + if (!cipher) { + /* We are returning a list of supported nids */ + *nids = engine_cipher_nids; + return engine_cipher_nids_num; + } + /* We are being asked for a specific cipher */ + if (nid == NID_rc4) { + *cipher = &engine_rc4; + } else if (nid == NID_rc4_40) { + *cipher = &engine_rc4_40; + } else if (nid == NID_des_cbc) { + *cipher = &engine_des_cbc; + } else if (nid == NID_des_ede3_cbc) { + *cipher = &engine_des_ede3_cbc; + } else { + *cipher = NULL; + return 0; + } + + return 1; } - -static int engine_rc4_init_key ( EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc ) +static int engine_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) { - int to_return = 0 ; - int i = 0 ; - int nb = 0 ; - NEW_ZEN_RC4_KEY *tmp_rc4_key = NULL ; - - tmp_rc4_key = (NEW_ZEN_RC4_KEY *) ( ctx->cipher_data ) ; - tmp_rc4_key->first = 0 ; - tmp_rc4_key->len = ctx->key_len ; - tmp_rc4_key->rc4_state [ 0 ] = 0x00 ; - tmp_rc4_key->rc4_state [ 2 ] = 0x00 ; - nb = 256 / ctx->key_len ; - for ( i = 0; i < nb ; i++ ) { - memcpy ( &( tmp_rc4_key->rc4_state [ 4 + i*ctx->key_len ] ), key, ctx->key_len ) ; - } - - to_return = 1 ; - - return to_return ; + int to_return = 0; + int i = 0; + int nb = 0; + NEW_ZEN_RC4_KEY *tmp_rc4_key = NULL; + + tmp_rc4_key = (NEW_ZEN_RC4_KEY *) (ctx->cipher_data); + tmp_rc4_key->first = 0; + tmp_rc4_key->len = ctx->key_len; + tmp_rc4_key->rc4_state[0] = 0x00; + tmp_rc4_key->rc4_state[2] = 0x00; + nb = 256 / ctx->key_len; + for (i = 0; i < nb; i++) { + memcpy(&(tmp_rc4_key->rc4_state[4 + i * ctx->key_len]), key, + ctx->key_len); + } + + to_return = 1; + + return to_return; } - -static int engine_rc4_cipher ( EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int in_len ) +static int engine_rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, unsigned int in_len) { - zen_nb_t output, input ; - zen_nb_t rc4key ; - int to_return = 0 ; - NEW_ZEN_RC4_KEY *tmp_rc4_key = NULL ; - - /* Convert parameters ... */ - input.len = in_len ; - input.data = (unsigned char *) in ; - output.len = in_len ; - output.data = (unsigned char *) out ; - - tmp_rc4_key = ( (NEW_ZEN_RC4_KEY *) ( ctx->cipher_data ) ) ; - rc4key.len = 260 ; - rc4key.data = &( tmp_rc4_key->rc4_state [ 0 ] ) ; - - /* Test with zenbridge library ... */ - to_return = ptr_zencod_rc4_cipher ( &output, &input, (const zen_nb_t *) &rc4key, &( tmp_rc4_key->rc4_state [0] ), &( tmp_rc4_key->rc4_state [3] ), !tmp_rc4_key->first ) ; - to_return = !to_return ; - - /* Update encryption state ... */ - tmp_rc4_key->first = 1 ; - tmp_rc4_key = NULL ; - - return to_return ; + zen_nb_t output, input; + zen_nb_t rc4key; + int to_return = 0; + NEW_ZEN_RC4_KEY *tmp_rc4_key = NULL; + + /* Convert parameters ... */ + input.len = in_len; + input.data = (unsigned char *)in; + output.len = in_len; + output.data = (unsigned char *)out; + + tmp_rc4_key = ((NEW_ZEN_RC4_KEY *) (ctx->cipher_data)); + rc4key.len = 260; + rc4key.data = &(tmp_rc4_key->rc4_state[0]); + + /* Test with zenbridge library ... */ + to_return = + ptr_zencod_rc4_cipher(&output, &input, (const zen_nb_t *)&rc4key, + &(tmp_rc4_key->rc4_state[0]), + &(tmp_rc4_key->rc4_state[3]), + !tmp_rc4_key->first); + to_return = !to_return; + + /* Update encryption state ... */ + tmp_rc4_key->first = 1; + tmp_rc4_key = NULL; + + return to_return; } - -static int engine_des_init_key ( EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc ) +static int engine_des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) { - ZEN_DES_KEY *tmp_des_key = NULL ; - int to_return = 0 ; + ZEN_DES_KEY *tmp_des_key = NULL; + int to_return = 0; - tmp_des_key = (ZEN_DES_KEY *) ( ctx->cipher_data ) ; - memcpy ( &( tmp_des_key->des_key [ 0 ] ), key, 8 ) ; - memcpy ( &( tmp_des_key->des_key [ 8 ] ), key, 8 ) ; - memcpy ( &( tmp_des_key->des_key [ 16 ] ), key, 8 ) ; - memcpy ( &( tmp_des_key->des_iv [ 0 ] ), iv, 8 ) ; + tmp_des_key = (ZEN_DES_KEY *) (ctx->cipher_data); + memcpy(&(tmp_des_key->des_key[0]), key, 8); + memcpy(&(tmp_des_key->des_key[8]), key, 8); + memcpy(&(tmp_des_key->des_key[16]), key, 8); + memcpy(&(tmp_des_key->des_iv[0]), iv, 8); - to_return = 1 ; + to_return = 1; - return to_return ; + return to_return; } - -static int engine_des_cbc_cipher ( EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl ) +static int engine_des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, unsigned int inl) { - zen_nb_t output, input ; - zen_nb_t deskey_1, deskey_2, deskey_3, iv ; - int to_return = 0 ; - - /* Convert parameters ... */ - input.len = inl ; - input.data = (unsigned char *) in ; - output.len = inl ; - output.data = out ; - - /* Set key parameters ... */ - deskey_1.len = 8 ; - deskey_2.len = 8 ; - deskey_3.len = 8 ; - deskey_1.data = (unsigned char *) ( (ZEN_DES_KEY *) ( ctx->cipher_data ) )->des_key ; - deskey_2.data = (unsigned char *) &( (ZEN_DES_KEY *) ( ctx->cipher_data ) )->des_key [ 8 ] ; - deskey_3.data = (unsigned char *) &( (ZEN_DES_KEY *) ( ctx->cipher_data ) )->des_key [ 16 ] ; - - /* Key correct iv ... */ - memcpy ( ( (ZEN_DES_KEY *) ( ctx->cipher_data ) )->des_iv, ctx->iv, 8 ) ; - iv.len = 8 ; - iv.data = (unsigned char *) ( (ZEN_DES_KEY *) ( ctx->cipher_data ) )->des_iv ; - - if ( ctx->encrypt == 0 ) { - memcpy ( ctx->iv, &( input.data [ input.len - 8 ] ), 8 ) ; - } - - /* Test with zenbridge library ... */ - to_return = ptr_zencod_xdes_cipher ( &output, &input, - (zen_nb_t *) &deskey_1, (zen_nb_t *) &deskey_2, (zen_nb_t *) &deskey_3, &iv, ctx->encrypt ) ; - to_return = !to_return ; - - /* But we need to set up the rigth iv ... - * Test ENCRYPT or DECRYPT mode to set iv ... */ - if ( ctx->encrypt == 1 ) { - memcpy ( ctx->iv, &( output.data [ output.len - 8 ] ), 8 ) ; - } - - return to_return ; + zen_nb_t output, input; + zen_nb_t deskey_1, deskey_2, deskey_3, iv; + int to_return = 0; + + /* Convert parameters ... */ + input.len = inl; + input.data = (unsigned char *)in; + output.len = inl; + output.data = out; + + /* Set key parameters ... */ + deskey_1.len = 8; + deskey_2.len = 8; + deskey_3.len = 8; + deskey_1.data = + (unsigned char *)((ZEN_DES_KEY *) (ctx->cipher_data))->des_key; + deskey_2.data = + (unsigned char *)&((ZEN_DES_KEY *) (ctx->cipher_data))->des_key[8]; + deskey_3.data = + (unsigned char *)&((ZEN_DES_KEY *) (ctx->cipher_data))->des_key[16]; + + /* Key correct iv ... */ + memcpy(((ZEN_DES_KEY *) (ctx->cipher_data))->des_iv, ctx->iv, 8); + iv.len = 8; + iv.data = (unsigned char *)((ZEN_DES_KEY *) (ctx->cipher_data))->des_iv; + + if (ctx->encrypt == 0) { + memcpy(ctx->iv, &(input.data[input.len - 8]), 8); + } + + /* Test with zenbridge library ... */ + to_return = ptr_zencod_xdes_cipher(&output, &input, + (zen_nb_t *) & deskey_1, + (zen_nb_t *) & deskey_2, + (zen_nb_t *) & deskey_3, &iv, + ctx->encrypt); + to_return = !to_return; + + /* + * But we need to set up the rigth iv ... Test ENCRYPT or DECRYPT mode to + * set iv ... + */ + if (ctx->encrypt == 1) { + memcpy(ctx->iv, &(output.data[output.len - 8]), 8); + } + + return to_return; } - -static int engine_des_ede3_init_key ( EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc ) +static int engine_des_ede3_init_key(EVP_CIPHER_CTX *ctx, + const unsigned char *key, + const unsigned char *iv, int enc) { - ZEN_3DES_KEY *tmp_3des_key = NULL ; - int to_return = 0 ; + ZEN_3DES_KEY *tmp_3des_key = NULL; + int to_return = 0; - tmp_3des_key = (ZEN_3DES_KEY *) ( ctx->cipher_data ) ; - memcpy ( &( tmp_3des_key->des3_key [ 0 ] ), key, 24 ) ; - memcpy ( &( tmp_3des_key->des3_iv [ 0 ] ), iv, 8 ) ; + tmp_3des_key = (ZEN_3DES_KEY *) (ctx->cipher_data); + memcpy(&(tmp_3des_key->des3_key[0]), key, 24); + memcpy(&(tmp_3des_key->des3_iv[0]), iv, 8); - to_return = 1; + to_return = 1; - return to_return ; + return to_return; } - -static int engine_des_ede3_cbc_cipher ( EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, - unsigned int in_len ) +static int engine_des_ede3_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, + unsigned int in_len) { - zen_nb_t output, input ; - zen_nb_t deskey_1, deskey_2, deskey_3, iv ; - int to_return = 0 ; - - /* Convert parameters ... */ - input.len = in_len ; - input.data = (unsigned char *) in ; - output.len = in_len ; - output.data = out ; - - /* Set key ... */ - deskey_1.len = 8 ; - deskey_2.len = 8 ; - deskey_3.len = 8 ; - deskey_1.data = (unsigned char *) ( (ZEN_3DES_KEY *) ( ctx->cipher_data ) )->des3_key ; - deskey_2.data = (unsigned char *) &( (ZEN_3DES_KEY *) ( ctx->cipher_data ) )->des3_key [ 8 ] ; - deskey_3.data = (unsigned char *) &( (ZEN_3DES_KEY *) ( ctx->cipher_data ) )->des3_key [ 16 ] ; - - /* Key correct iv ... */ - memcpy ( ( (ZEN_3DES_KEY *) ( ctx->cipher_data ) )->des3_iv, ctx->iv, 8 ) ; - iv.len = 8 ; - iv.data = (unsigned char *) ( (ZEN_3DES_KEY *) ( ctx->cipher_data ) )->des3_iv ; - - if ( ctx->encrypt == 0 ) { - memcpy ( ctx->iv, &( input.data [ input.len - 8 ] ), 8 ) ; - } - - /* Test with zenbridge library ... */ - to_return = ptr_zencod_xdes_cipher ( &output, &input, - (zen_nb_t *) &deskey_1, (zen_nb_t *) &deskey_2, (zen_nb_t *) &deskey_3, &iv, ctx->encrypt ) ; - to_return = !to_return ; - - if ( ctx->encrypt == 1 ) { - memcpy ( ctx->iv, &( output.data [ output.len - 8 ] ), 8 ) ; - } - - return to_return ; + zen_nb_t output, input; + zen_nb_t deskey_1, deskey_2, deskey_3, iv; + int to_return = 0; + + /* Convert parameters ... */ + input.len = in_len; + input.data = (unsigned char *)in; + output.len = in_len; + output.data = out; + + /* Set key ... */ + deskey_1.len = 8; + deskey_2.len = 8; + deskey_3.len = 8; + deskey_1.data = + (unsigned char *)((ZEN_3DES_KEY *) (ctx->cipher_data))->des3_key; + deskey_2.data = + (unsigned char *)&((ZEN_3DES_KEY *) (ctx->cipher_data))->des3_key[8]; + deskey_3.data = + (unsigned char *)&((ZEN_3DES_KEY *) (ctx->cipher_data))->des3_key[16]; + + /* Key correct iv ... */ + memcpy(((ZEN_3DES_KEY *) (ctx->cipher_data))->des3_iv, ctx->iv, 8); + iv.len = 8; + iv.data = (unsigned char *)((ZEN_3DES_KEY *) (ctx->cipher_data))->des3_iv; + + if (ctx->encrypt == 0) { + memcpy(ctx->iv, &(input.data[input.len - 8]), 8); + } + + /* Test with zenbridge library ... */ + to_return = ptr_zencod_xdes_cipher(&output, &input, + (zen_nb_t *) & deskey_1, + (zen_nb_t *) & deskey_2, + (zen_nb_t *) & deskey_3, &iv, + ctx->encrypt); + to_return = !to_return; + + if (ctx->encrypt == 1) { + memcpy(ctx->iv, &(output.data[output.len - 8]), 8); + } + + return to_return; } - -static int engine_cipher_cleanup ( EVP_CIPHER_CTX *ctx ) +static int engine_cipher_cleanup(EVP_CIPHER_CTX *ctx) { - /* Set the key pointer ... */ - if ( ctx->cipher->nid == NID_rc4 || ctx->cipher->nid == NID_rc4_40 ) { - } - else if ( ctx->cipher->nid == NID_des_cbc ) { - } - else if ( ctx->cipher->nid == NID_des_ede3_cbc ) { - } + /* Set the key pointer ... */ + if (ctx->cipher->nid == NID_rc4 || ctx->cipher->nid == NID_rc4_40) { + } else if (ctx->cipher->nid == NID_des_cbc) { + } else if (ctx->cipher->nid == NID_des_ede3_cbc) { + } - return 1 ; + return 1; } - -#endif /* !OPENSSL_NO_HW_ZENCOD */ -#endif /* !OPENSSL_NO_HW */ +# endif /* !OPENSSL_NO_HW_ZENCOD */ +#endif /* !OPENSSL_NO_HW */ diff --git a/openssl/demos/engines/zencod/hw_zencod.h b/openssl/demos/engines/zencod/hw_zencod.h index 415c9a6be..a2510453a 100644 --- a/openssl/demos/engines/zencod/hw_zencod.h +++ b/openssl/demos/engines/zencod/hw_zencod.h @@ -4,140 +4,139 @@ * for "zencod" ENGINE integration in OpenSSL project. */ +#ifndef _HW_ZENCOD_H_ +# define _HW_ZENCOD_H_ - #ifndef _HW_ZENCOD_H_ -#define _HW_ZENCOD_H_ +# include -#include - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +# endif /* __cplusplus */ -#define ZENBRIDGE_MAX_KEYSIZE_RSA 2048 -#define ZENBRIDGE_MAX_KEYSIZE_RSA_CRT 1024 -#define ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN 1024 -#define ZENBRIDGE_MAX_KEYSIZE_DSA_VRFY 1024 +# define ZENBRIDGE_MAX_KEYSIZE_RSA 2048 +# define ZENBRIDGE_MAX_KEYSIZE_RSA_CRT 1024 +# define ZENBRIDGE_MAX_KEYSIZE_DSA_SIGN 1024 +# define ZENBRIDGE_MAX_KEYSIZE_DSA_VRFY 1024 /* Library version computation */ -#define ZENBRIDGE_VERSION_MAJOR(x) (((x) >> 16) | 0xff) -#define ZENBRIDGE_VERSION_MINOR(x) (((x) >> 8) | 0xff) -#define ZENBRIDGE_VERSION_PATCH(x) (((x) >> 0) | 0xff) -#define ZENBRIDGE_VERSION(x, y, z) ((x) << 16 | (y) << 8 | (z)) - -/* - * Memory type - */ -typedef struct zencod_number_s { - unsigned long len; - unsigned char *data; -} zen_nb_t; - -#define KEY zen_nb_t - - -/* - * Misc - */ -typedef int t_zencod_lib_version (void); -typedef int t_zencod_hw_version (void); -typedef int t_zencod_test (void); -typedef int t_zencod_dump_key (FILE *stream, char *msg, KEY *key); - - -/* - * Key management tools - */ -typedef KEY *t_zencod_new_number (unsigned long len, unsigned char *data); -typedef int t_zencod_init_number (KEY *n, unsigned long len, unsigned char *data); -typedef unsigned long t_zencod_bytes2bits (unsigned char *n, unsigned long bytes); -typedef unsigned long t_zencod_bits2bytes (unsigned long bits); - - -/* - * RSA API - */ +# define ZENBRIDGE_VERSION_MAJOR(x) (((x) >> 16) | 0xff) +# define ZENBRIDGE_VERSION_MINOR(x) (((x) >> 8) | 0xff) +# define ZENBRIDGE_VERSION_PATCH(x) (((x) >> 0) | 0xff) +# define ZENBRIDGE_VERSION(x, y, z) ((x) << 16 | (y) << 8 | (z)) + + /* + * Memory type + */ + typedef struct zencod_number_s { + unsigned long len; + unsigned char *data; + } zen_nb_t; + +# define KEY zen_nb_t + + /* + * Misc + */ + typedef int t_zencod_lib_version(void); + typedef int t_zencod_hw_version(void); + typedef int t_zencod_test(void); + typedef int t_zencod_dump_key(FILE *stream, char *msg, KEY * key); + + /* + * Key management tools + */ + typedef KEY *t_zencod_new_number(unsigned long len, unsigned char *data); + typedef int t_zencod_init_number(KEY * n, unsigned long len, + unsigned char *data); + typedef unsigned long t_zencod_bytes2bits(unsigned char *n, + unsigned long bytes); + typedef unsigned long t_zencod_bits2bytes(unsigned long bits); + + /* + * RSA API + */ /* Compute modular exponential : y = x**e | n */ -typedef int t_zencod_rsa_mod_exp (KEY *y, KEY *x, KEY *n, KEY *e); -/* Compute modular exponential : y1 = (x | p)**edp | p, y2 = (x | p)**edp | p, y = y2 + (qinv * (y1 - y2) | p) * q */ -typedef int t_zencod_rsa_mod_exp_crt (KEY *y, KEY *x, KEY *p, KEY *q, - KEY *edp, KEY *edq, KEY *qinv); - - -/* - * DSA API - */ -typedef int t_zencod_dsa_do_sign (unsigned int hash, KEY *data, KEY *random, - KEY *p, KEY *q, KEY *g, KEY *x, KEY *r, KEY *s); -typedef int t_zencod_dsa_do_verify (unsigned int hash, KEY *data, - KEY *p, KEY *q, KEY *g, KEY *y, - KEY *r, KEY *s, KEY *v); - - -/* - * DH API - */ - /* Key generation : compute public value y = g**x | n */ -typedef int t_zencod_dh_generate_key (KEY *y, KEY *x, KEY *g, KEY *n, int gen_x); -typedef int t_zencod_dh_compute_key (KEY *k, KEY *y, KEY *x, KEY *n); - - -/* - * RNG API - */ -#define ZENBRIDGE_RNG_DIRECT 0 -#define ZENBRIDGE_RNG_SHA1 1 -typedef int t_zencod_rand_bytes (KEY *rand, unsigned int flags); - - -/* - * Math API - */ -typedef int t_zencod_math_mod_exp (KEY *r, KEY *a, KEY *e, KEY *n); - - - - -/* - * Symetric API - */ + typedef int t_zencod_rsa_mod_exp(KEY * y, KEY * x, KEY * n, KEY * e); + /* + * Compute modular exponential : y1 = (x | p)**edp | p, y2 = (x | p)**edp + * | p, y = y2 + (qinv * (y1 - y2) | p) * q + */ + typedef int t_zencod_rsa_mod_exp_crt(KEY * y, KEY * x, KEY * p, KEY * q, + KEY * edp, KEY * edq, KEY * qinv); + + /* + * DSA API + */ + typedef int t_zencod_dsa_do_sign(unsigned int hash, KEY * data, + KEY * random, KEY * p, KEY * q, KEY * g, + KEY * x, KEY * r, KEY * s); + typedef int t_zencod_dsa_do_verify(unsigned int hash, KEY * data, KEY * p, + KEY * q, KEY * g, KEY * y, KEY * r, + KEY * s, KEY * v); + + /* + * DH API + */ + /* Key generation : compute public value y = g**x | n */ + typedef int t_zencod_dh_generate_key(KEY * y, KEY * x, KEY * g, KEY * n, + int gen_x); + typedef int t_zencod_dh_compute_key(KEY * k, KEY * y, KEY * x, KEY * n); + + /* + * RNG API + */ +# define ZENBRIDGE_RNG_DIRECT 0 +# define ZENBRIDGE_RNG_SHA1 1 + typedef int t_zencod_rand_bytes(KEY * rand, unsigned int flags); + + /* + * Math API + */ + typedef int t_zencod_math_mod_exp(KEY * r, KEY * a, KEY * e, KEY * n); + + /* + * Symetric API + */ /* Define a data structure for digests operations */ -typedef struct ZEN_data_st -{ - unsigned int HashBufferSize ; - unsigned char *HashBuffer ; -} ZEN_MD_DATA ; - -/* - * Functions for Digest (MD5, SHA1) stuff - */ -/* output : output data buffer */ -/* input : input data buffer */ -/* algo : hash algorithm, MD5 or SHA1 */ -/* typedef int t_zencod_hash ( KEY *output, const KEY *input, int algo ) ; - * typedef int t_zencod_sha_hash ( KEY *output, const KEY *input, int algo ) ; - */ -/* For now separate this stuff that mad it easier to test */ -typedef int t_zencod_md5_init ( ZEN_MD_DATA *data ) ; -typedef int t_zencod_md5_update ( ZEN_MD_DATA *data, const KEY *input ) ; -typedef int t_zencod_md5_do_final ( ZEN_MD_DATA *data, KEY *output ) ; - -typedef int t_zencod_sha1_init ( ZEN_MD_DATA *data ) ; -typedef int t_zencod_sha1_update ( ZEN_MD_DATA *data, const KEY *input ) ; -typedef int t_zencod_sha1_do_final ( ZEN_MD_DATA *data, KEY *output ) ; - - -/* - * Functions for Cipher (RC4, DES, 3DES) stuff - */ + typedef struct ZEN_data_st { + unsigned int HashBufferSize; + unsigned char *HashBuffer; + } ZEN_MD_DATA; + + /* + * Functions for Digest (MD5, SHA1) stuff + */ + /* output : output data buffer */ + /* input : input data buffer */ + /* algo : hash algorithm, MD5 or SHA1 */ + /*- + * typedef int t_zencod_hash ( KEY *output, const KEY *input, int algo ) ; + * typedef int t_zencod_sha_hash ( KEY *output, const KEY *input, int algo ) ; + */ + /* For now separate this stuff that mad it easier to test */ + typedef int t_zencod_md5_init(ZEN_MD_DATA *data); + typedef int t_zencod_md5_update(ZEN_MD_DATA *data, const KEY * input); + typedef int t_zencod_md5_do_final(ZEN_MD_DATA *data, KEY * output); + + typedef int t_zencod_sha1_init(ZEN_MD_DATA *data); + typedef int t_zencod_sha1_update(ZEN_MD_DATA *data, const KEY * input); + typedef int t_zencod_sha1_do_final(ZEN_MD_DATA *data, KEY * output); + + /* + * Functions for Cipher (RC4, DES, 3DES) stuff + */ /* output : output data buffer */ /* input : input data buffer */ /* key : rc4 key data */ /* index_1 : value of index x from RC4 key structure */ /* index_2 : value of index y from RC4 key structure */ -/* Be carefull : RC4 key should be expanded before calling this method (Should we provide an expand function ??) */ -typedef int t_zencod_rc4_cipher ( KEY *output, const KEY *input, const KEY *key, - unsigned char *index_1, unsigned char *index_2, int mode ) ; + /* + * Be carefull : RC4 key should be expanded before calling this method + * (Should we provide an expand function ??) + */ + typedef int t_zencod_rc4_cipher(KEY * output, const KEY * input, + const KEY * key, unsigned char *index_1, + unsigned char *index_2, int mode); /* output : output data buffer */ /* input : input data buffer */ @@ -147,14 +146,14 @@ typedef int t_zencod_rc4_cipher ( KEY *output, const KEY *input, const KEY *key, /* iv : initial vector */ /* mode : xdes mode (encrypt or decrypt) */ /* Be carefull : In DES mode key_1 = key_2 = key_3 (as far as i can see !!) */ -typedef int t_zencod_xdes_cipher ( KEY *output, const KEY *input, const KEY *key_1, - const KEY *key_2, const KEY *key_3, const KEY *iv, int mode ) ; + typedef int t_zencod_xdes_cipher(KEY * output, const KEY * input, + const KEY * key_1, const KEY * key_2, + const KEY * key_3, const KEY * iv, + int mode); +# undef KEY -#undef KEY - -#ifdef __cplusplus +# ifdef __cplusplus } -#endif /* __cplusplus */ - -#endif /* !_HW_ZENCOD_H_ */ +# endif /* __cplusplus */ +#endif /* !_HW_ZENCOD_H_ */ diff --git a/openssl/demos/engines/zencod/hw_zencod_err.c b/openssl/demos/engines/zencod/hw_zencod_err.c index 8ed0fffc9..ff2b592d7 100644 --- a/openssl/demos/engines/zencod/hw_zencod_err.c +++ b/openssl/demos/engines/zencod/hw_zencod_err.c @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,7 +53,8 @@ * */ -/* NOTE: this file was auto generated by the mkerr.pl script: any changes +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes * made to it will be overwritten when the script next updates this file, * only reason strings will be preserved. */ @@ -64,88 +65,83 @@ /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR -static ERR_STRING_DATA ZENCOD_str_functs[]= - { -{ERR_PACK(0,ZENCOD_F_ZENCOD_BN_MOD_EXP,0), "ZENCOD_BN_MOD_EXP"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_CTRL,0), "ZENCOD_CTRL"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_DH_COMPUTE,0), "ZENCOD_DH_COMPUTE"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_DH_GENERATE,0), "ZENCOD_DH_GENERATE"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_DSA_DO_SIGN,0), "ZENCOD_DSA_DO_SIGN"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_DSA_DO_VERIFY,0), "ZENCOD_DSA_DO_VERIFY"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_FINISH,0), "ZENCOD_FINISH"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_INIT,0), "ZENCOD_INIT"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_RAND,0), "ZENCOD_RAND"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_RSA_MOD_EXP,0), "ZENCOD_RSA_MOD_EXP"}, -{ERR_PACK(0,ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT,0), "ZENCOD_RSA_MOD_EXP_CRT"}, -{0,NULL} - }; +static ERR_STRING_DATA ZENCOD_str_functs[] = { + {ERR_PACK(0, ZENCOD_F_ZENCOD_BN_MOD_EXP, 0), "ZENCOD_BN_MOD_EXP"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_CTRL, 0), "ZENCOD_CTRL"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_DH_COMPUTE, 0), "ZENCOD_DH_COMPUTE"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_DH_GENERATE, 0), "ZENCOD_DH_GENERATE"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_DSA_DO_SIGN, 0), "ZENCOD_DSA_DO_SIGN"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_DSA_DO_VERIFY, 0), "ZENCOD_DSA_DO_VERIFY"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_FINISH, 0), "ZENCOD_FINISH"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_INIT, 0), "ZENCOD_INIT"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_RAND, 0), "ZENCOD_RAND"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_RSA_MOD_EXP, 0), "ZENCOD_RSA_MOD_EXP"}, + {ERR_PACK(0, ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT, 0), + "ZENCOD_RSA_MOD_EXP_CRT"}, + {0, NULL} +}; -static ERR_STRING_DATA ZENCOD_str_reasons[]= - { -{ZENCOD_R_ALREADY_LOADED ,"already loaded"}, -{ZENCOD_R_BAD_KEY_COMPONENTS ,"bad key components"}, -{ZENCOD_R_BN_EXPAND_FAIL ,"bn expand fail"}, -{ZENCOD_R_CTRL_COMMAND_NOT_IMPLEMENTED ,"ctrl command not implemented"}, -{ZENCOD_R_DSO_FAILURE ,"dso failure"}, -{ZENCOD_R_NOT_LOADED ,"not loaded"}, -{ZENCOD_R_REQUEST_FAILED ,"request failed"}, -{ZENCOD_R_UNIT_FAILURE ,"unit failure"}, -{0,NULL} - }; +static ERR_STRING_DATA ZENCOD_str_reasons[] = { + {ZENCOD_R_ALREADY_LOADED, "already loaded"}, + {ZENCOD_R_BAD_KEY_COMPONENTS, "bad key components"}, + {ZENCOD_R_BN_EXPAND_FAIL, "bn expand fail"}, + {ZENCOD_R_CTRL_COMMAND_NOT_IMPLEMENTED, "ctrl command not implemented"}, + {ZENCOD_R_DSO_FAILURE, "dso failure"}, + {ZENCOD_R_NOT_LOADED, "not loaded"}, + {ZENCOD_R_REQUEST_FAILED, "request failed"}, + {ZENCOD_R_UNIT_FAILURE, "unit failure"}, + {0, NULL} +}; #endif #ifdef ZENCOD_LIB_NAME -static ERR_STRING_DATA ZENCOD_lib_name[]= - { -{0 ,ZENCOD_LIB_NAME}, -{0,NULL} - }; +static ERR_STRING_DATA ZENCOD_lib_name[] = { + {0, ZENCOD_LIB_NAME}, + {0, NULL} +}; #endif - -static int ZENCOD_lib_error_code=0; -static int ZENCOD_error_init=1; +static int ZENCOD_lib_error_code = 0; +static int ZENCOD_error_init = 1; static void ERR_load_ZENCOD_strings(void) - { - if (ZENCOD_lib_error_code == 0) - ZENCOD_lib_error_code=ERR_get_next_error_library(); +{ + if (ZENCOD_lib_error_code == 0) + ZENCOD_lib_error_code = ERR_get_next_error_library(); - if (ZENCOD_error_init) - { - ZENCOD_error_init=0; + if (ZENCOD_error_init) { + ZENCOD_error_init = 0; #ifndef OPENSSL_NO_ERR - ERR_load_strings(ZENCOD_lib_error_code,ZENCOD_str_functs); - ERR_load_strings(ZENCOD_lib_error_code,ZENCOD_str_reasons); + ERR_load_strings(ZENCOD_lib_error_code, ZENCOD_str_functs); + ERR_load_strings(ZENCOD_lib_error_code, ZENCOD_str_reasons); #endif #ifdef ZENCOD_LIB_NAME - ZENCOD_lib_name->error = ERR_PACK(ZENCOD_lib_error_code,0,0); - ERR_load_strings(0,ZENCOD_lib_name); + ZENCOD_lib_name->error = ERR_PACK(ZENCOD_lib_error_code, 0, 0); + ERR_load_strings(0, ZENCOD_lib_name); #endif - } - } + } +} static void ERR_unload_ZENCOD_strings(void) - { - if (ZENCOD_error_init == 0) - { +{ + if (ZENCOD_error_init == 0) { #ifndef OPENSSL_NO_ERR - ERR_unload_strings(ZENCOD_lib_error_code,ZENCOD_str_functs); - ERR_unload_strings(ZENCOD_lib_error_code,ZENCOD_str_reasons); + ERR_unload_strings(ZENCOD_lib_error_code, ZENCOD_str_functs); + ERR_unload_strings(ZENCOD_lib_error_code, ZENCOD_str_reasons); #endif #ifdef ZENCOD_LIB_NAME - ERR_unload_strings(0,ZENCOD_lib_name); + ERR_unload_strings(0, ZENCOD_lib_name); #endif - ZENCOD_error_init=1; - } - } + ZENCOD_error_init = 1; + } +} static void ERR_ZENCOD_error(int function, int reason, char *file, int line) - { - if (ZENCOD_lib_error_code == 0) - ZENCOD_lib_error_code=ERR_get_next_error_library(); - ERR_PUT_error(ZENCOD_lib_error_code,function,reason,file,line); - } +{ + if (ZENCOD_lib_error_code == 0) + ZENCOD_lib_error_code = ERR_get_next_error_library(); + ERR_PUT_error(ZENCOD_lib_error_code, function, reason, file, line); +} diff --git a/openssl/demos/engines/zencod/hw_zencod_err.h b/openssl/demos/engines/zencod/hw_zencod_err.h index 60e923fd8..f4a835881 100644 --- a/openssl/demos/engines/zencod/hw_zencod_err.h +++ b/openssl/demos/engines/zencod/hw_zencod_err.h @@ -6,7 +6,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,45 +53,46 @@ */ #ifndef HEADER_ZENCOD_ERR_H -#define HEADER_ZENCOD_ERR_H +# define HEADER_ZENCOD_ERR_H #ifdef __cplusplus extern "C" { #endif /* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes +/* + * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ static void ERR_load_ZENCOD_strings(void); static void ERR_unload_ZENCOD_strings(void); static void ERR_ZENCOD_error(int function, int reason, char *file, int line); -#define ZENCODerr(f,r) ERR_ZENCOD_error((f),(r),__FILE__,__LINE__) +# define ZENCODerr(f,r) ERR_ZENCOD_error((f),(r),__FILE__,__LINE__) /* Error codes for the ZENCOD functions. */ /* Function codes. */ -#define ZENCOD_F_ZENCOD_BN_MOD_EXP 100 -#define ZENCOD_F_ZENCOD_CTRL 101 -#define ZENCOD_F_ZENCOD_DH_COMPUTE 102 -#define ZENCOD_F_ZENCOD_DH_GENERATE 103 -#define ZENCOD_F_ZENCOD_DSA_DO_SIGN 104 -#define ZENCOD_F_ZENCOD_DSA_DO_VERIFY 105 -#define ZENCOD_F_ZENCOD_FINISH 106 -#define ZENCOD_F_ZENCOD_INIT 107 -#define ZENCOD_F_ZENCOD_RAND 108 -#define ZENCOD_F_ZENCOD_RSA_MOD_EXP 109 -#define ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT 110 +# define ZENCOD_F_ZENCOD_BN_MOD_EXP 100 +# define ZENCOD_F_ZENCOD_CTRL 101 +# define ZENCOD_F_ZENCOD_DH_COMPUTE 102 +# define ZENCOD_F_ZENCOD_DH_GENERATE 103 +# define ZENCOD_F_ZENCOD_DSA_DO_SIGN 104 +# define ZENCOD_F_ZENCOD_DSA_DO_VERIFY 105 +# define ZENCOD_F_ZENCOD_FINISH 106 +# define ZENCOD_F_ZENCOD_INIT 107 +# define ZENCOD_F_ZENCOD_RAND 108 +# define ZENCOD_F_ZENCOD_RSA_MOD_EXP 109 +# define ZENCOD_F_ZENCOD_RSA_MOD_EXP_CRT 110 /* Reason codes. */ -#define ZENCOD_R_ALREADY_LOADED 100 -#define ZENCOD_R_BAD_KEY_COMPONENTS 101 -#define ZENCOD_R_BN_EXPAND_FAIL 102 -#define ZENCOD_R_CTRL_COMMAND_NOT_IMPLEMENTED 103 -#define ZENCOD_R_DSO_FAILURE 104 -#define ZENCOD_R_NOT_LOADED 105 -#define ZENCOD_R_REQUEST_FAILED 106 -#define ZENCOD_R_UNIT_FAILURE 107 +# define ZENCOD_R_ALREADY_LOADED 100 +# define ZENCOD_R_BAD_KEY_COMPONENTS 101 +# define ZENCOD_R_BN_EXPAND_FAIL 102 +# define ZENCOD_R_CTRL_COMMAND_NOT_IMPLEMENTED 103 +# define ZENCOD_R_DSO_FAILURE 104 +# define ZENCOD_R_NOT_LOADED 105 +# define ZENCOD_R_REQUEST_FAILED 106 +# define ZENCOD_R_UNIT_FAILURE 107 #ifdef __cplusplus } diff --git a/openssl/demos/pkcs12/pkread.c b/openssl/demos/pkcs12/pkread.c index fa8f50923..f4a3df407 100644 --- a/openssl/demos/pkcs12/pkread.c +++ b/openssl/demos/pkcs12/pkread.c @@ -10,52 +10,52 @@ int main(int argc, char **argv) { - FILE *fp; - EVP_PKEY *pkey; - X509 *cert; - STACK_OF(X509) *ca = NULL; - PKCS12 *p12; - int i; - if (argc != 4) { - fprintf(stderr, "Usage: pkread p12file password opfile\n"); - exit (1); - } - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); - if (!(fp = fopen(argv[1], "rb"))) { - fprintf(stderr, "Error opening file %s\n", argv[1]); - exit(1); - } - p12 = d2i_PKCS12_fp(fp, NULL); - fclose (fp); - if (!p12) { - fprintf(stderr, "Error reading PKCS#12 file\n"); - ERR_print_errors_fp(stderr); - exit (1); - } - if (!PKCS12_parse(p12, argv[2], &pkey, &cert, &ca)) { - fprintf(stderr, "Error parsing PKCS#12 file\n"); - ERR_print_errors_fp(stderr); - exit (1); - } - PKCS12_free(p12); - if (!(fp = fopen(argv[3], "w"))) { - fprintf(stderr, "Error opening file %s\n", argv[1]); - exit(1); - } - if (pkey) { - fprintf(fp, "***Private Key***\n"); - PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL); - } - if (cert) { - fprintf(fp, "***User Certificate***\n"); - PEM_write_X509_AUX(fp, cert); - } - if (ca && sk_X509_num(ca)) { - fprintf(fp, "***Other Certificates***\n"); - for (i = 0; i < sk_X509_num(ca); i++) - PEM_write_X509_AUX(fp, sk_X509_value(ca, i)); - } - fclose(fp); - return 0; + FILE *fp; + EVP_PKEY *pkey; + X509 *cert; + STACK_OF(X509) *ca = NULL; + PKCS12 *p12; + int i; + if (argc != 4) { + fprintf(stderr, "Usage: pkread p12file password opfile\n"); + exit(1); + } + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); + if (!(fp = fopen(argv[1], "rb"))) { + fprintf(stderr, "Error opening file %s\n", argv[1]); + exit(1); + } + p12 = d2i_PKCS12_fp(fp, NULL); + fclose(fp); + if (!p12) { + fprintf(stderr, "Error reading PKCS#12 file\n"); + ERR_print_errors_fp(stderr); + exit(1); + } + if (!PKCS12_parse(p12, argv[2], &pkey, &cert, &ca)) { + fprintf(stderr, "Error parsing PKCS#12 file\n"); + ERR_print_errors_fp(stderr); + exit(1); + } + PKCS12_free(p12); + if (!(fp = fopen(argv[3], "w"))) { + fprintf(stderr, "Error opening file %s\n", argv[1]); + exit(1); + } + if (pkey) { + fprintf(fp, "***Private Key***\n"); + PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL); + } + if (cert) { + fprintf(fp, "***User Certificate***\n"); + PEM_write_X509_AUX(fp, cert); + } + if (ca && sk_X509_num(ca)) { + fprintf(fp, "***Other Certificates***\n"); + for (i = 0; i < sk_X509_num(ca); i++) + PEM_write_X509_AUX(fp, sk_X509_value(ca, i)); + } + fclose(fp); + return 0; } diff --git a/openssl/demos/pkcs12/pkwrite.c b/openssl/demos/pkcs12/pkwrite.c index 15f839d1e..fed773ea7 100644 --- a/openssl/demos/pkcs12/pkwrite.c +++ b/openssl/demos/pkcs12/pkwrite.c @@ -10,37 +10,37 @@ int main(int argc, char **argv) { - FILE *fp; - EVP_PKEY *pkey; - X509 *cert; - PKCS12 *p12; - if (argc != 5) { - fprintf(stderr, "Usage: pkwrite infile password name p12file\n"); - exit(1); - } - SSLeay_add_all_algorithms(); - ERR_load_crypto_strings(); - if (!(fp = fopen(argv[1], "r"))) { - fprintf(stderr, "Error opening file %s\n", argv[1]); - exit(1); - } - cert = PEM_read_X509(fp, NULL, NULL, NULL); - rewind(fp); - pkey = PEM_read_PrivateKey(fp, NULL, NULL, NULL); - fclose(fp); - p12 = PKCS12_create(argv[2], argv[3], pkey, cert, NULL, 0,0,0,0,0); - if(!p12) { - fprintf(stderr, "Error creating PKCS#12 structure\n"); - ERR_print_errors_fp(stderr); - exit(1); - } - if (!(fp = fopen(argv[4], "wb"))) { - fprintf(stderr, "Error opening file %s\n", argv[1]); - ERR_print_errors_fp(stderr); - exit(1); - } - i2d_PKCS12_fp(fp, p12); - PKCS12_free(p12); - fclose(fp); - return 0; + FILE *fp; + EVP_PKEY *pkey; + X509 *cert; + PKCS12 *p12; + if (argc != 5) { + fprintf(stderr, "Usage: pkwrite infile password name p12file\n"); + exit(1); + } + SSLeay_add_all_algorithms(); + ERR_load_crypto_strings(); + if (!(fp = fopen(argv[1], "r"))) { + fprintf(stderr, "Error opening file %s\n", argv[1]); + exit(1); + } + cert = PEM_read_X509(fp, NULL, NULL, NULL); + rewind(fp); + pkey = PEM_read_PrivateKey(fp, NULL, NULL, NULL); + fclose(fp); + p12 = PKCS12_create(argv[2], argv[3], pkey, cert, NULL, 0, 0, 0, 0, 0); + if (!p12) { + fprintf(stderr, "Error creating PKCS#12 structure\n"); + ERR_print_errors_fp(stderr); + exit(1); + } + if (!(fp = fopen(argv[4], "wb"))) { + fprintf(stderr, "Error opening file %s\n", argv[1]); + ERR_print_errors_fp(stderr); + exit(1); + } + i2d_PKCS12_fp(fp, p12); + PKCS12_free(p12); + fclose(fp); + return 0; } diff --git a/openssl/demos/prime/prime.c b/openssl/demos/prime/prime.c index 103e0efc0..6dd022886 100644 --- a/openssl/demos/prime/prime.c +++ b/openssl/demos/prime/prime.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -58,44 +58,45 @@ #include #include -#include +#include -void callback(type,num) -int type,num; - { - if (type == 0) - fprintf(stderr,"."); - else if (type == 1) - fprintf(stderr,"+"); - else if (type == 2) - fprintf(stderr,"*"); - fflush(stderr); - } +void callback(type, num) +int type, num; +{ + if (type == 0) + fprintf(stderr, "."); + else if (type == 1) + fprintf(stderr, "+"); + else if (type == 2) + fprintf(stderr, "*"); + fflush(stderr); +} -int main(argc,argv) +int main(argc, argv) int argc; char *argv[]; - { - BIGNUM *rand; - int num=256; - - /* we should really call RAND_seed(char *bytes,int num); - * to fully initalise the random number generator */ - if (argc >= 2) - { - num=atoi(argv[1]); - if (num == 0) num=256; - } +{ + BIGNUM *rand; + int num = 256; - fprintf(stderr,"generate a strong prime\n"); - rand=BN_generate_prime(NULL,num,1,NULL,NULL,callback,NULL); - /* change the third parameter to 1 for a strong prime */ - fprintf(stderr,"\n"); + /* + * we should really call RAND_seed(char *bytes,int num); to fully + * initalise the random number generator + */ + if (argc >= 2) { + num = atoi(argv[1]); + if (num == 0) + num = 256; + } - BN_print_fp(stdout,rand); - fprintf(stdout,"\n"); - BN_free(rand); - exit(0); - return(0); - } + fprintf(stderr, "generate a strong prime\n"); + rand = BN_generate_prime(NULL, num, 1, NULL, NULL, callback, NULL); + /* change the third parameter to 1 for a strong prime */ + fprintf(stderr, "\n"); + BN_print_fp(stdout, rand); + fprintf(stdout, "\n"); + BN_free(rand); + exit(0); + return (0); +} diff --git a/openssl/demos/selfsign.c b/openssl/demos/selfsign.c index 68904c611..d61133411 100644 --- a/openssl/demos/selfsign.c +++ b/openssl/demos/selfsign.c @@ -11,170 +11,166 @@ int mkit(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days); int main() - { - BIO *bio_err; - X509 *x509=NULL; - EVP_PKEY *pkey=NULL; +{ + BIO *bio_err; + X509 *x509 = NULL; + EVP_PKEY *pkey = NULL; - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - bio_err=BIO_new_fp(stderr, BIO_NOCLOSE); + bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); - mkit(&x509,&pkey,512,0,365); + mkit(&x509, &pkey, 512, 0, 365); - RSA_print_fp(stdout,pkey->pkey.rsa,0); - X509_print_fp(stdout,x509); + RSA_print_fp(stdout, pkey->pkey.rsa, 0); + X509_print_fp(stdout, x509); - PEM_write_PrivateKey(stdout,pkey,NULL,NULL,0,NULL, NULL); - PEM_write_X509(stdout,x509); + PEM_write_PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL); + PEM_write_X509(stdout, x509); - X509_free(x509); - EVP_PKEY_free(pkey); + X509_free(x509); + EVP_PKEY_free(pkey); #ifdef CUSTOM_EXT - /* Only needed if we add objects or custom extensions */ - X509V3_EXT_cleanup(); - OBJ_cleanup(); + /* Only needed if we add objects or custom extensions */ + X509V3_EXT_cleanup(); + OBJ_cleanup(); #endif - CRYPTO_mem_leaks(bio_err); - BIO_free(bio_err); - return(0); - } + CRYPTO_mem_leaks(bio_err); + BIO_free(bio_err); + return (0); +} #ifdef WIN16 -# define MS_CALLBACK _far _loadds -# define MS_FAR _far +# define MS_CALLBACK _far _loadds +# define MS_FAR _far #else -# define MS_CALLBACK -# define MS_FAR +# define MS_CALLBACK +# define MS_FAR #endif static void MS_CALLBACK callback(p, n, arg) int p; int n; void *arg; - { - char c='B'; - - if (p == 0) c='.'; - if (p == 1) c='+'; - if (p == 2) c='*'; - if (p == 3) c='\n'; - fputc(c,stderr); - } - -int mkit(x509p,pkeyp,bits,serial,days) +{ + char c = 'B'; + + if (p == 0) + c = '.'; + if (p == 1) + c = '+'; + if (p == 2) + c = '*'; + if (p == 3) + c = '\n'; + fputc(c, stderr); +} + +int mkit(x509p, pkeyp, bits, serial, days) X509 **x509p; EVP_PKEY **pkeyp; int bits; int serial; int days; - { - X509 *x; - EVP_PKEY *pk; - RSA *rsa; - X509_NAME *name=NULL; - X509_NAME_ENTRY *ne=NULL; - X509_EXTENSION *ex=NULL; - - - if ((pkeyp == NULL) || (*pkeyp == NULL)) - { - if ((pk=EVP_PKEY_new()) == NULL) - { - abort(); - return(0); - } - } - else - pk= *pkeyp; - - if ((x509p == NULL) || (*x509p == NULL)) - { - if ((x=X509_new()) == NULL) - goto err; - } - else - x= *x509p; - - rsa=RSA_generate_key(bits,RSA_F4,callback,NULL); - if (!EVP_PKEY_assign_RSA(pk,rsa)) - { - abort(); - goto err; - } - rsa=NULL; - - X509_set_version(x,3); - ASN1_INTEGER_set(X509_get_serialNumber(x),serial); - X509_gmtime_adj(X509_get_notBefore(x),0); - X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days); - X509_set_pubkey(x,pk); - - name=X509_get_subject_name(x); - - /* This function creates and adds the entry, working out the - * correct string type and performing checks on its length. - * Normally we'd check the return value for errors... - */ - X509_NAME_add_entry_by_txt(name,"C", - MBSTRING_ASC, "UK", -1, -1, 0); - X509_NAME_add_entry_by_txt(name,"CN", - MBSTRING_ASC, "OpenSSL Group", -1, -1, 0); - - X509_set_issuer_name(x,name); - - /* Add extension using V3 code: we can set the config file as NULL - * because we wont reference any other sections. We can also set - * the context to NULL because none of these extensions below will need - * to access it. - */ - - ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_cert_type, "server"); - X509_add_ext(x,ex,-1); - X509_EXTENSION_free(ex); - - ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_comment, - "example comment extension"); - X509_add_ext(x,ex,-1); - X509_EXTENSION_free(ex); - - ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_ssl_server_name, - "www.openssl.org"); - - X509_add_ext(x,ex,-1); - X509_EXTENSION_free(ex); +{ + X509 *x; + EVP_PKEY *pk; + RSA *rsa; + X509_NAME *name = NULL; + X509_NAME_ENTRY *ne = NULL; + X509_EXTENSION *ex = NULL; + + if ((pkeyp == NULL) || (*pkeyp == NULL)) { + if ((pk = EVP_PKEY_new()) == NULL) { + abort(); + return (0); + } + } else + pk = *pkeyp; + + if ((x509p == NULL) || (*x509p == NULL)) { + if ((x = X509_new()) == NULL) + goto err; + } else + x = *x509p; + + rsa = RSA_generate_key(bits, RSA_F4, callback, NULL); + if (!EVP_PKEY_assign_RSA(pk, rsa)) { + abort(); + goto err; + } + rsa = NULL; + + X509_set_version(x, 3); + ASN1_INTEGER_set(X509_get_serialNumber(x), serial); + X509_gmtime_adj(X509_get_notBefore(x), 0); + X509_gmtime_adj(X509_get_notAfter(x), (long)60 * 60 * 24 * days); + X509_set_pubkey(x, pk); + + name = X509_get_subject_name(x); + + /* + * This function creates and adds the entry, working out the correct + * string type and performing checks on its length. Normally we'd check + * the return value for errors... + */ + X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, "UK", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "CN", + MBSTRING_ASC, "OpenSSL Group", -1, -1, 0); + + X509_set_issuer_name(x, name); + + /* + * Add extension using V3 code: we can set the config file as NULL + * because we wont reference any other sections. We can also set the + * context to NULL because none of these extensions below will need to + * access it. + */ + + ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_cert_type, "server"); + X509_add_ext(x, ex, -1); + X509_EXTENSION_free(ex); + + ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_comment, + "example comment extension"); + X509_add_ext(x, ex, -1); + X509_EXTENSION_free(ex); + + ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_ssl_server_name, + "www.openssl.org"); + + X509_add_ext(x, ex, -1); + X509_EXTENSION_free(ex); #if 0 - /* might want something like this too.... */ - ex = X509V3_EXT_conf_nid(NULL, NULL, NID_basic_constraints, - "critical,CA:TRUE"); - + /* might want something like this too.... */ + ex = X509V3_EXT_conf_nid(NULL, NULL, NID_basic_constraints, + "critical,CA:TRUE"); - X509_add_ext(x,ex,-1); - X509_EXTENSION_free(ex); + X509_add_ext(x, ex, -1); + X509_EXTENSION_free(ex); #endif #ifdef CUSTOM_EXT - /* Maybe even add our own extension based on existing */ - { - int nid; - nid = OBJ_create("1.2.3.4", "MyAlias", "My Test Alias Extension"); - X509V3_EXT_add_alias(nid, NID_netscape_comment); - ex = X509V3_EXT_conf_nid(NULL, NULL, nid, - "example comment alias"); - X509_add_ext(x,ex,-1); - X509_EXTENSION_free(ex); - } + /* Maybe even add our own extension based on existing */ + { + int nid; + nid = OBJ_create("1.2.3.4", "MyAlias", "My Test Alias Extension"); + X509V3_EXT_add_alias(nid, NID_netscape_comment); + ex = X509V3_EXT_conf_nid(NULL, NULL, nid, "example comment alias"); + X509_add_ext(x, ex, -1); + X509_EXTENSION_free(ex); + } #endif - - if (!X509_sign(x,pk,EVP_md5())) - goto err; - - *x509p=x; - *pkeyp=pk; - return(1); -err: - return(0); - } + + if (!X509_sign(x, pk, EVP_md5())) + goto err; + + *x509p = x; + *pkeyp = pk; + return (1); + err: + return (0); +} diff --git a/openssl/demos/sign/sign.c b/openssl/demos/sign/sign.c index a6c66e17c..22f53fb60 100644 --- a/openssl/demos/sign/sign.c +++ b/openssl/demos/sign/sign.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,19 +49,22 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence * [including the GNU Public Licence.] */ -/* sign-it.cpp - Simple test app using SSLeay envelopes to sign data - 29.9.1996, Sampo Kellomaki */ +/* + * sign-it.cpp - Simple test app using SSLeay envelopes to sign data + * 29.9.1996, Sampo Kellomaki + */ /* converted to C - eay :-) */ -/* reformated a bit and converted to use the more common functions: this was +/* + * reformated a bit and converted to use the more common functions: this was * initially written at the dawn of time :-) - Steve. */ @@ -74,80 +77,84 @@ #include #include -int main () +int main() { - int err; - int sig_len; - unsigned char sig_buf [4096]; - static char certfile[] = "cert.pem"; - static char keyfile[] = "key.pem"; - static char data[] = "I owe you..."; - EVP_MD_CTX md_ctx; - EVP_PKEY * pkey; - FILE * fp; - X509 * x509; - - /* Just load the crypto library error strings, - * SSL_load_error_strings() loads the crypto AND the SSL ones */ - /* SSL_load_error_strings();*/ - ERR_load_crypto_strings(); - - /* Read private key */ - - fp = fopen (keyfile, "r"); - if (fp == NULL) exit (1); - pkey = PEM_read_PrivateKey(fp, NULL, NULL, NULL); - fclose (fp); - - if (pkey == NULL) { - ERR_print_errors_fp (stderr); - exit (1); - } - - /* Do the signature */ - - EVP_SignInit (&md_ctx, EVP_sha1()); - EVP_SignUpdate (&md_ctx, data, strlen(data)); - sig_len = sizeof(sig_buf); - err = EVP_SignFinal (&md_ctx, sig_buf, &sig_len, pkey); - - if (err != 1) { - ERR_print_errors_fp(stderr); - exit (1); - } - - EVP_PKEY_free (pkey); - - /* Read public key */ - - fp = fopen (certfile, "r"); - if (fp == NULL) exit (1); - x509 = PEM_read_X509(fp, NULL, NULL, NULL); - fclose (fp); - - if (x509 == NULL) { - ERR_print_errors_fp (stderr); - exit (1); - } - - /* Get public key - eay */ - pkey=X509_get_pubkey(x509); - if (pkey == NULL) { - ERR_print_errors_fp (stderr); - exit (1); - } - - /* Verify the signature */ - - EVP_VerifyInit (&md_ctx, EVP_sha1()); - EVP_VerifyUpdate (&md_ctx, data, strlen((char*)data)); - err = EVP_VerifyFinal (&md_ctx, sig_buf, sig_len, pkey); - EVP_PKEY_free (pkey); - - if (err != 1) { - ERR_print_errors_fp (stderr); - exit (1); - } - printf ("Signature Verified Ok.\n"); - return(0); + int err; + int sig_len; + unsigned char sig_buf[4096]; + static char certfile[] = "cert.pem"; + static char keyfile[] = "key.pem"; + static char data[] = "I owe you..."; + EVP_MD_CTX md_ctx; + EVP_PKEY *pkey; + FILE *fp; + X509 *x509; + + /* + * Just load the crypto library error strings, SSL_load_error_strings() + * loads the crypto AND the SSL ones + */ + /* SSL_load_error_strings(); */ + ERR_load_crypto_strings(); + + /* Read private key */ + + fp = fopen(keyfile, "r"); + if (fp == NULL) + exit(1); + pkey = PEM_read_PrivateKey(fp, NULL, NULL, NULL); + fclose(fp); + + if (pkey == NULL) { + ERR_print_errors_fp(stderr); + exit(1); + } + + /* Do the signature */ + + EVP_SignInit(&md_ctx, EVP_sha1()); + EVP_SignUpdate(&md_ctx, data, strlen(data)); + sig_len = sizeof(sig_buf); + err = EVP_SignFinal(&md_ctx, sig_buf, &sig_len, pkey); + + if (err != 1) { + ERR_print_errors_fp(stderr); + exit(1); + } + + EVP_PKEY_free(pkey); + + /* Read public key */ + + fp = fopen(certfile, "r"); + if (fp == NULL) + exit(1); + x509 = PEM_read_X509(fp, NULL, NULL, NULL); + fclose(fp); + + if (x509 == NULL) { + ERR_print_errors_fp(stderr); + exit(1); + } + + /* Get public key - eay */ + pkey = X509_get_pubkey(x509); + if (pkey == NULL) { + ERR_print_errors_fp(stderr); + exit(1); + } + + /* Verify the signature */ + + EVP_VerifyInit(&md_ctx, EVP_sha1()); + EVP_VerifyUpdate(&md_ctx, data, strlen((char *)data)); + err = EVP_VerifyFinal(&md_ctx, sig_buf, sig_len, pkey); + EVP_PKEY_free(pkey); + + if (err != 1) { + ERR_print_errors_fp(stderr); + exit(1); + } + printf("Signature Verified Ok.\n"); + return (0); } diff --git a/openssl/demos/smime/smdec.c b/openssl/demos/smime/smdec.c index 8b1a8545a..6814d5199 100644 --- a/openssl/demos/smime/smdec.c +++ b/openssl/demos/smime/smdec.c @@ -4,80 +4,75 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *rcert = NULL; - EVP_PKEY *rkey = NULL; - PKCS7 *p7 = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + EVP_PKEY *rkey = NULL; + PKCS7 *p7 = NULL; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in recipient certificate and private key */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in recipient certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - if (!rcert || !rkey) - goto err; + if (!rcert || !rkey) + goto err; - /* Open content being signed */ + /* Open content being signed */ - in = BIO_new_file("smencr.txt", "r"); + in = BIO_new_file("smencr.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Sign content */ - p7 = SMIME_read_PKCS7(in, NULL); + /* Sign content */ + p7 = SMIME_read_PKCS7(in, NULL); - if (!p7) - goto err; + if (!p7) + goto err; - out = BIO_new_file("encrout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("encrout.txt", "w"); + if (!out) + goto err; - /* Decrypt S/MIME message */ - if (!PKCS7_decrypt(p7, rkey, rcert, out, 0)) - goto err; + /* Decrypt S/MIME message */ + if (!PKCS7_decrypt(p7, rkey, rcert, out, 0)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Signing Data\n"); - ERR_print_errors_fp(stderr); - } - - if (p7) - PKCS7_free(p7); - if (rcert) - X509_free(rcert); - if (rkey) - EVP_PKEY_free(rkey); - - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); - - return ret; - - } + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } + if (p7) + PKCS7_free(p7); + if (rcert) + X509_free(rcert); + if (rkey) + EVP_PKEY_free(rkey); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); + return ret; +} diff --git a/openssl/demos/smime/smenc.c b/openssl/demos/smime/smenc.c index 77dd732fc..18bf7b161 100644 --- a/openssl/demos/smime/smenc.c +++ b/openssl/demos/smime/smenc.c @@ -4,89 +4,89 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *rcert = NULL; - STACK_OF(X509) *recips = NULL; - PKCS7 *p7 = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + STACK_OF(X509) *recips = NULL; + PKCS7 *p7 = NULL; + int ret = 1; - /* - * On OpenSSL 0.9.9 only: - * for streaming set PKCS7_STREAM - */ - int flags = PKCS7_STREAM; + /* + * On OpenSSL 0.9.9 only: + * for streaming set PKCS7_STREAM + */ + int flags = PKCS7_STREAM; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in recipient certificate */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in recipient certificate */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - if (!rcert) - goto err; + if (!rcert) + goto err; - /* Create recipient STACK and add recipient cert to it */ - recips = sk_X509_new_null(); + /* Create recipient STACK and add recipient cert to it */ + recips = sk_X509_new_null(); - if (!recips || !sk_X509_push(recips, rcert)) - goto err; + if (!recips || !sk_X509_push(recips, rcert)) + goto err; - /* sk_X509_pop_free will free up recipient STACK and its contents - * so set rcert to NULL so it isn't freed up twice. - */ - rcert = NULL; + /* + * sk_X509_pop_free will free up recipient STACK and its contents so set + * rcert to NULL so it isn't freed up twice. + */ + rcert = NULL; - /* Open content being encrypted */ + /* Open content being encrypted */ - in = BIO_new_file("encr.txt", "r"); + in = BIO_new_file("encr.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* encrypt content */ - p7 = PKCS7_encrypt(recips, in, EVP_des_ede3_cbc(), flags); + /* encrypt content */ + p7 = PKCS7_encrypt(recips, in, EVP_des_ede3_cbc(), flags); - if (!p7) - goto err; + if (!p7) + goto err; - out = BIO_new_file("smencr.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smencr.txt", "w"); + if (!out) + goto err; - /* Write out S/MIME message */ - if (!SMIME_write_PKCS7(out, p7, in, flags)) - goto err; + /* Write out S/MIME message */ + if (!SMIME_write_PKCS7(out, p7, in, flags)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Encrypting Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Encrypting Data\n"); + ERR_print_errors_fp(stderr); + } - if (p7) - PKCS7_free(p7); - if (rcert) - X509_free(rcert); - if (recips) - sk_X509_pop_free(recips, X509_free); + if (p7) + PKCS7_free(p7); + if (rcert) + X509_free(rcert); + if (recips) + sk_X509_pop_free(recips, X509_free); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/smime/smsign.c b/openssl/demos/smime/smsign.c index ba78830cf..c7bf86d37 100644 --- a/openssl/demos/smime/smsign.c +++ b/openssl/demos/smime/smsign.c @@ -4,86 +4,85 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *scert = NULL; - EVP_PKEY *skey = NULL; - PKCS7 *p7 = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL; + EVP_PKEY *skey = NULL; + PKCS7 *p7 = NULL; + int ret = 1; - /* For simple S/MIME signing use PKCS7_DETACHED. - * On OpenSSL 0.9.9 only: - * for streaming detached set PKCS7_DETACHED|PKCS7_STREAM - * for streaming non-detached set PKCS7_STREAM - */ - int flags = PKCS7_DETACHED|PKCS7_STREAM; + /* + * For simple S/MIME signing use PKCS7_DETACHED. On OpenSSL 0.9.9 only: + * for streaming detached set PKCS7_DETACHED|PKCS7_STREAM for streaming + * non-detached set PKCS7_STREAM + */ + int flags = PKCS7_DETACHED | PKCS7_STREAM; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Read in signer certificate and private key */ - tbio = BIO_new_file("signer.pem", "r"); + /* Read in signer certificate and private key */ + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - if (!scert || !skey) - goto err; + if (!scert || !skey) + goto err; - /* Open content being signed */ + /* Open content being signed */ - in = BIO_new_file("sign.txt", "r"); + in = BIO_new_file("sign.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Sign content */ - p7 = PKCS7_sign(scert, skey, NULL, in, flags); + /* Sign content */ + p7 = PKCS7_sign(scert, skey, NULL, in, flags); - if (!p7) - goto err; + if (!p7) + goto err; - out = BIO_new_file("smout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; - if (!(flags & PKCS7_STREAM)) - BIO_reset(in); + if (!(flags & PKCS7_STREAM)) + BIO_reset(in); - /* Write out S/MIME message */ - if (!SMIME_write_PKCS7(out, p7, in, flags)) - goto err; + /* Write out S/MIME message */ + if (!SMIME_write_PKCS7(out, p7, in, flags)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Signing Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } - if (p7) - PKCS7_free(p7); - if (scert) - X509_free(scert); - if (skey) - EVP_PKEY_free(skey); + if (p7) + PKCS7_free(p7); + if (scert) + X509_free(scert); + if (skey) + EVP_PKEY_free(skey); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/smime/smsign2.c b/openssl/demos/smime/smsign2.c index ff835c568..a11609434 100644 --- a/openssl/demos/smime/smsign2.c +++ b/openssl/demos/smime/smsign2.c @@ -4,104 +4,99 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *scert = NULL, *scert2 = NULL; - EVP_PKEY *skey = NULL, *skey2 = NULL; - PKCS7 *p7 = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *scert = NULL, *scert2 = NULL; + EVP_PKEY *skey = NULL, *skey2 = NULL; + PKCS7 *p7 = NULL; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - tbio = BIO_new_file("signer.pem", "r"); + tbio = BIO_new_file("signer.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + scert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + skey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - BIO_free(tbio); + BIO_free(tbio); - tbio = BIO_new_file("signer2.pem", "r"); + tbio = BIO_new_file("signer2.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - scert2 = PEM_read_bio_X509(tbio, NULL, 0, NULL); + scert2 = PEM_read_bio_X509(tbio, NULL, 0, NULL); - BIO_reset(tbio); + BIO_reset(tbio); - skey2 = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); + skey2 = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL); - if (!scert2 || !skey2) - goto err; + if (!scert2 || !skey2) + goto err; - in = BIO_new_file("sign.txt", "r"); + in = BIO_new_file("sign.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - p7 = PKCS7_sign(NULL, NULL, NULL, in, PKCS7_STREAM|PKCS7_PARTIAL); + p7 = PKCS7_sign(NULL, NULL, NULL, in, PKCS7_STREAM | PKCS7_PARTIAL); - if (!p7) - goto err; + if (!p7) + goto err; - /* Add each signer in turn */ + /* Add each signer in turn */ - if (!PKCS7_sign_add_signer(p7, scert, skey, NULL, 0)) - goto err; + if (!PKCS7_sign_add_signer(p7, scert, skey, NULL, 0)) + goto err; - if (!PKCS7_sign_add_signer(p7, scert2, skey2, NULL, 0)) - goto err; + if (!PKCS7_sign_add_signer(p7, scert2, skey2, NULL, 0)) + goto err; - out = BIO_new_file("smout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("smout.txt", "w"); + if (!out) + goto err; - /* NB: content included and finalized by SMIME_write_PKCS7 */ + /* NB: content included and finalized by SMIME_write_PKCS7 */ - if (!SMIME_write_PKCS7(out, p7, in, PKCS7_STREAM)) - goto err; + if (!SMIME_write_PKCS7(out, p7, in, PKCS7_STREAM)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Signing Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } - if (p7) - PKCS7_free(p7); + if (p7) + PKCS7_free(p7); - if (scert) - X509_free(scert); - if (skey) - EVP_PKEY_free(skey); - - if (scert2) - X509_free(scert2); - if (skey) - EVP_PKEY_free(skey2); - - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); - - return ret; - - } + if (scert) + X509_free(scert); + if (skey) + EVP_PKEY_free(skey); + if (scert2) + X509_free(scert2); + if (skey) + EVP_PKEY_free(skey2); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); + return ret; +} diff --git a/openssl/demos/smime/smver.c b/openssl/demos/smime/smver.c index 9d360c273..21937df30 100644 --- a/openssl/demos/smime/smver.c +++ b/openssl/demos/smime/smver.c @@ -4,84 +4,82 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL; - X509_STORE *st = NULL; - X509 *cacert = NULL; - PKCS7 *p7 = NULL; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL; + X509_STORE *st = NULL; + X509 *cacert = NULL; + PKCS7 *p7 = NULL; - int ret = 1; + int ret = 1; - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); - /* Set up trusted CA certificate store */ + /* Set up trusted CA certificate store */ - st = X509_STORE_new(); + st = X509_STORE_new(); - /* Read in signer certificate and private key */ - tbio = BIO_new_file("cacert.pem", "r"); + /* Read in signer certificate and private key */ + tbio = BIO_new_file("cacert.pem", "r"); - if (!tbio) - goto err; + if (!tbio) + goto err; - cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL); + cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL); - if (!cacert) - goto err; + if (!cacert) + goto err; - if (!X509_STORE_add_cert(st, cacert)) - goto err; + if (!X509_STORE_add_cert(st, cacert)) + goto err; - /* Open content being signed */ + /* Open content being signed */ - in = BIO_new_file("smout.txt", "r"); + in = BIO_new_file("smout.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Sign content */ - p7 = SMIME_read_PKCS7(in, &cont); + /* Sign content */ + p7 = SMIME_read_PKCS7(in, &cont); - if (!p7) - goto err; + if (!p7) + goto err; - /* File to output verified content to */ - out = BIO_new_file("smver.txt", "w"); - if (!out) - goto err; + /* File to output verified content to */ + out = BIO_new_file("smver.txt", "w"); + if (!out) + goto err; - if (!PKCS7_verify(p7, NULL, st, cont, out, 0)) - { - fprintf(stderr, "Verification Failure\n"); - goto err; - } + if (!PKCS7_verify(p7, NULL, st, cont, out, 0)) { + fprintf(stderr, "Verification Failure\n"); + goto err; + } - fprintf(stderr, "Verification Successful\n"); + fprintf(stderr, "Verification Successful\n"); - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Verifying Data\n"); - ERR_print_errors_fp(stderr); - } + if (ret) { + fprintf(stderr, "Error Verifying Data\n"); + ERR_print_errors_fp(stderr); + } - if (p7) - PKCS7_free(p7); + if (p7) + PKCS7_free(p7); - if (cacert) - X509_free(cacert); + if (cacert) + X509_free(cacert); - if (in) - BIO_free(in); - if (out) - BIO_free(out); - if (tbio) - BIO_free(tbio); + if (in) + BIO_free(in); + if (out) + BIO_free(out); + if (tbio) + BIO_free(tbio); - return ret; + return ret; - } +} diff --git a/openssl/demos/spkigen.c b/openssl/demos/spkigen.c index 2cd5dfea9..c272a8c22 100644 --- a/openssl/demos/spkigen.c +++ b/openssl/demos/spkigen.c @@ -1,8 +1,9 @@ /* NOCW */ -/* demos/spkigen.c - * 18-Mar-1997 - eay - A quick hack :-) - * version 1.1, it would probably help to save or load the - * private key :-) +/*- + * demos/spkigen.c + * 18-Mar-1997 - eay - A quick hack :-) + * version 1.1, it would probably help to save or load the + * private key :-) */ #include #include @@ -13,149 +14,159 @@ #include #include -/* The following two don't exist in SSLeay but they are in here as - * examples */ +/* + * The following two don't exist in SSLeay but they are in here as examples + */ #define PEM_write_SPKI(fp,x) \ - PEM_ASN1_write((int (*)())i2d_NETSCAPE_SPKI,"SPKI",fp,\ - (char *)x,NULL,NULL,0,NULL) + PEM_ASN1_write((int (*)())i2d_NETSCAPE_SPKI,"SPKI",fp,\ + (char *)x,NULL,NULL,0,NULL) int SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey); /* These are defined in the next version of SSLeay */ -int EVP_PKEY_assign(EVP_PKEY *pkey, int type,char *key); -#define RSA_F4 0x10001 +int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key); +#define RSA_F4 0x10001 #define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\ - (char *)(rsa)) + (char *)(rsa)) -int main(argc,argv) +int main(argc, argv) int argc; char *argv[]; - { - RSA *rsa=NULL; - NETSCAPE_SPKI *spki=NULL; - EVP_PKEY *pkey=NULL; - char buf[128]; - int ok=0,i; - FILE *fp; - - pkey=EVP_PKEY_new(); - - if (argc < 2) - { - /* Generate an RSA key, the random state should have been seeded - * with lots of calls to RAND_seed(....) */ - fprintf(stderr,"generating RSA key, could take some time...\n"); - if ((rsa=RSA_generate_key(512,RSA_F4,NULL)) == NULL) goto err; - } - else - { - if ((fp=fopen(argv[1],"r")) == NULL) - { perror(argv[1]); goto err; } - if ((rsa=PEM_read_RSAPrivateKey(fp,NULL,NULL)) == NULL) - goto err; - fclose(fp); - } - - if (!EVP_PKEY_assign_RSA(pkey,rsa)) goto err; - rsa=NULL; - - /* lets make the spki and set the public key and challenge */ - if ((spki=NETSCAPE_SPKI_new()) == NULL) goto err; - - if (!SPKI_set_pubkey(spki,pkey)) goto err; - - fprintf(stderr,"please enter challenge string:"); - fflush(stderr); - buf[0]='\0'; - fgets(buf,sizeof buf,stdin); - i=strlen(buf); - if (i > 0) buf[--i]='\0'; - if (!ASN1_STRING_set((ASN1_STRING *)spki->spkac->challenge, - buf,i)) goto err; - - if (!NETSCAPE_SPKI_sign(spki,pkey,EVP_md5())) goto err; - PEM_write_SPKI(stdout,spki); - if (argc < 2) - PEM_write_RSAPrivateKey(stdout,pkey->pkey.rsa,NULL,NULL,0,NULL); - - ok=1; -err: - if (!ok) - { - fprintf(stderr,"something bad happened...."); - ERR_print_errors_fp(stderr); - } - NETSCAPE_SPKI_free(spki); - EVP_PKEY_free(pkey); - exit(!ok); - } +{ + RSA *rsa = NULL; + NETSCAPE_SPKI *spki = NULL; + EVP_PKEY *pkey = NULL; + char buf[128]; + int ok = 0, i; + FILE *fp; + + pkey = EVP_PKEY_new(); + + if (argc < 2) { + /* + * Generate an RSA key, the random state should have been seeded with + * lots of calls to RAND_seed(....) + */ + fprintf(stderr, "generating RSA key, could take some time...\n"); + if ((rsa = RSA_generate_key(512, RSA_F4, NULL)) == NULL) + goto err; + } else { + if ((fp = fopen(argv[1], "r")) == NULL) { + perror(argv[1]); + goto err; + } + if ((rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL)) == NULL) + goto err; + fclose(fp); + } + + if (!EVP_PKEY_assign_RSA(pkey, rsa)) + goto err; + rsa = NULL; + + /* lets make the spki and set the public key and challenge */ + if ((spki = NETSCAPE_SPKI_new()) == NULL) + goto err; + + if (!SPKI_set_pubkey(spki, pkey)) + goto err; + + fprintf(stderr, "please enter challenge string:"); + fflush(stderr); + buf[0] = '\0'; + fgets(buf, sizeof buf, stdin); + i = strlen(buf); + if (i > 0) + buf[--i] = '\0'; + if (!ASN1_STRING_set((ASN1_STRING *)spki->spkac->challenge, buf, i)) + goto err; + + if (!NETSCAPE_SPKI_sign(spki, pkey, EVP_md5())) + goto err; + PEM_write_SPKI(stdout, spki); + if (argc < 2) + PEM_write_RSAPrivateKey(stdout, pkey->pkey.rsa, NULL, NULL, 0, NULL); + + ok = 1; + err: + if (!ok) { + fprintf(stderr, "something bad happened...."); + ERR_print_errors_fp(stderr); + } + NETSCAPE_SPKI_free(spki); + EVP_PKEY_free(pkey); + exit(!ok); +} /* This function is in the next version of SSLeay */ -int EVP_PKEY_assign(pkey,type,key) +int EVP_PKEY_assign(pkey, type, key) EVP_PKEY *pkey; int type; char *key; - { - if (pkey == NULL) return(0); - if (pkey->pkey.ptr != NULL) - { - if (pkey->type == EVP_PKEY_RSA) - RSA_free(pkey->pkey.rsa); - /* else memory leak */ - } - pkey->type=type; - pkey->pkey.ptr=key; - return(1); - } - -/* While I have a - * X509_set_pubkey() and X509_REQ_set_pubkey(), SPKI_set_pubkey() does - * not currently exist so here is a version of it. - * The next SSLeay release will probably have - * X509_set_pubkey(), - * X509_REQ_set_pubkey() and - * NETSCAPE_SPKI_set_pubkey() - * as macros calling the same function */ -int SPKI_set_pubkey(x,pkey) +{ + if (pkey == NULL) + return (0); + if (pkey->pkey.ptr != NULL) { + if (pkey->type == EVP_PKEY_RSA) + RSA_free(pkey->pkey.rsa); + /* else memory leak */ + } + pkey->type = type; + pkey->pkey.ptr = key; + return (1); +} + +/* + * While I have a X509_set_pubkey() and X509_REQ_set_pubkey(), + * SPKI_set_pubkey() does not currently exist so here is a version of it. The + * next SSLeay release will probably have X509_set_pubkey(), + * X509_REQ_set_pubkey() and NETSCAPE_SPKI_set_pubkey() as macros calling the + * same function + */ +int SPKI_set_pubkey(x, pkey) NETSCAPE_SPKI *x; EVP_PKEY *pkey; - { - int ok=0; - X509_PUBKEY *pk; - X509_ALGOR *a; - ASN1_OBJECT *o; - unsigned char *s,*p; - int i; - - if (x == NULL) return(0); - - if ((pk=X509_PUBKEY_new()) == NULL) goto err; - a=pk->algor; - - /* set the algorithm id */ - if ((o=OBJ_nid2obj(pkey->type)) == NULL) goto err; - ASN1_OBJECT_free(a->algorithm); - a->algorithm=o; - - /* Set the parameter list */ - if ((a->parameter == NULL) || (a->parameter->type != V_ASN1_NULL)) - { - ASN1_TYPE_free(a->parameter); - a->parameter=ASN1_TYPE_new(); - a->parameter->type=V_ASN1_NULL; - } - i=i2d_PublicKey(pkey,NULL); - if ((s=(unsigned char *)malloc(i+1)) == NULL) goto err; - p=s; - i2d_PublicKey(pkey,&p); - if (!ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err; - free(s); - - X509_PUBKEY_free(x->spkac->pubkey); - x->spkac->pubkey=pk; - pk=NULL; - ok=1; -err: - if (pk != NULL) X509_PUBKEY_free(pk); - return(ok); - } - +{ + int ok = 0; + X509_PUBKEY *pk; + X509_ALGOR *a; + ASN1_OBJECT *o; + unsigned char *s, *p; + int i; + + if (x == NULL) + return (0); + + if ((pk = X509_PUBKEY_new()) == NULL) + goto err; + a = pk->algor; + + /* set the algorithm id */ + if ((o = OBJ_nid2obj(pkey->type)) == NULL) + goto err; + ASN1_OBJECT_free(a->algorithm); + a->algorithm = o; + + /* Set the parameter list */ + if ((a->parameter == NULL) || (a->parameter->type != V_ASN1_NULL)) { + ASN1_TYPE_free(a->parameter); + a->parameter = ASN1_TYPE_new(); + a->parameter->type = V_ASN1_NULL; + } + i = i2d_PublicKey(pkey, NULL); + if ((s = (unsigned char *)malloc(i + 1)) == NULL) + goto err; + p = s; + i2d_PublicKey(pkey, &p); + if (!ASN1_BIT_STRING_set(pk->public_key, s, i)) + goto err; + free(s); + + X509_PUBKEY_free(x->spkac->pubkey); + x->spkac->pubkey = pk; + pk = NULL; + ok = 1; + err: + if (pk != NULL) + X509_PUBKEY_free(pk); + return (ok); +} diff --git a/openssl/demos/state_machine/state_machine.c b/openssl/demos/state_machine/state_machine.c index fef3f3e3d..2ec196aff 100644 --- a/openssl/demos/state_machine/state_machine.c +++ b/openssl/demos/state_machine/state_machine.c @@ -6,7 +6,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -83,334 +83,325 @@ #include #include -/* die_unless is intended to work like assert, except that it happens - always, even if NDEBUG is defined. Use assert as a stopgap. */ +/* + * die_unless is intended to work like assert, except that it happens always, + * even if NDEBUG is defined. Use assert as a stopgap. + */ -#define die_unless(x) assert(x) +#define die_unless(x) assert(x) -typedef struct - { +typedef struct { SSL_CTX *pCtx; BIO *pbioRead; BIO *pbioWrite; SSL *pSSL; - } SSLStateMachine; +} SSLStateMachine; -void SSLStateMachine_print_error(SSLStateMachine *pMachine,const char *szErr) - { +void SSLStateMachine_print_error(SSLStateMachine * pMachine, + const char *szErr) +{ unsigned long l; - fprintf(stderr,"%s\n",szErr); - while((l=ERR_get_error())) - { - char buf[1024]; + fprintf(stderr, "%s\n", szErr); + while ((l = ERR_get_error())) { + char buf[1024]; - ERR_error_string_n(l,buf,sizeof buf); - fprintf(stderr,"Error %lx: %s\n",l,buf); - } + ERR_error_string_n(l, buf, sizeof buf); + fprintf(stderr, "Error %lx: %s\n", l, buf); } +} SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile, - const char *szKeyFile) - { - SSLStateMachine *pMachine=malloc(sizeof *pMachine); + const char *szKeyFile) +{ + SSLStateMachine *pMachine = malloc(sizeof *pMachine); int n; die_unless(pMachine); - pMachine->pCtx=SSL_CTX_new(SSLv23_server_method()); + pMachine->pCtx = SSL_CTX_new(SSLv23_server_method()); die_unless(pMachine->pCtx); - n=SSL_CTX_use_certificate_file(pMachine->pCtx,szCertificateFile, - SSL_FILETYPE_PEM); + n = SSL_CTX_use_certificate_file(pMachine->pCtx, szCertificateFile, + SSL_FILETYPE_PEM); die_unless(n > 0); - n=SSL_CTX_use_PrivateKey_file(pMachine->pCtx,szKeyFile,SSL_FILETYPE_PEM); + n = SSL_CTX_use_PrivateKey_file(pMachine->pCtx, szKeyFile, + SSL_FILETYPE_PEM); die_unless(n > 0); - pMachine->pSSL=SSL_new(pMachine->pCtx); + pMachine->pSSL = SSL_new(pMachine->pCtx); die_unless(pMachine->pSSL); - pMachine->pbioRead=BIO_new(BIO_s_mem()); + pMachine->pbioRead = BIO_new(BIO_s_mem()); - pMachine->pbioWrite=BIO_new(BIO_s_mem()); + pMachine->pbioWrite = BIO_new(BIO_s_mem()); - SSL_set_bio(pMachine->pSSL,pMachine->pbioRead,pMachine->pbioWrite); + SSL_set_bio(pMachine->pSSL, pMachine->pbioRead, pMachine->pbioWrite); SSL_set_accept_state(pMachine->pSSL); return pMachine; - } - -void SSLStateMachine_read_inject(SSLStateMachine *pMachine, - const unsigned char *aucBuf,int nBuf) - { - int n=BIO_write(pMachine->pbioRead,aucBuf,nBuf); - /* If it turns out this assert fails, then buffer the data here - * and just feed it in in churn instead. Seems to me that it - * should be guaranteed to succeed, though. +} + +void SSLStateMachine_read_inject(SSLStateMachine * pMachine, + const unsigned char *aucBuf, int nBuf) +{ + int n = BIO_write(pMachine->pbioRead, aucBuf, nBuf); + /* + * If it turns out this assert fails, then buffer the data here and just + * feed it in in churn instead. Seems to me that it should be guaranteed + * to succeed, though. */ assert(n == nBuf); - fprintf(stderr,"%d bytes of encrypted data fed to state machine\n",n); - } + fprintf(stderr, "%d bytes of encrypted data fed to state machine\n", n); +} -int SSLStateMachine_read_extract(SSLStateMachine *pMachine, - unsigned char *aucBuf,int nBuf) - { +int SSLStateMachine_read_extract(SSLStateMachine * pMachine, + unsigned char *aucBuf, int nBuf) +{ int n; - if(!SSL_is_init_finished(pMachine->pSSL)) - { - fprintf(stderr,"Doing SSL_accept\n"); - n=SSL_accept(pMachine->pSSL); - if(n == 0) - fprintf(stderr,"SSL_accept returned zero\n"); - if(n < 0) - { - int err; - - if((err=SSL_get_error(pMachine->pSSL,n)) == SSL_ERROR_WANT_READ) - { - fprintf(stderr,"SSL_accept wants more data\n"); - return 0; - } - - SSLStateMachine_print_error(pMachine,"SSL_accept error"); - exit(7); - } - return 0; - } - - n=SSL_read(pMachine->pSSL,aucBuf,nBuf); - if(n < 0) - { - int err=SSL_get_error(pMachine->pSSL,n); - - if(err == SSL_ERROR_WANT_READ) - { - fprintf(stderr,"SSL_read wants more data\n"); - return 0; - } - - SSLStateMachine_print_error(pMachine,"SSL_read error"); - exit(8); - } - - fprintf(stderr,"%d bytes of decrypted data read from state machine\n",n); - return n; + if (!SSL_is_init_finished(pMachine->pSSL)) { + fprintf(stderr, "Doing SSL_accept\n"); + n = SSL_accept(pMachine->pSSL); + if (n == 0) + fprintf(stderr, "SSL_accept returned zero\n"); + if (n < 0) { + int err; + + if ((err = + SSL_get_error(pMachine->pSSL, n)) == SSL_ERROR_WANT_READ) { + fprintf(stderr, "SSL_accept wants more data\n"); + return 0; + } + + SSLStateMachine_print_error(pMachine, "SSL_accept error"); + exit(7); + } + return 0; } -int SSLStateMachine_write_can_extract(SSLStateMachine *pMachine) - { - int n=BIO_pending(pMachine->pbioWrite); - if(n) - fprintf(stderr,"There is encrypted data available to write\n"); + n = SSL_read(pMachine->pSSL, aucBuf, nBuf); + if (n < 0) { + int err = SSL_get_error(pMachine->pSSL, n); + + if (err == SSL_ERROR_WANT_READ) { + fprintf(stderr, "SSL_read wants more data\n"); + return 0; + } + + SSLStateMachine_print_error(pMachine, "SSL_read error"); + exit(8); + } + + fprintf(stderr, "%d bytes of decrypted data read from state machine\n", + n); + return n; +} + +int SSLStateMachine_write_can_extract(SSLStateMachine * pMachine) +{ + int n = BIO_pending(pMachine->pbioWrite); + if (n) + fprintf(stderr, "There is encrypted data available to write\n"); else - fprintf(stderr,"There is no encrypted data available to write\n"); + fprintf(stderr, "There is no encrypted data available to write\n"); return n; - } +} -int SSLStateMachine_write_extract(SSLStateMachine *pMachine, - unsigned char *aucBuf,int nBuf) - { +int SSLStateMachine_write_extract(SSLStateMachine * pMachine, + unsigned char *aucBuf, int nBuf) +{ int n; - n=BIO_read(pMachine->pbioWrite,aucBuf,nBuf); - fprintf(stderr,"%d bytes of encrypted data read from state machine\n",n); + n = BIO_read(pMachine->pbioWrite, aucBuf, nBuf); + fprintf(stderr, "%d bytes of encrypted data read from state machine\n", + n); return n; - } - -void SSLStateMachine_write_inject(SSLStateMachine *pMachine, - const unsigned char *aucBuf,int nBuf) - { - int n=SSL_write(pMachine->pSSL,aucBuf,nBuf); - /* If it turns out this assert fails, then buffer the data here - * and just feed it in in churn instead. Seems to me that it - * should be guaranteed to succeed, though. +} + +void SSLStateMachine_write_inject(SSLStateMachine * pMachine, + const unsigned char *aucBuf, int nBuf) +{ + int n = SSL_write(pMachine->pSSL, aucBuf, nBuf); + /* + * If it turns out this assert fails, then buffer the data here and just + * feed it in in churn instead. Seems to me that it should be guaranteed + * to succeed, though. */ assert(n == nBuf); - fprintf(stderr,"%d bytes of unencrypted data fed to state machine\n",n); - } + fprintf(stderr, "%d bytes of unencrypted data fed to state machine\n", n); +} int OpenSocket(int nPort) - { +{ int nSocket; struct sockaddr_in saServer; struct sockaddr_in saClient; - int one=1; + int one = 1; int nSize; int nFD; int nLen; - nSocket=socket(AF_INET,SOCK_STREAM,IPPROTO_TCP); - if(nSocket < 0) - { - perror("socket"); - exit(1); - } + nSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (nSocket < 0) { + perror("socket"); + exit(1); + } - if(setsockopt(nSocket,SOL_SOCKET,SO_REUSEADDR,(char *)&one,sizeof one) < 0) - { - perror("setsockopt"); + if (setsockopt + (nSocket, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof one) < 0) { + perror("setsockopt"); exit(2); - } - - memset(&saServer,0,sizeof saServer); - saServer.sin_family=AF_INET; - saServer.sin_port=htons(nPort); - nSize=sizeof saServer; - if(bind(nSocket,(struct sockaddr *)&saServer,nSize) < 0) - { - perror("bind"); - exit(3); - } - - if(listen(nSocket,512) < 0) - { - perror("listen"); - exit(4); - } - - nLen=sizeof saClient; - nFD=accept(nSocket,(struct sockaddr *)&saClient,&nLen); - if(nFD < 0) - { - perror("accept"); - exit(5); - } - - fprintf(stderr,"Incoming accepted on port %d\n",nPort); + } - return nFD; + memset(&saServer, 0, sizeof saServer); + saServer.sin_family = AF_INET; + saServer.sin_port = htons(nPort); + nSize = sizeof saServer; + if (bind(nSocket, (struct sockaddr *)&saServer, nSize) < 0) { + perror("bind"); + exit(3); + } + + if (listen(nSocket, 512) < 0) { + perror("listen"); + exit(4); + } + + nLen = sizeof saClient; + nFD = accept(nSocket, (struct sockaddr *)&saClient, &nLen); + if (nFD < 0) { + perror("accept"); + exit(5); } -int main(int argc,char **argv) - { + fprintf(stderr, "Incoming accepted on port %d\n", nPort); + + return nFD; +} + +int main(int argc, char **argv) +{ SSLStateMachine *pMachine; int nPort; int nFD; const char *szCertificateFile; const char *szKeyFile; char rbuf[1]; - int nrbuf=0; + int nrbuf = 0; - if(argc != 4) - { - fprintf(stderr,"%s \n",argv[0]); - exit(6); - } + if (argc != 4) { + fprintf(stderr, "%s \n", argv[0]); + exit(6); + } - nPort=atoi(argv[1]); - szCertificateFile=argv[2]; - szKeyFile=argv[3]; + nPort = atoi(argv[1]); + szCertificateFile = argv[2]; + szKeyFile = argv[3]; SSL_library_init(); OpenSSL_add_ssl_algorithms(); SSL_load_error_strings(); ERR_load_crypto_strings(); - nFD=OpenSocket(nPort); - - pMachine=SSLStateMachine_new(szCertificateFile,szKeyFile); - - for( ; ; ) - { - fd_set rfds,wfds; - unsigned char buf[1024]; - int n; - - FD_ZERO(&rfds); - FD_ZERO(&wfds); - - /* Select socket for input */ - FD_SET(nFD,&rfds); - - /* check whether there's decrypted data */ - if(!nrbuf) - nrbuf=SSLStateMachine_read_extract(pMachine,rbuf,1); - - /* if there's decrypted data, check whether we can write it */ - if(nrbuf) - FD_SET(1,&wfds); - - /* Select socket for output */ - if(SSLStateMachine_write_can_extract(pMachine)) - FD_SET(nFD,&wfds); - - /* Select stdin for input */ - FD_SET(0,&rfds); - - /* Wait for something to do something */ - n=select(nFD+1,&rfds,&wfds,NULL,NULL); - assert(n > 0); - - /* Socket is ready for input */ - if(FD_ISSET(nFD,&rfds)) - { - n=read(nFD,buf,sizeof buf); - if(n == 0) - { - fprintf(stderr,"Got EOF on socket\n"); - exit(0); - } - assert(n > 0); - - SSLStateMachine_read_inject(pMachine,buf,n); - } - - /* stdout is ready for output (and hence we have some to send it) */ - if(FD_ISSET(1,&wfds)) - { - assert(nrbuf == 1); - buf[0]=rbuf[0]; - nrbuf=0; - - n=SSLStateMachine_read_extract(pMachine,buf+1,sizeof buf-1); - if(n < 0) - { - SSLStateMachine_print_error(pMachine,"read extract failed"); - break; - } - assert(n >= 0); - ++n; - if(n > 0) /* FIXME: has to be true now */ - { - int w; - - w=write(1,buf,n); - /* FIXME: we should push back any unwritten data */ - assert(w == n); - } - } - - /* Socket is ready for output (and therefore we have output to send) */ - if(FD_ISSET(nFD,&wfds)) - { - int w; - - n=SSLStateMachine_write_extract(pMachine,buf,sizeof buf); - assert(n > 0); - - w=write(nFD,buf,n); - /* FIXME: we should push back any unwritten data */ - assert(w == n); - } - - /* Stdin is ready for input */ - if(FD_ISSET(0,&rfds)) - { - n=read(0,buf,sizeof buf); - if(n == 0) - { - fprintf(stderr,"Got EOF on stdin\n"); - exit(0); - } - assert(n > 0); - - SSLStateMachine_write_inject(pMachine,buf,n); - } - } + nFD = OpenSocket(nPort); + + pMachine = SSLStateMachine_new(szCertificateFile, szKeyFile); + + for (;;) { + fd_set rfds, wfds; + unsigned char buf[1024]; + int n; + + FD_ZERO(&rfds); + FD_ZERO(&wfds); + + /* Select socket for input */ + FD_SET(nFD, &rfds); + + /* check whether there's decrypted data */ + if (!nrbuf) + nrbuf = SSLStateMachine_read_extract(pMachine, rbuf, 1); + + /* if there's decrypted data, check whether we can write it */ + if (nrbuf) + FD_SET(1, &wfds); + + /* Select socket for output */ + if (SSLStateMachine_write_can_extract(pMachine)) + FD_SET(nFD, &wfds); + + /* Select stdin for input */ + FD_SET(0, &rfds); + + /* Wait for something to do something */ + n = select(nFD + 1, &rfds, &wfds, NULL, NULL); + assert(n > 0); + + /* Socket is ready for input */ + if (FD_ISSET(nFD, &rfds)) { + n = read(nFD, buf, sizeof buf); + if (n == 0) { + fprintf(stderr, "Got EOF on socket\n"); + exit(0); + } + assert(n > 0); + + SSLStateMachine_read_inject(pMachine, buf, n); + } + + /* stdout is ready for output (and hence we have some to send it) */ + if (FD_ISSET(1, &wfds)) { + assert(nrbuf == 1); + buf[0] = rbuf[0]; + nrbuf = 0; + + n = SSLStateMachine_read_extract(pMachine, buf + 1, + sizeof buf - 1); + if (n < 0) { + SSLStateMachine_print_error(pMachine, "read extract failed"); + break; + } + assert(n >= 0); + ++n; + if (n > 0) { /* FIXME: has to be true now */ + int w; + + w = write(1, buf, n); + /* FIXME: we should push back any unwritten data */ + assert(w == n); + } + } + + /* + * Socket is ready for output (and therefore we have output to send) + */ + if (FD_ISSET(nFD, &wfds)) { + int w; + + n = SSLStateMachine_write_extract(pMachine, buf, sizeof buf); + assert(n > 0); + + w = write(nFD, buf, n); + /* FIXME: we should push back any unwritten data */ + assert(w == n); + } + + /* Stdin is ready for input */ + if (FD_ISSET(0, &rfds)) { + n = read(0, buf, sizeof buf); + if (n == 0) { + fprintf(stderr, "Got EOF on stdin\n"); + exit(0); + } + assert(n > 0); + + SSLStateMachine_write_inject(pMachine, buf, n); + } + } /* not reached */ return 0; - } +} diff --git a/openssl/demos/tunala/breakage.c b/openssl/demos/tunala/breakage.c index dcdd64b0e..16a3b9e0c 100644 --- a/openssl/demos/tunala/breakage.c +++ b/openssl/demos/tunala/breakage.c @@ -3,64 +3,66 @@ int int_strtoul(const char *str, unsigned long *val) { #ifdef HAVE_STRTOUL - char *tmp; - unsigned long ret = strtoul(str, &tmp, 10); - if((str == tmp) || (*tmp != '\0')) - /* The value didn't parse cleanly */ - return 0; - if(ret == ULONG_MAX) - /* We hit a limit */ - return 0; - *val = ret; - return 1; + char *tmp; + unsigned long ret = strtoul(str, &tmp, 10); + if ((str == tmp) || (*tmp != '\0')) + /* The value didn't parse cleanly */ + return 0; + if (ret == ULONG_MAX) + /* We hit a limit */ + return 0; + *val = ret; + return 1; #else - char buf[2]; - unsigned long ret = 0; - buf[1] = '\0'; - if(str == '\0') - /* An empty string ... */ - return 0; - while(*str != '\0') { - /* We have to multiply 'ret' by 10 before absorbing the next - * digit. If this will overflow, catch it now. */ - if(ret && (((ULONG_MAX + 10) / ret) < 10)) - return 0; - ret *= 10; - if(!isdigit(*str)) - return 0; - buf[0] = *str; - ret += atoi(buf); - str++; - } - *val = ret; - return 1; + char buf[2]; + unsigned long ret = 0; + buf[1] = '\0'; + if (str == '\0') + /* An empty string ... */ + return 0; + while (*str != '\0') { + /* + * We have to multiply 'ret' by 10 before absorbing the next digit. + * If this will overflow, catch it now. + */ + if (ret && (((ULONG_MAX + 10) / ret) < 10)) + return 0; + ret *= 10; + if (!isdigit(*str)) + return 0; + buf[0] = *str; + ret += atoi(buf); + str++; + } + *val = ret; + return 1; #endif } #ifndef HAVE_STRSTR char *int_strstr(const char *haystack, const char *needle) { - const char *sub_haystack = haystack, *sub_needle = needle; - unsigned int offset = 0; - if(!needle) - return haystack; - if(!haystack) - return NULL; - while((*sub_haystack != '\0') && (*sub_needle != '\0')) { - if(sub_haystack[offset] == sub_needle) { - /* sub_haystack is still a candidate */ - offset++; - sub_needle++; - } else { - /* sub_haystack is no longer a possibility */ - sub_haystack++; - offset = 0; - sub_needle = needle; - } - } - if(*sub_haystack == '\0') - /* Found nothing */ - return NULL; - return sub_haystack; + const char *sub_haystack = haystack, *sub_needle = needle; + unsigned int offset = 0; + if (!needle) + return haystack; + if (!haystack) + return NULL; + while ((*sub_haystack != '\0') && (*sub_needle != '\0')) { + if (sub_haystack[offset] == sub_needle) { + /* sub_haystack is still a candidate */ + offset++; + sub_needle++; + } else { + /* sub_haystack is no longer a possibility */ + sub_haystack++; + offset = 0; + sub_needle = needle; + } + } + if (*sub_haystack == '\0') + /* Found nothing */ + return NULL; + return sub_haystack; } #endif diff --git a/openssl/demos/tunala/buffer.c b/openssl/demos/tunala/buffer.c index c5cd00420..8e2cc9d20 100644 --- a/openssl/demos/tunala/buffer.c +++ b/openssl/demos/tunala/buffer.c @@ -2,204 +2,235 @@ #ifndef NO_BUFFER -void buffer_init(buffer_t *buf) +void buffer_init(buffer_t * buf) { - buf->used = 0; - buf->total_in = buf->total_out = 0; + buf->used = 0; + buf->total_in = buf->total_out = 0; } -void buffer_close(buffer_t *buf) +void buffer_close(buffer_t * buf) { - /* Our data is static - nothing needs "release", just reset it */ - buf->used = 0; + /* Our data is static - nothing needs "release", just reset it */ + buf->used = 0; } /* Code these simple ones in compact form */ -unsigned int buffer_used(buffer_t *buf) { - return buf->used; } -unsigned int buffer_unused(buffer_t *buf) { - return (MAX_DATA_SIZE - buf->used); } -int buffer_full(buffer_t *buf) { - return (buf->used == MAX_DATA_SIZE ? 1 : 0); } -int buffer_notfull(buffer_t *buf) { - return (buf->used < MAX_DATA_SIZE ? 1 : 0); } -int buffer_empty(buffer_t *buf) { - return (buf->used == 0 ? 1 : 0); } -int buffer_notempty(buffer_t *buf) { - return (buf->used > 0 ? 1 : 0); } -unsigned long buffer_total_in(buffer_t *buf) { - return buf->total_in; } -unsigned long buffer_total_out(buffer_t *buf) { - return buf->total_out; } - -/* These 3 static (internal) functions don't adjust the "total" variables as +unsigned int buffer_used(buffer_t * buf) +{ + return buf->used; +} + +unsigned int buffer_unused(buffer_t * buf) +{ + return (MAX_DATA_SIZE - buf->used); +} + +int buffer_full(buffer_t * buf) +{ + return (buf->used == MAX_DATA_SIZE ? 1 : 0); +} + +int buffer_notfull(buffer_t * buf) +{ + return (buf->used < MAX_DATA_SIZE ? 1 : 0); +} + +int buffer_empty(buffer_t * buf) +{ + return (buf->used == 0 ? 1 : 0); +} + +int buffer_notempty(buffer_t * buf) +{ + return (buf->used > 0 ? 1 : 0); +} + +unsigned long buffer_total_in(buffer_t * buf) +{ + return buf->total_in; +} + +unsigned long buffer_total_out(buffer_t * buf) +{ + return buf->total_out; +} + +/* + * These 3 static (internal) functions don't adjust the "total" variables as * it's not sure when they're called how it should be interpreted. Only the * higher-level "buffer_[to|from]_[fd|SSL|BIO]" functions should alter these - * values. */ -#if 0 /* To avoid "unused" warnings */ -static unsigned int buffer_adddata(buffer_t *buf, const unsigned char *ptr, - unsigned int size) -{ - unsigned int added = MAX_DATA_SIZE - buf->used; - if(added > size) - added = size; - if(added == 0) - return 0; - memcpy(buf->data + buf->used, ptr, added); - buf->used += added; - buf->total_in += added; - return added; -} - -static unsigned int buffer_tobuffer(buffer_t *to, buffer_t *from, int cap) -{ - unsigned int moved, tomove = from->used; - if((int)tomove > cap) - tomove = cap; - if(tomove == 0) - return 0; - moved = buffer_adddata(to, from->data, tomove); - if(moved == 0) - return 0; - buffer_takedata(from, NULL, moved); - return moved; -} -#endif - -static unsigned int buffer_takedata(buffer_t *buf, unsigned char *ptr, - unsigned int size) -{ - unsigned int taken = buf->used; - if(taken > size) - taken = size; - if(taken == 0) - return 0; - if(ptr) - memcpy(ptr, buf->data, taken); - buf->used -= taken; - /* Do we have to scroll? */ - if(buf->used > 0) - memmove(buf->data, buf->data + taken, buf->used); - return taken; -} - -#ifndef NO_IP - -int buffer_from_fd(buffer_t *buf, int fd) -{ - int toread = buffer_unused(buf); - if(toread == 0) - /* Shouldn't be called in this case! */ - abort(); - toread = read(fd, buf->data + buf->used, toread); - if(toread > 0) { - buf->used += toread; - buf->total_in += toread; - } - return toread; -} - -int buffer_to_fd(buffer_t *buf, int fd) -{ - int towrite = buffer_used(buf); - if(towrite == 0) - /* Shouldn't be called in this case! */ - abort(); - towrite = write(fd, buf->data, towrite); - if(towrite > 0) { - buffer_takedata(buf, NULL, towrite); - buf->total_out += towrite; - } - return towrite; -} - -#endif /* !defined(NO_IP) */ - -#ifndef NO_OPENSSL + * values. + */ +# if 0 /* To avoid "unused" warnings */ +static unsigned int buffer_adddata(buffer_t * buf, const unsigned char *ptr, + unsigned int size) +{ + unsigned int added = MAX_DATA_SIZE - buf->used; + if (added > size) + added = size; + if (added == 0) + return 0; + memcpy(buf->data + buf->used, ptr, added); + buf->used += added; + buf->total_in += added; + return added; +} + +static unsigned int buffer_tobuffer(buffer_t * to, buffer_t * from, int cap) +{ + unsigned int moved, tomove = from->used; + if ((int)tomove > cap) + tomove = cap; + if (tomove == 0) + return 0; + moved = buffer_adddata(to, from->data, tomove); + if (moved == 0) + return 0; + buffer_takedata(from, NULL, moved); + return moved; +} +# endif + +static unsigned int buffer_takedata(buffer_t * buf, unsigned char *ptr, + unsigned int size) +{ + unsigned int taken = buf->used; + if (taken > size) + taken = size; + if (taken == 0) + return 0; + if (ptr) + memcpy(ptr, buf->data, taken); + buf->used -= taken; + /* Do we have to scroll? */ + if (buf->used > 0) + memmove(buf->data, buf->data + taken, buf->used); + return taken; +} + +# ifndef NO_IP + +int buffer_from_fd(buffer_t * buf, int fd) +{ + int toread = buffer_unused(buf); + if (toread == 0) + /* Shouldn't be called in this case! */ + abort(); + toread = read(fd, buf->data + buf->used, toread); + if (toread > 0) { + buf->used += toread; + buf->total_in += toread; + } + return toread; +} + +int buffer_to_fd(buffer_t * buf, int fd) +{ + int towrite = buffer_used(buf); + if (towrite == 0) + /* Shouldn't be called in this case! */ + abort(); + towrite = write(fd, buf->data, towrite); + if (towrite > 0) { + buffer_takedata(buf, NULL, towrite); + buf->total_out += towrite; + } + return towrite; +} + +# endif /* !defined(NO_IP) */ + +# ifndef NO_OPENSSL static void int_ssl_check(SSL *s, int ret) { - int e = SSL_get_error(s, ret); - switch(e) { - /* These seem to be harmless and already "dealt with" by our - * non-blocking environment. NB: "ZERO_RETURN" is the clean - * "error" indicating a successfully closed SSL tunnel. We let - * this happen because our IO loop should not appear to have - * broken on this condition - and outside the IO loop, the - * "shutdown" state is checked. */ - case SSL_ERROR_NONE: - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - case SSL_ERROR_WANT_X509_LOOKUP: - case SSL_ERROR_ZERO_RETURN: - return; - /* These seem to be indications of a genuine error that should - * result in the SSL tunnel being regarded as "dead". */ - case SSL_ERROR_SYSCALL: - case SSL_ERROR_SSL: - SSL_set_app_data(s, (char *)1); - return; - default: - break; - } - /* For any other errors that (a) exist, and (b) crop up - we need to - * interpret what to do with them - so "politely inform" the caller that - * the code needs updating here. */ - abort(); -} - -void buffer_from_SSL(buffer_t *buf, SSL *ssl) -{ - int ret; - if(!ssl || buffer_full(buf)) - return; - ret = SSL_read(ssl, buf->data + buf->used, buffer_unused(buf)); - if(ret > 0) { - buf->used += ret; - buf->total_in += ret; - } - if(ret < 0) - int_ssl_check(ssl, ret); -} - -void buffer_to_SSL(buffer_t *buf, SSL *ssl) -{ - int ret; - if(!ssl || buffer_empty(buf)) - return; - ret = SSL_write(ssl, buf->data, buf->used); - if(ret > 0) { - buffer_takedata(buf, NULL, ret); - buf->total_out += ret; - } - if(ret < 0) - int_ssl_check(ssl, ret); -} - -void buffer_from_BIO(buffer_t *buf, BIO *bio) -{ - int ret; - if(!bio || buffer_full(buf)) - return; - ret = BIO_read(bio, buf->data + buf->used, buffer_unused(buf)); - if(ret > 0) { - buf->used += ret; - buf->total_in += ret; - } -} - -void buffer_to_BIO(buffer_t *buf, BIO *bio) -{ - int ret; - if(!bio || buffer_empty(buf)) - return; - ret = BIO_write(bio, buf->data, buf->used); - if(ret > 0) { - buffer_takedata(buf, NULL, ret); - buf->total_out += ret; - } -} - -#endif /* !defined(NO_OPENSSL) */ - -#endif /* !defined(NO_BUFFER) */ + int e = SSL_get_error(s, ret); + switch (e) { + /* + * These seem to be harmless and already "dealt with" by our + * non-blocking environment. NB: "ZERO_RETURN" is the clean "error" + * indicating a successfully closed SSL tunnel. We let this happen + * because our IO loop should not appear to have broken on this + * condition - and outside the IO loop, the "shutdown" state is + * checked. + */ + case SSL_ERROR_NONE: + case SSL_ERROR_WANT_READ: + case SSL_ERROR_WANT_WRITE: + case SSL_ERROR_WANT_X509_LOOKUP: + case SSL_ERROR_ZERO_RETURN: + return; + /* + * These seem to be indications of a genuine error that should result + * in the SSL tunnel being regarded as "dead". + */ + case SSL_ERROR_SYSCALL: + case SSL_ERROR_SSL: + SSL_set_app_data(s, (char *)1); + return; + default: + break; + } + /* + * For any other errors that (a) exist, and (b) crop up - we need to + * interpret what to do with them - so "politely inform" the caller that + * the code needs updating here. + */ + abort(); +} + +void buffer_from_SSL(buffer_t * buf, SSL *ssl) +{ + int ret; + if (!ssl || buffer_full(buf)) + return; + ret = SSL_read(ssl, buf->data + buf->used, buffer_unused(buf)); + if (ret > 0) { + buf->used += ret; + buf->total_in += ret; + } + if (ret < 0) + int_ssl_check(ssl, ret); +} + +void buffer_to_SSL(buffer_t * buf, SSL *ssl) +{ + int ret; + if (!ssl || buffer_empty(buf)) + return; + ret = SSL_write(ssl, buf->data, buf->used); + if (ret > 0) { + buffer_takedata(buf, NULL, ret); + buf->total_out += ret; + } + if (ret < 0) + int_ssl_check(ssl, ret); +} + +void buffer_from_BIO(buffer_t * buf, BIO *bio) +{ + int ret; + if (!bio || buffer_full(buf)) + return; + ret = BIO_read(bio, buf->data + buf->used, buffer_unused(buf)); + if (ret > 0) { + buf->used += ret; + buf->total_in += ret; + } +} + +void buffer_to_BIO(buffer_t * buf, BIO *bio) +{ + int ret; + if (!bio || buffer_empty(buf)) + return; + ret = BIO_write(bio, buf->data, buf->used); + if (ret > 0) { + buffer_takedata(buf, NULL, ret); + buf->total_out += ret; + } +} + +# endif /* !defined(NO_OPENSSL) */ + +#endif /* !defined(NO_BUFFER) */ diff --git a/openssl/demos/tunala/cb.c b/openssl/demos/tunala/cb.c index f6e452ae9..684a07f08 100644 --- a/openssl/demos/tunala/cb.c +++ b/openssl/demos/tunala/cb.c @@ -5,7 +5,8 @@ /* For callbacks generating output, here are their file-descriptors. */ static FILE *fp_cb_ssl_info = NULL; static FILE *fp_cb_ssl_verify = NULL; -/* Output level: +/*- + * Output level: * 0 = nothing, * 1 = minimal, just errors, * 2 = minimal, all steps, @@ -15,148 +16,158 @@ static unsigned int cb_ssl_verify_level = 1; /* Other static rubbish (to mirror s_cb.c where required) */ static int int_verify_depth = 10; -/* This function is largely borrowed from the one used in OpenSSL's "s_client" - * and "s_server" utilities. */ +/* + * This function is largely borrowed from the one used in OpenSSL's + * "s_client" and "s_server" utilities. + */ void cb_ssl_info(const SSL *s, int where, int ret) { - const char *str1, *str2; - int w; - - if(!fp_cb_ssl_info) - return; - - w = where & ~SSL_ST_MASK; - str1 = (w & SSL_ST_CONNECT ? "SSL_connect" : (w & SSL_ST_ACCEPT ? - "SSL_accept" : "undefined")), - str2 = SSL_state_string_long(s); - - if (where & SSL_CB_LOOP) - fprintf(fp_cb_ssl_info, "(%s) %s\n", str1, str2); - else if (where & SSL_CB_EXIT) { - if (ret == 0) - fprintf(fp_cb_ssl_info, "(%s) failed in %s\n", str1, str2); -/* In a non-blocking model, we get a few of these "error"s simply because we're - * calling "reads" and "writes" on the state-machine that are virtual NOPs - * simply to avoid wasting the time seeing if we *should* call them. Removing - * this case makes the "-out_state" output a lot easier on the eye. */ -#if 0 - else if (ret < 0) - fprintf(fp_cb_ssl_info, "%s:error in %s\n", str1, str2); -#endif - } + const char *str1, *str2; + int w; + + if (!fp_cb_ssl_info) + return; + + w = where & ~SSL_ST_MASK; + str1 = (w & SSL_ST_CONNECT ? "SSL_connect" : (w & SSL_ST_ACCEPT ? + "SSL_accept" : + "undefined")), str2 = + SSL_state_string_long(s); + + if (where & SSL_CB_LOOP) + fprintf(fp_cb_ssl_info, "(%s) %s\n", str1, str2); + else if (where & SSL_CB_EXIT) { + if (ret == 0) + fprintf(fp_cb_ssl_info, "(%s) failed in %s\n", str1, str2); + /* + * In a non-blocking model, we get a few of these "error"s simply + * because we're calling "reads" and "writes" on the state-machine + * that are virtual NOPs simply to avoid wasting the time seeing if + * we *should* call them. Removing this case makes the "-out_state" + * output a lot easier on the eye. + */ +# if 0 + else if (ret < 0) + fprintf(fp_cb_ssl_info, "%s:error in %s\n", str1, str2); +# endif + } } void cb_ssl_info_set_output(FILE *fp) { - fp_cb_ssl_info = fp; + fp_cb_ssl_info = fp; } -static const char *int_reason_no_issuer = "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT"; +static const char *int_reason_no_issuer = + "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT"; static const char *int_reason_not_yet = "X509_V_ERR_CERT_NOT_YET_VALID"; -static const char *int_reason_before = "X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD"; +static const char *int_reason_before = + "X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD"; static const char *int_reason_expired = "X509_V_ERR_CERT_HAS_EXPIRED"; -static const char *int_reason_after = "X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD"; +static const char *int_reason_after = + "X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD"; /* Stolen wholesale from apps/s_cb.c :-) And since then, mutilated ... */ int cb_ssl_verify(int ok, X509_STORE_CTX *ctx) { - char buf1[256]; /* Used for the subject name */ - char buf2[256]; /* Used for the issuer name */ - const char *reason = NULL; /* Error reason (if any) */ - X509 *err_cert; - int err, depth; - - if(!fp_cb_ssl_verify || (cb_ssl_verify_level == 0)) - return ok; - err_cert = X509_STORE_CTX_get_current_cert(ctx); - err = X509_STORE_CTX_get_error(ctx); - depth = X509_STORE_CTX_get_error_depth(ctx); - - buf1[0] = buf2[0] = '\0'; - /* Fill buf1 */ - X509_NAME_oneline(X509_get_subject_name(err_cert), buf1, 256); - /* Fill buf2 */ - X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf2, 256); - switch (ctx->error) { - case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: - reason = int_reason_no_issuer; - break; - case X509_V_ERR_CERT_NOT_YET_VALID: - reason = int_reason_not_yet; - break; - case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: - reason = int_reason_before; - break; - case X509_V_ERR_CERT_HAS_EXPIRED: - reason = int_reason_expired; - break; - case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: - reason = int_reason_after; - break; - } - - if((cb_ssl_verify_level == 1) && ok) - return ok; - fprintf(fp_cb_ssl_verify, "chain-depth=%d, ", depth); - if(reason) - fprintf(fp_cb_ssl_verify, "error=%s\n", reason); - else - fprintf(fp_cb_ssl_verify, "error=%d\n", err); - if(cb_ssl_verify_level < 3) - return ok; - fprintf(fp_cb_ssl_verify, "--> subject = %s\n", buf1); - fprintf(fp_cb_ssl_verify, "--> issuer = %s\n", buf2); - if(!ok) - fprintf(fp_cb_ssl_verify,"--> verify error:num=%d:%s\n",err, - X509_verify_cert_error_string(err)); - fprintf(fp_cb_ssl_verify, "--> verify return:%d\n",ok); - return ok; + char buf1[256]; /* Used for the subject name */ + char buf2[256]; /* Used for the issuer name */ + const char *reason = NULL; /* Error reason (if any) */ + X509 *err_cert; + int err, depth; + + if (!fp_cb_ssl_verify || (cb_ssl_verify_level == 0)) + return ok; + err_cert = X509_STORE_CTX_get_current_cert(ctx); + err = X509_STORE_CTX_get_error(ctx); + depth = X509_STORE_CTX_get_error_depth(ctx); + + buf1[0] = buf2[0] = '\0'; + /* Fill buf1 */ + X509_NAME_oneline(X509_get_subject_name(err_cert), buf1, 256); + /* Fill buf2 */ + X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf2, 256); + switch (ctx->error) { + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: + reason = int_reason_no_issuer; + break; + case X509_V_ERR_CERT_NOT_YET_VALID: + reason = int_reason_not_yet; + break; + case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: + reason = int_reason_before; + break; + case X509_V_ERR_CERT_HAS_EXPIRED: + reason = int_reason_expired; + break; + case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: + reason = int_reason_after; + break; + } + + if ((cb_ssl_verify_level == 1) && ok) + return ok; + fprintf(fp_cb_ssl_verify, "chain-depth=%d, ", depth); + if (reason) + fprintf(fp_cb_ssl_verify, "error=%s\n", reason); + else + fprintf(fp_cb_ssl_verify, "error=%d\n", err); + if (cb_ssl_verify_level < 3) + return ok; + fprintf(fp_cb_ssl_verify, "--> subject = %s\n", buf1); + fprintf(fp_cb_ssl_verify, "--> issuer = %s\n", buf2); + if (!ok) + fprintf(fp_cb_ssl_verify, "--> verify error:num=%d:%s\n", err, + X509_verify_cert_error_string(err)); + fprintf(fp_cb_ssl_verify, "--> verify return:%d\n", ok); + return ok; } void cb_ssl_verify_set_output(FILE *fp) { - fp_cb_ssl_verify = fp; + fp_cb_ssl_verify = fp; } void cb_ssl_verify_set_depth(unsigned int verify_depth) { - int_verify_depth = verify_depth; + int_verify_depth = verify_depth; } void cb_ssl_verify_set_level(unsigned int level) { - if(level < 4) - cb_ssl_verify_level = level; + if (level < 4) + cb_ssl_verify_level = level; } RSA *cb_generate_tmp_rsa(SSL *s, int is_export, int keylength) { - /* TODO: Perhaps make it so our global key can be generated on-the-fly - * after certain intervals? */ - static RSA *rsa_tmp = NULL; - BIGNUM *bn = NULL; - int ok = 1; - if(!rsa_tmp) { - ok = 0; - if(!(bn = BN_new())) - goto end; - if(!BN_set_word(bn, RSA_F4)) - goto end; - if(!(rsa_tmp = RSA_new())) - goto end; - if(!RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL)) - goto end; - ok = 1; - } -end: - if(bn) - BN_free(bn); - if(!ok) { - RSA_free(rsa_tmp); - rsa_tmp = NULL; - } - return rsa_tmp; + /* + * TODO: Perhaps make it so our global key can be generated on-the-fly + * after certain intervals? + */ + static RSA *rsa_tmp = NULL; + BIGNUM *bn = NULL; + int ok = 1; + if (!rsa_tmp) { + ok = 0; + if (!(bn = BN_new())) + goto end; + if (!BN_set_word(bn, RSA_F4)) + goto end; + if (!(rsa_tmp = RSA_new())) + goto end; + if (!RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL)) + goto end; + ok = 1; + } + end: + if (bn) + BN_free(bn); + if (!ok) { + RSA_free(rsa_tmp); + rsa_tmp = NULL; + } + return rsa_tmp; } -#endif /* !defined(NO_OPENSSL) */ - +#endif /* !defined(NO_OPENSSL) */ diff --git a/openssl/demos/tunala/ip.c b/openssl/demos/tunala/ip.c index 96ef4e653..b172d2e4e 100644 --- a/openssl/demos/tunala/ip.c +++ b/openssl/demos/tunala/ip.c @@ -2,145 +2,148 @@ #ifndef NO_IP -#define IP_LISTENER_BACKLOG 511 /* So if it gets masked by 256 or some other - such value it'll still be respectable */ +# define IP_LISTENER_BACKLOG 511/* So if it gets masked by 256 or some other + * such value it'll still be respectable */ /* Any IP-related initialisations. For now, this means blocking SIGPIPE */ int ip_initialise(void) { - struct sigaction sa; - - sa.sa_handler = SIG_IGN; - sa.sa_flags = 0; - sigemptyset(&sa.sa_mask); - if(sigaction(SIGPIPE, &sa, NULL) != 0) - return 0; - return 1; + struct sigaction sa; + + sa.sa_handler = SIG_IGN; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + if (sigaction(SIGPIPE, &sa, NULL) != 0) + return 0; + return 1; } int ip_create_listener_split(const char *ip, unsigned short port) { - struct sockaddr_in in_addr; - int fd = -1; - int reuseVal = 1; - - /* Create the socket */ - if((fd = socket(PF_INET, SOCK_STREAM, 0)) == -1) - goto err; - /* Set the SO_REUSEADDR flag - servers act weird without it */ - if(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)(&reuseVal), - sizeof(reuseVal)) != 0) - goto err; - /* Prepare the listen address stuff */ - in_addr.sin_family = AF_INET; - memcpy(&in_addr.sin_addr.s_addr, ip, 4); - in_addr.sin_port = htons(port); - /* Bind to the required port/address/interface */ - if(bind(fd, (struct sockaddr *)&in_addr, sizeof(struct sockaddr_in)) != 0) - goto err; - /* Start "listening" */ - if(listen(fd, IP_LISTENER_BACKLOG) != 0) - goto err; - return fd; -err: - if(fd != -1) - close(fd); - return -1; + struct sockaddr_in in_addr; + int fd = -1; + int reuseVal = 1; + + /* Create the socket */ + if ((fd = socket(PF_INET, SOCK_STREAM, 0)) == -1) + goto err; + /* Set the SO_REUSEADDR flag - servers act weird without it */ + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)(&reuseVal), + sizeof(reuseVal)) != 0) + goto err; + /* Prepare the listen address stuff */ + in_addr.sin_family = AF_INET; + memcpy(&in_addr.sin_addr.s_addr, ip, 4); + in_addr.sin_port = htons(port); + /* Bind to the required port/address/interface */ + if (bind(fd, (struct sockaddr *)&in_addr, sizeof(struct sockaddr_in)) != + 0) + goto err; + /* Start "listening" */ + if (listen(fd, IP_LISTENER_BACKLOG) != 0) + goto err; + return fd; + err: + if (fd != -1) + close(fd); + return -1; } int ip_create_connection_split(const char *ip, unsigned short port) { - struct sockaddr_in in_addr; - int flags, fd = -1; - - /* Create the socket */ - if((fd = socket(PF_INET, SOCK_STREAM, 0)) == -1) - goto err; - /* Make it non-blocking */ - if(((flags = fcntl(fd, F_GETFL, 0)) < 0) || - (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0)) - goto err; - /* Prepare the connection address stuff */ - in_addr.sin_family = AF_INET; - memcpy(&in_addr.sin_addr.s_addr, ip, 4); - in_addr.sin_port = htons(port); - /* Start a connect (non-blocking, in all likelihood) */ - if((connect(fd, (struct sockaddr *)&in_addr, - sizeof(struct sockaddr_in)) != 0) && - (errno != EINPROGRESS)) - goto err; - return fd; -err: - if(fd != -1) - close(fd); - return -1; + struct sockaddr_in in_addr; + int flags, fd = -1; + + /* Create the socket */ + if ((fd = socket(PF_INET, SOCK_STREAM, 0)) == -1) + goto err; + /* Make it non-blocking */ + if (((flags = fcntl(fd, F_GETFL, 0)) < 0) || + (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0)) + goto err; + /* Prepare the connection address stuff */ + in_addr.sin_family = AF_INET; + memcpy(&in_addr.sin_addr.s_addr, ip, 4); + in_addr.sin_port = htons(port); + /* Start a connect (non-blocking, in all likelihood) */ + if ((connect(fd, (struct sockaddr *)&in_addr, + sizeof(struct sockaddr_in)) != 0) && (errno != EINPROGRESS)) + goto err; + return fd; + err: + if (fd != -1) + close(fd); + return -1; } -static char all_local_ip[] = {0x00,0x00,0x00,0x00}; +static char all_local_ip[] = { 0x00, 0x00, 0x00, 0x00 }; int ip_parse_address(const char *address, const char **parsed_ip, - unsigned short *parsed_port, int accept_all_ip) + unsigned short *parsed_port, int accept_all_ip) { - char buf[256]; - struct hostent *lookup; - unsigned long port; - const char *ptr = strstr(address, ":"); - const char *ip = all_local_ip; - - if(!ptr) { - /* We assume we're listening on all local interfaces and have - * only specified a port. */ - if(!accept_all_ip) - return 0; - ptr = address; - goto determine_port; - } - if((ptr - address) > 255) - return 0; - memset(buf, 0, 256); - memcpy(buf, address, ptr - address); - ptr++; - if((lookup = gethostbyname(buf)) == NULL) { - /* Spit a message to differentiate between lookup failures and - * bad strings. */ - fprintf(stderr, "hostname lookup for '%s' failed\n", buf); - return 0; - } - ip = lookup->h_addr_list[0]; -determine_port: - if(strlen(ptr) < 1) - return 0; - if(!int_strtoul(ptr, &port) || (port > 65535)) - return 0; - *parsed_ip = ip; - *parsed_port = (unsigned short)port; - return 1; + char buf[256]; + struct hostent *lookup; + unsigned long port; + const char *ptr = strstr(address, ":"); + const char *ip = all_local_ip; + + if (!ptr) { + /* + * We assume we're listening on all local interfaces and have only + * specified a port. + */ + if (!accept_all_ip) + return 0; + ptr = address; + goto determine_port; + } + if ((ptr - address) > 255) + return 0; + memset(buf, 0, 256); + memcpy(buf, address, ptr - address); + ptr++; + if ((lookup = gethostbyname(buf)) == NULL) { + /* + * Spit a message to differentiate between lookup failures and bad + * strings. + */ + fprintf(stderr, "hostname lookup for '%s' failed\n", buf); + return 0; + } + ip = lookup->h_addr_list[0]; + determine_port: + if (strlen(ptr) < 1) + return 0; + if (!int_strtoul(ptr, &port) || (port > 65535)) + return 0; + *parsed_ip = ip; + *parsed_port = (unsigned short)port; + return 1; } int ip_create_listener(const char *address) { - const char *ip; - unsigned short port; + const char *ip; + unsigned short port; - if(!ip_parse_address(address, &ip, &port, 1)) - return -1; - return ip_create_listener_split(ip, port); + if (!ip_parse_address(address, &ip, &port, 1)) + return -1; + return ip_create_listener_split(ip, port); } int ip_create_connection(const char *address) { - const char *ip; - unsigned short port; + const char *ip; + unsigned short port; - if(!ip_parse_address(address, &ip, &port, 0)) - return -1; - return ip_create_connection_split(ip, port); + if (!ip_parse_address(address, &ip, &port, 0)) + return -1; + return ip_create_connection_split(ip, port); } int ip_accept_connection(int listen_fd) { - return accept(listen_fd, NULL, NULL); + return accept(listen_fd, NULL, NULL); } -#endif /* !defined(NO_IP) */ - +#endif /* !defined(NO_IP) */ diff --git a/openssl/demos/tunala/sm.c b/openssl/demos/tunala/sm.c index 25359e67e..5658dfff2 100644 --- a/openssl/demos/tunala/sm.c +++ b/openssl/demos/tunala/sm.c @@ -2,150 +2,163 @@ #ifndef NO_TUNALA -void state_machine_init(state_machine_t *machine) +void state_machine_init(state_machine_t * machine) { - machine->ssl = NULL; - machine->bio_intossl = machine->bio_fromssl = NULL; - buffer_init(&machine->clean_in); - buffer_init(&machine->clean_out); - buffer_init(&machine->dirty_in); - buffer_init(&machine->dirty_out); + machine->ssl = NULL; + machine->bio_intossl = machine->bio_fromssl = NULL; + buffer_init(&machine->clean_in); + buffer_init(&machine->clean_out); + buffer_init(&machine->dirty_in); + buffer_init(&machine->dirty_out); } -void state_machine_close(state_machine_t *machine) +void state_machine_close(state_machine_t * machine) { - if(machine->ssl) - SSL_free(machine->ssl); -/* SSL_free seems to decrement the reference counts already so doing this goes - * kaboom. */ -#if 0 - if(machine->bio_intossl) - BIO_free(machine->bio_intossl); - if(machine->bio_fromssl) - BIO_free(machine->bio_fromssl); -#endif - buffer_close(&machine->clean_in); - buffer_close(&machine->clean_out); - buffer_close(&machine->dirty_in); - buffer_close(&machine->dirty_out); - state_machine_init(machine); + if (machine->ssl) + SSL_free(machine->ssl); + /* + * SSL_free seems to decrement the reference counts already so doing this + * goes kaboom. + */ +# if 0 + if (machine->bio_intossl) + BIO_free(machine->bio_intossl); + if (machine->bio_fromssl) + BIO_free(machine->bio_fromssl); +# endif + buffer_close(&machine->clean_in); + buffer_close(&machine->clean_out); + buffer_close(&machine->dirty_in); + buffer_close(&machine->dirty_out); + state_machine_init(machine); } -buffer_t *state_machine_get_buffer(state_machine_t *machine, sm_buffer_t type) +buffer_t *state_machine_get_buffer(state_machine_t * machine, + sm_buffer_t type) { - switch(type) { - case SM_CLEAN_IN: - return &machine->clean_in; - case SM_CLEAN_OUT: - return &machine->clean_out; - case SM_DIRTY_IN: - return &machine->dirty_in; - case SM_DIRTY_OUT: - return &machine->dirty_out; - default: - break; - } - /* Should never get here */ - abort(); - return NULL; + switch (type) { + case SM_CLEAN_IN: + return &machine->clean_in; + case SM_CLEAN_OUT: + return &machine->clean_out; + case SM_DIRTY_IN: + return &machine->dirty_in; + case SM_DIRTY_OUT: + return &machine->dirty_out; + default: + break; + } + /* Should never get here */ + abort(); + return NULL; } -SSL *state_machine_get_SSL(state_machine_t *machine) +SSL *state_machine_get_SSL(state_machine_t * machine) { - return machine->ssl; + return machine->ssl; } -int state_machine_set_SSL(state_machine_t *machine, SSL *ssl, int is_server) +int state_machine_set_SSL(state_machine_t * machine, SSL *ssl, int is_server) { - if(machine->ssl) - /* Shouldn't ever be set twice */ - abort(); - machine->ssl = ssl; - /* Create the BIOs to handle the dirty side of the SSL */ - if((machine->bio_intossl = BIO_new(BIO_s_mem())) == NULL) - abort(); - if((machine->bio_fromssl = BIO_new(BIO_s_mem())) == NULL) - abort(); - /* Hook up the BIOs on the dirty side of the SSL */ - SSL_set_bio(machine->ssl, machine->bio_intossl, machine->bio_fromssl); - if(is_server) - SSL_set_accept_state(machine->ssl); - else - SSL_set_connect_state(machine->ssl); - /* If we're the first one to generate traffic - do it now otherwise we - * go into the next select empty-handed and our peer will not send data - * but will similarly wait for us. */ - return state_machine_churn(machine); + if (machine->ssl) + /* Shouldn't ever be set twice */ + abort(); + machine->ssl = ssl; + /* Create the BIOs to handle the dirty side of the SSL */ + if ((machine->bio_intossl = BIO_new(BIO_s_mem())) == NULL) + abort(); + if ((machine->bio_fromssl = BIO_new(BIO_s_mem())) == NULL) + abort(); + /* Hook up the BIOs on the dirty side of the SSL */ + SSL_set_bio(machine->ssl, machine->bio_intossl, machine->bio_fromssl); + if (is_server) + SSL_set_accept_state(machine->ssl); + else + SSL_set_connect_state(machine->ssl); + /* + * If we're the first one to generate traffic - do it now otherwise we go + * into the next select empty-handed and our peer will not send data but + * will similarly wait for us. + */ + return state_machine_churn(machine); } /* Performs the data-IO loop and returns zero if the machine should close */ -int state_machine_churn(state_machine_t *machine) +int state_machine_churn(state_machine_t * machine) { - unsigned int loop; - if(machine->ssl == NULL) { - if(buffer_empty(&machine->clean_out)) - /* Time to close this state-machine altogether */ - return 0; - else - /* Still buffered data on the clean side to go out */ - return 1; - } - /* Do this loop twice to cover any dependencies about which precise - * order of reads and writes is required. */ - for(loop = 0; loop < 2; loop++) { - buffer_to_SSL(&machine->clean_in, machine->ssl); - buffer_to_BIO(&machine->dirty_in, machine->bio_intossl); - buffer_from_SSL(&machine->clean_out, machine->ssl); - buffer_from_BIO(&machine->dirty_out, machine->bio_fromssl); - } - /* We close on the SSL side if the info callback noticed some problems - * or an SSL shutdown was underway and shutdown traffic had all been - * sent. */ - if(SSL_get_app_data(machine->ssl) || (SSL_get_shutdown(machine->ssl) && - buffer_empty(&machine->dirty_out))) { - /* Great, we can seal off the dirty side completely */ - if(!state_machine_close_dirty(machine)) - return 0; - } - /* Either the SSL is alive and well, or the closing process still has - * outgoing data waiting to be sent */ - return 1; + unsigned int loop; + if (machine->ssl == NULL) { + if (buffer_empty(&machine->clean_out)) + /* Time to close this state-machine altogether */ + return 0; + else + /* Still buffered data on the clean side to go out */ + return 1; + } + /* + * Do this loop twice to cover any dependencies about which precise order + * of reads and writes is required. + */ + for (loop = 0; loop < 2; loop++) { + buffer_to_SSL(&machine->clean_in, machine->ssl); + buffer_to_BIO(&machine->dirty_in, machine->bio_intossl); + buffer_from_SSL(&machine->clean_out, machine->ssl); + buffer_from_BIO(&machine->dirty_out, machine->bio_fromssl); + } + /* + * We close on the SSL side if the info callback noticed some problems or + * an SSL shutdown was underway and shutdown traffic had all been sent. + */ + if (SSL_get_app_data(machine->ssl) || (SSL_get_shutdown(machine->ssl) && + buffer_empty(&machine->dirty_out))) + { + /* Great, we can seal off the dirty side completely */ + if (!state_machine_close_dirty(machine)) + return 0; + } + /* + * Either the SSL is alive and well, or the closing process still has + * outgoing data waiting to be sent + */ + return 1; } /* Called when the clean side of the SSL has lost its connection */ -int state_machine_close_clean(state_machine_t *machine) +int state_machine_close_clean(state_machine_t * machine) { - /* Well, first thing to do is null out the clean-side buffers - they're - * no use any more. */ - buffer_close(&machine->clean_in); - buffer_close(&machine->clean_out); - /* And start an SSL shutdown */ - if(machine->ssl) - SSL_shutdown(machine->ssl); - /* This is an "event", so flush the SSL of any generated traffic */ - state_machine_churn(machine); - if(buffer_empty(&machine->dirty_in) && - buffer_empty(&machine->dirty_out)) - return 0; - return 1; + /* + * Well, first thing to do is null out the clean-side buffers - they're + * no use any more. + */ + buffer_close(&machine->clean_in); + buffer_close(&machine->clean_out); + /* And start an SSL shutdown */ + if (machine->ssl) + SSL_shutdown(machine->ssl); + /* This is an "event", so flush the SSL of any generated traffic */ + state_machine_churn(machine); + if (buffer_empty(&machine->dirty_in) && buffer_empty(&machine->dirty_out)) + return 0; + return 1; } -/* Called when the dirty side of the SSL has lost its connection. This is pretty - * terminal as all that can be left to do is send any buffered output on the - * clean side - after that, we're done. */ -int state_machine_close_dirty(state_machine_t *machine) +/* + * Called when the dirty side of the SSL has lost its connection. This is + * pretty terminal as all that can be left to do is send any buffered output + * on the clean side - after that, we're done. + */ +int state_machine_close_dirty(state_machine_t * machine) { - buffer_close(&machine->dirty_in); - buffer_close(&machine->dirty_out); - buffer_close(&machine->clean_in); - if(machine->ssl) - SSL_free(machine->ssl); - machine->ssl = NULL; - machine->bio_intossl = machine->bio_fromssl = NULL; - if(buffer_empty(&machine->clean_out)) - return 0; - return 1; + buffer_close(&machine->dirty_in); + buffer_close(&machine->dirty_out); + buffer_close(&machine->clean_in); + if (machine->ssl) + SSL_free(machine->ssl); + machine->ssl = NULL; + machine->bio_intossl = machine->bio_fromssl = NULL; + if (buffer_empty(&machine->clean_out)) + return 0; + return 1; } -#endif /* !defined(NO_TUNALA) */ - +#endif /* !defined(NO_TUNALA) */ diff --git a/openssl/demos/tunala/tunala.c b/openssl/demos/tunala/tunala.c index ec49d3e94..11a7c5bb1 100644 --- a/openssl/demos/tunala/tunala.c +++ b/openssl/demos/tunala/tunala.c @@ -1,65 +1,81 @@ #if defined(NO_BUFFER) || defined(NO_IP) || defined(NO_OPENSSL) -#error "Badness, NO_BUFFER, NO_IP or NO_OPENSSL is defined, turn them *off*" +# error "Badness, NO_BUFFER, NO_IP or NO_OPENSSL is defined, turn them *off*" #endif /* Include our bits'n'pieces */ #include "tunala.h" - /********************************************/ /* Our local types that specify our "world" */ /********************************************/ -/* These represent running "tunnels". Eg. if you wanted to do SSL in a - * "message-passing" scanario, the "int" file-descriptors might be replaced by - * thread or process IDs, and the "select" code might be replaced by message - * handling code. Whatever. */ +/* + * These represent running "tunnels". Eg. if you wanted to do SSL in a + * "message-passing" scanario, the "int" file-descriptors might be replaced + * by thread or process IDs, and the "select" code might be replaced by + * message handling code. Whatever. + */ typedef struct _tunala_item_t { - /* The underlying SSL state machine. This is a data-only processing unit - * and we communicate with it by talking to its four "buffers". */ - state_machine_t sm; - /* The file-descriptors for the "dirty" (encrypted) side of the SSL - * setup. In actuality, this is typically a socket and both values are - * identical. */ - int dirty_read, dirty_send; - /* The file-descriptors for the "clean" (unencrypted) side of the SSL - * setup. These could be stdin/stdout, a socket (both values the same), - * or whatever you like. */ - int clean_read, clean_send; + /* + * The underlying SSL state machine. This is a data-only processing unit + * and we communicate with it by talking to its four "buffers". + */ + state_machine_t sm; + /* + * The file-descriptors for the "dirty" (encrypted) side of the SSL + * setup. In actuality, this is typically a socket and both values are + * identical. + */ + int dirty_read, dirty_send; + /* + * The file-descriptors for the "clean" (unencrypted) side of the SSL + * setup. These could be stdin/stdout, a socket (both values the same), + * or whatever you like. + */ + int clean_read, clean_send; } tunala_item_t; -/* This structure is used as the data for running the main loop. Namely, in a +/* + * This structure is used as the data for running the main loop. Namely, in a * network format such as this, it is stuff for select() - but as pointed out, * when moving the real-world to somewhere else, this might be replaced by * something entirely different. It's basically the stuff that controls when - * it's time to do some "work". */ + * it's time to do some "work". + */ typedef struct _select_sets_t { - int max; /* As required as the first argument to select() */ - fd_set reads, sends, excepts; /* As passed to select() */ + int max; /* As required as the first argument to + * select() */ + fd_set reads, sends, excepts; /* As passed to select() */ } select_sets_t; typedef struct _tunala_selector_t { - select_sets_t last_selected; /* Results of the last select() */ - select_sets_t next_select; /* What we'll next select on */ + select_sets_t last_selected; /* Results of the last select() */ + select_sets_t next_select; /* What we'll next select on */ } tunala_selector_t; -/* This structure is *everything*. We do it to avoid the use of globals so that, - * for example, it would be easier to shift things around between async-IO, - * thread-based, or multi-fork()ed (or combinations thereof). */ +/* + * This structure is *everything*. We do it to avoid the use of globals so + * that, for example, it would be easier to shift things around between + * async-IO, thread-based, or multi-fork()ed (or combinations thereof). + */ typedef struct _tunala_world_t { - /* The file-descriptor we "listen" on for new connections */ - int listen_fd; - /* The array of tunnels */ - tunala_item_t *tunnels; - /* the number of tunnels in use and allocated, respectively */ - unsigned int tunnels_used, tunnels_size; - /* Our outside "loop" context stuff */ - tunala_selector_t selector; - /* Our SSL_CTX, which is configured as the SSL client or server and has - * the various cert-settings and callbacks configured. */ - SSL_CTX *ssl_ctx; - /* Simple flag with complex logic :-) Indicates whether we're an SSL - * server or an SSL client. */ - int server_mode; + /* The file-descriptor we "listen" on for new connections */ + int listen_fd; + /* The array of tunnels */ + tunala_item_t *tunnels; + /* the number of tunnels in use and allocated, respectively */ + unsigned int tunnels_used, tunnels_size; + /* Our outside "loop" context stuff */ + tunala_selector_t selector; + /* + * Our SSL_CTX, which is configured as the SSL client or server and has + * the various cert-settings and callbacks configured. + */ + SSL_CTX *ssl_ctx; + /* + * Simple flag with complex logic :-) Indicates whether we're an SSL + * server or an SSL client. + */ + int server_mode; } tunala_world_t; /*****************************/ @@ -67,22 +83,30 @@ typedef struct _tunala_world_t { /*****************************/ static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id, - const char *CAfile, const char *cert, const char *key, - const char *dcert, const char *dkey, const char *cipher_list, - const char *dh_file, const char *dh_special, int tmp_rsa, - int ctx_options, int out_state, int out_verify, int verify_mode, - unsigned int verify_depth); -static void selector_init(tunala_selector_t *selector); -static void selector_add_listener(tunala_selector_t *selector, int fd); -static void selector_add_tunala(tunala_selector_t *selector, tunala_item_t *t); -static int selector_select(tunala_selector_t *selector); -/* This returns -1 for error, 0 for no new connections, or 1 for success, in - * which case *newfd is populated. */ -static int selector_get_listener(tunala_selector_t *selector, int fd, int *newfd); -static int tunala_world_new_item(tunala_world_t *world, int fd, - const char *ip, unsigned short port, int flipped); -static void tunala_world_del_item(tunala_world_t *world, unsigned int idx); -static int tunala_item_io(tunala_selector_t *selector, tunala_item_t *item); + const char *CAfile, const char *cert, + const char *key, const char *dcert, + const char *dkey, const char *cipher_list, + const char *dh_file, + const char *dh_special, int tmp_rsa, + int ctx_options, int out_state, + int out_verify, int verify_mode, + unsigned int verify_depth); +static void selector_init(tunala_selector_t * selector); +static void selector_add_listener(tunala_selector_t * selector, int fd); +static void selector_add_tunala(tunala_selector_t * selector, + tunala_item_t * t); +static int selector_select(tunala_selector_t * selector); +/* + * This returns -1 for error, 0 for no new connections, or 1 for success, in + * which case *newfd is populated. + */ +static int selector_get_listener(tunala_selector_t * selector, int fd, + int *newfd); +static int tunala_world_new_item(tunala_world_t * world, int fd, + const char *ip, unsigned short port, + int flipped); +static void tunala_world_del_item(tunala_world_t * world, unsigned int idx); +static int tunala_item_io(tunala_selector_t * selector, tunala_item_t * item); /*********************************************/ /* MAIN FUNCTION (and its utility functions) */ @@ -112,492 +136,518 @@ static int def_out_totals = 0; static int def_out_conns = 0; static const char *helpstring = -"\n'Tunala' (A tunneler with a New Zealand accent)\n" -"Usage: tunala [options], where options are from;\n" -" -listen [host:] (default = 127.0.0.1:8080)\n" -" -proxy : (default = 127.0.0.1:443)\n" -" -maxtunnels (default = 50)\n" -" -cacert (default = NULL)\n" -" -cert (default = NULL)\n" -" -key (default = whatever '-cert' is)\n" -" -dcert (usually for DSA, default = NULL)\n" -" -dkey (usually for DSA, default = whatever '-dcert' is)\n" -" -engine (default = NULL)\n" -" -server <0|1> (default = 0, ie. an SSL client)\n" -" -flipped <0|1> (makes SSL servers be network clients, and vice versa)\n" -" -cipher (specifies cipher list to use)\n" -" -dh_file (a PEM file containing DH parameters to use)\n" -" -dh_special (see below: def=NULL)\n" -" -no_tmp_rsa (don't generate temporary RSA keys)\n" -" -no_ssl2 (disable SSLv2)\n" -" -no_ssl3 (disable SSLv3)\n" -" -no_tls1 (disable TLSv1)\n" -" -v_peer (verify the peer certificate)\n" -" -v_strict (do not continue if peer doesn't authenticate)\n" -" -v_once (no verification in renegotiates)\n" -" -v_depth (limit certificate chain depth, default = 10)\n" -" -out_conns (prints client connections and disconnections)\n" -" -out_state (prints SSL handshake states)\n" -" -out_verify <0|1|2|3> (prints certificate verification states: def=1)\n" -" -out_totals (prints out byte-totals when a tunnel closes)\n" -" - (displays this help screen)\n" -"Notes:\n" -"(1) It is recommended to specify a cert+key when operating as an SSL server.\n" -" If you only specify '-cert', the same file must contain a matching\n" -" private key.\n" -"(2) Either dh_file or dh_special can be used to specify where DH parameters\n" -" will be obtained from (or '-dh_special NULL' for the default choice) but\n" -" you cannot specify both. For dh_special, 'generate' will create new DH\n" -" parameters on startup, and 'standard' will use embedded parameters\n" -" instead.\n" -"(3) Normally an ssl client connects to an ssl server - so that an 'ssl client\n" -" tunala' listens for 'clean' client connections and proxies ssl, and an\n" -" 'ssl server tunala' listens for ssl connections and proxies 'clean'. With\n" -" '-flipped 1', this behaviour is reversed so that an 'ssl server tunala'\n" -" listens for clean client connections and proxies ssl (but participating\n" -" as an ssl *server* in the SSL/TLS protocol), and an 'ssl client tunala'\n" -" listens for ssl connections (participating as an ssl *client* in the\n" -" SSL/TLS protocol) and proxies 'clean' to the end destination. This can\n" -" be useful for allowing network access to 'servers' where only the server\n" -" needs to authenticate the client (ie. the other way is not required).\n" -" Even with client and server authentication, this 'technique' mitigates\n" -" some DoS (denial-of-service) potential as it will be the network client\n" -" having to perform the first private key operation rather than the other\n" -" way round.\n" -"(4) The 'technique' used by setting '-flipped 1' is probably compatible with\n" -" absolutely nothing except another complimentary instance of 'tunala'\n" -" running with '-flipped 1'. :-)\n"; + "\n'Tunala' (A tunneler with a New Zealand accent)\n" + "Usage: tunala [options], where options are from;\n" + " -listen [host:] (default = 127.0.0.1:8080)\n" + " -proxy : (default = 127.0.0.1:443)\n" + " -maxtunnels (default = 50)\n" + " -cacert (default = NULL)\n" + " -cert (default = NULL)\n" + " -key (default = whatever '-cert' is)\n" + " -dcert (usually for DSA, default = NULL)\n" + " -dkey (usually for DSA, default = whatever '-dcert' is)\n" + " -engine (default = NULL)\n" + " -server <0|1> (default = 0, ie. an SSL client)\n" + " -flipped <0|1> (makes SSL servers be network clients, and vice versa)\n" + " -cipher (specifies cipher list to use)\n" + " -dh_file (a PEM file containing DH parameters to use)\n" + " -dh_special (see below: def=NULL)\n" + " -no_tmp_rsa (don't generate temporary RSA keys)\n" + " -no_ssl2 (disable SSLv2)\n" + " -no_ssl3 (disable SSLv3)\n" + " -no_tls1 (disable TLSv1)\n" + " -v_peer (verify the peer certificate)\n" + " -v_strict (do not continue if peer doesn't authenticate)\n" + " -v_once (no verification in renegotiates)\n" + " -v_depth (limit certificate chain depth, default = 10)\n" + " -out_conns (prints client connections and disconnections)\n" + " -out_state (prints SSL handshake states)\n" + " -out_verify <0|1|2|3> (prints certificate verification states: def=1)\n" + " -out_totals (prints out byte-totals when a tunnel closes)\n" + " - (displays this help screen)\n" + "Notes:\n" + "(1) It is recommended to specify a cert+key when operating as an SSL server.\n" + " If you only specify '-cert', the same file must contain a matching\n" + " private key.\n" + "(2) Either dh_file or dh_special can be used to specify where DH parameters\n" + " will be obtained from (or '-dh_special NULL' for the default choice) but\n" + " you cannot specify both. For dh_special, 'generate' will create new DH\n" + " parameters on startup, and 'standard' will use embedded parameters\n" + " instead.\n" + "(3) Normally an ssl client connects to an ssl server - so that an 'ssl client\n" + " tunala' listens for 'clean' client connections and proxies ssl, and an\n" + " 'ssl server tunala' listens for ssl connections and proxies 'clean'. With\n" + " '-flipped 1', this behaviour is reversed so that an 'ssl server tunala'\n" + " listens for clean client connections and proxies ssl (but participating\n" + " as an ssl *server* in the SSL/TLS protocol), and an 'ssl client tunala'\n" + " listens for ssl connections (participating as an ssl *client* in the\n" + " SSL/TLS protocol) and proxies 'clean' to the end destination. This can\n" + " be useful for allowing network access to 'servers' where only the server\n" + " needs to authenticate the client (ie. the other way is not required).\n" + " Even with client and server authentication, this 'technique' mitigates\n" + " some DoS (denial-of-service) potential as it will be the network client\n" + " having to perform the first private key operation rather than the other\n" + " way round.\n" + "(4) The 'technique' used by setting '-flipped 1' is probably compatible with\n" + " absolutely nothing except another complimentary instance of 'tunala'\n" + " running with '-flipped 1'. :-)\n"; + +/* + * Default DH parameters for use with "-dh_special standard" ... stolen + * striaght from s_server. + */ +static unsigned char dh512_p[] = { + 0xDA, 0x58, 0x3C, 0x16, 0xD9, 0x85, 0x22, 0x89, 0xD0, 0xE4, 0xAF, 0x75, + 0x6F, 0x4C, 0xCA, 0x92, 0xDD, 0x4B, 0xE5, 0x33, 0xB8, 0x04, 0xFB, 0x0F, + 0xED, 0x94, 0xEF, 0x9C, 0x8A, 0x44, 0x03, 0xED, 0x57, 0x46, 0x50, 0xD3, + 0x69, 0x99, 0xDB, 0x29, 0xD7, 0x76, 0x27, 0x6B, 0xA2, 0xD3, 0xD4, 0x12, + 0xE2, 0x18, 0xF4, 0xDD, 0x1E, 0x08, 0x4C, 0xF6, 0xD8, 0x00, 0x3E, 0x7C, + 0x47, 0x74, 0xE8, 0x33, +}; -/* Default DH parameters for use with "-dh_special standard" ... stolen striaght - * from s_server. */ -static unsigned char dh512_p[]={ - 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75, - 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F, - 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3, - 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12, - 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C, - 0x47,0x74,0xE8,0x33, - }; -static unsigned char dh512_g[]={ - 0x02, - }; +static unsigned char dh512_g[] = { + 0x02, +}; -/* And the function that parses the above "standard" parameters, again, straight - * out of s_server. */ +/* + * And the function that parses the above "standard" parameters, again, + * straight out of s_server. + */ static DH *get_dh512(void) - { - DH *dh=NULL; +{ + DH *dh = NULL; - if ((dh=DH_new()) == NULL) return(NULL); - dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); - dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); - if ((dh->p == NULL) || (dh->g == NULL)) - return(NULL); - return(dh); - } + if ((dh = DH_new()) == NULL) + return (NULL); + dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); + dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); + if ((dh->p == NULL) || (dh->g == NULL)) + return (NULL); + return (dh); +} /* Various help/error messages used by main() */ static int usage(const char *errstr, int isunknownarg) { - if(isunknownarg) - fprintf(stderr, "Error: unknown argument '%s'\n", errstr); - else - fprintf(stderr, "Error: %s\n", errstr); - fprintf(stderr, "%s\n", helpstring); - return 1; + if (isunknownarg) + fprintf(stderr, "Error: unknown argument '%s'\n", errstr); + else + fprintf(stderr, "Error: %s\n", errstr); + fprintf(stderr, "%s\n", helpstring); + return 1; } static int err_str0(const char *str0) { - fprintf(stderr, "%s\n", str0); - return 1; + fprintf(stderr, "%s\n", str0); + return 1; } static int err_str1(const char *fmt, const char *str1) { - fprintf(stderr, fmt, str1); - fprintf(stderr, "\n"); - return 1; + fprintf(stderr, fmt, str1); + fprintf(stderr, "\n"); + return 1; } static int parse_max_tunnels(const char *s, unsigned int *maxtunnels) { - unsigned long l; - if(!int_strtoul(s, &l) || (l < 1) || (l > 1024)) { - fprintf(stderr, "Error, '%s' is an invalid value for " - "maxtunnels\n", s); - return 0; - } - *maxtunnels = (unsigned int)l; - return 1; + unsigned long l; + if (!int_strtoul(s, &l) || (l < 1) || (l > 1024)) { + fprintf(stderr, "Error, '%s' is an invalid value for " + "maxtunnels\n", s); + return 0; + } + *maxtunnels = (unsigned int)l; + return 1; } static int parse_server_mode(const char *s, int *servermode) { - unsigned long l; - if(!int_strtoul(s, &l) || (l > 1)) { - fprintf(stderr, "Error, '%s' is an invalid value for the " - "server mode\n", s); - return 0; - } - *servermode = (int)l; - return 1; + unsigned long l; + if (!int_strtoul(s, &l) || (l > 1)) { + fprintf(stderr, "Error, '%s' is an invalid value for the " + "server mode\n", s); + return 0; + } + *servermode = (int)l; + return 1; } static int parse_dh_special(const char *s, const char **dh_special) { - if((strcmp(s, "NULL") == 0) || (strcmp(s, "generate") == 0) || - (strcmp(s, "standard") == 0)) { - *dh_special = s; - return 1; - } - fprintf(stderr, "Error, '%s' is an invalid value for 'dh_special'\n", s); - return 0; + if ((strcmp(s, "NULL") == 0) || (strcmp(s, "generate") == 0) || + (strcmp(s, "standard") == 0)) { + *dh_special = s; + return 1; + } + fprintf(stderr, "Error, '%s' is an invalid value for 'dh_special'\n", s); + return 0; } static int parse_verify_level(const char *s, unsigned int *verify_level) { - unsigned long l; - if(!int_strtoul(s, &l) || (l > 3)) { - fprintf(stderr, "Error, '%s' is an invalid value for " - "out_verify\n", s); - return 0; - } - *verify_level = (unsigned int)l; - return 1; + unsigned long l; + if (!int_strtoul(s, &l) || (l > 3)) { + fprintf(stderr, "Error, '%s' is an invalid value for " + "out_verify\n", s); + return 0; + } + *verify_level = (unsigned int)l; + return 1; } static int parse_verify_depth(const char *s, unsigned int *verify_depth) { - unsigned long l; - if(!int_strtoul(s, &l) || (l < 1) || (l > 50)) { - fprintf(stderr, "Error, '%s' is an invalid value for " - "verify_depth\n", s); - return 0; - } - *verify_depth = (unsigned int)l; - return 1; + unsigned long l; + if (!int_strtoul(s, &l) || (l < 1) || (l > 50)) { + fprintf(stderr, "Error, '%s' is an invalid value for " + "verify_depth\n", s); + return 0; + } + *verify_depth = (unsigned int)l; + return 1; } /* Some fprintf format strings used when tunnels close */ static const char *io_stats_dirty = -" SSL traffic; %8lu bytes in, %8lu bytes out\n"; + " SSL traffic; %8lu bytes in, %8lu bytes out\n"; static const char *io_stats_clean = -" clear traffic; %8lu bytes in, %8lu bytes out\n"; + " clear traffic; %8lu bytes in, %8lu bytes out\n"; int main(int argc, char *argv[]) { - unsigned int loop; - int newfd; - tunala_world_t world; - tunala_item_t *t_item; - const char *proxy_ip; - unsigned short proxy_port; - /* Overridables */ - const char *proxyhost = def_proxyhost; - const char *listenhost = def_listenhost; - unsigned int max_tunnels = def_max_tunnels; - const char *cacert = def_cacert; - const char *cert = def_cert; - const char *key = def_key; - const char *dcert = def_dcert; - const char *dkey = def_dkey; - const char *engine_id = def_engine_id; - int server_mode = def_server_mode; - int flipped = def_flipped; - const char *cipher_list = def_cipher_list; - const char *dh_file = def_dh_file; - const char *dh_special = def_dh_special; - int tmp_rsa = def_tmp_rsa; - int ctx_options = def_ctx_options; - int verify_mode = def_verify_mode; - unsigned int verify_depth = def_verify_depth; - int out_state = def_out_state; - unsigned int out_verify = def_out_verify; - int out_totals = def_out_totals; - int out_conns = def_out_conns; + unsigned int loop; + int newfd; + tunala_world_t world; + tunala_item_t *t_item; + const char *proxy_ip; + unsigned short proxy_port; + /* Overridables */ + const char *proxyhost = def_proxyhost; + const char *listenhost = def_listenhost; + unsigned int max_tunnels = def_max_tunnels; + const char *cacert = def_cacert; + const char *cert = def_cert; + const char *key = def_key; + const char *dcert = def_dcert; + const char *dkey = def_dkey; + const char *engine_id = def_engine_id; + int server_mode = def_server_mode; + int flipped = def_flipped; + const char *cipher_list = def_cipher_list; + const char *dh_file = def_dh_file; + const char *dh_special = def_dh_special; + int tmp_rsa = def_tmp_rsa; + int ctx_options = def_ctx_options; + int verify_mode = def_verify_mode; + unsigned int verify_depth = def_verify_depth; + int out_state = def_out_state; + unsigned int out_verify = def_out_verify; + int out_totals = def_out_totals; + int out_conns = def_out_conns; /* Parse command-line arguments */ -next_arg: - argc--; argv++; - if(argc > 0) { - if(strcmp(*argv, "-listen") == 0) { - if(argc < 2) - return usage("-listen requires an argument", 0); - argc--; argv++; - listenhost = *argv; - goto next_arg; - } else if(strcmp(*argv, "-proxy") == 0) { - if(argc < 2) - return usage("-proxy requires an argument", 0); - argc--; argv++; - proxyhost = *argv; - goto next_arg; - } else if(strcmp(*argv, "-maxtunnels") == 0) { - if(argc < 2) - return usage("-maxtunnels requires an argument", 0); - argc--; argv++; - if(!parse_max_tunnels(*argv, &max_tunnels)) - return 1; - goto next_arg; - } else if(strcmp(*argv, "-cacert") == 0) { - if(argc < 2) - return usage("-cacert requires an argument", 0); - argc--; argv++; - if(strcmp(*argv, "NULL") == 0) - cacert = NULL; - else - cacert = *argv; - goto next_arg; - } else if(strcmp(*argv, "-cert") == 0) { - if(argc < 2) - return usage("-cert requires an argument", 0); - argc--; argv++; - if(strcmp(*argv, "NULL") == 0) - cert = NULL; - else - cert = *argv; - goto next_arg; - } else if(strcmp(*argv, "-key") == 0) { - if(argc < 2) - return usage("-key requires an argument", 0); - argc--; argv++; - if(strcmp(*argv, "NULL") == 0) - key = NULL; - else - key = *argv; - goto next_arg; - } else if(strcmp(*argv, "-dcert") == 0) { - if(argc < 2) - return usage("-dcert requires an argument", 0); - argc--; argv++; - if(strcmp(*argv, "NULL") == 0) - dcert = NULL; - else - dcert = *argv; - goto next_arg; - } else if(strcmp(*argv, "-dkey") == 0) { - if(argc < 2) - return usage("-dkey requires an argument", 0); - argc--; argv++; - if(strcmp(*argv, "NULL") == 0) - dkey = NULL; - else - dkey = *argv; - goto next_arg; - } else if(strcmp(*argv, "-engine") == 0) { - if(argc < 2) - return usage("-engine requires an argument", 0); - argc--; argv++; - engine_id = *argv; - goto next_arg; - } else if(strcmp(*argv, "-server") == 0) { - if(argc < 2) - return usage("-server requires an argument", 0); - argc--; argv++; - if(!parse_server_mode(*argv, &server_mode)) - return 1; - goto next_arg; - } else if(strcmp(*argv, "-flipped") == 0) { - if(argc < 2) - return usage("-flipped requires an argument", 0); - argc--; argv++; - if(!parse_server_mode(*argv, &flipped)) - return 1; - goto next_arg; - } else if(strcmp(*argv, "-cipher") == 0) { - if(argc < 2) - return usage("-cipher requires an argument", 0); - argc--; argv++; - cipher_list = *argv; - goto next_arg; - } else if(strcmp(*argv, "-dh_file") == 0) { - if(argc < 2) - return usage("-dh_file requires an argument", 0); - if(dh_special) - return usage("cannot mix -dh_file with " - "-dh_special", 0); - argc--; argv++; - dh_file = *argv; - goto next_arg; - } else if(strcmp(*argv, "-dh_special") == 0) { - if(argc < 2) - return usage("-dh_special requires an argument", 0); - if(dh_file) - return usage("cannot mix -dh_file with " - "-dh_special", 0); - argc--; argv++; - if(!parse_dh_special(*argv, &dh_special)) - return 1; - goto next_arg; - } else if(strcmp(*argv, "-no_tmp_rsa") == 0) { - tmp_rsa = 0; - goto next_arg; - } else if(strcmp(*argv, "-no_ssl2") == 0) { - ctx_options |= SSL_OP_NO_SSLv2; - goto next_arg; - } else if(strcmp(*argv, "-no_ssl3") == 0) { - ctx_options |= SSL_OP_NO_SSLv3; - goto next_arg; - } else if(strcmp(*argv, "-no_tls1") == 0) { - ctx_options |= SSL_OP_NO_TLSv1; - goto next_arg; - } else if(strcmp(*argv, "-v_peer") == 0) { - verify_mode |= SSL_VERIFY_PEER; - goto next_arg; - } else if(strcmp(*argv, "-v_strict") == 0) { - verify_mode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; - goto next_arg; - } else if(strcmp(*argv, "-v_once") == 0) { - verify_mode |= SSL_VERIFY_CLIENT_ONCE; - goto next_arg; - } else if(strcmp(*argv, "-v_depth") == 0) { - if(argc < 2) - return usage("-v_depth requires an argument", 0); - argc--; argv++; - if(!parse_verify_depth(*argv, &verify_depth)) - return 1; - goto next_arg; - } else if(strcmp(*argv, "-out_state") == 0) { - out_state = 1; - goto next_arg; - } else if(strcmp(*argv, "-out_verify") == 0) { - if(argc < 2) - return usage("-out_verify requires an argument", 0); - argc--; argv++; - if(!parse_verify_level(*argv, &out_verify)) - return 1; - goto next_arg; - } else if(strcmp(*argv, "-out_totals") == 0) { - out_totals = 1; - goto next_arg; - } else if(strcmp(*argv, "-out_conns") == 0) { - out_conns = 1; - goto next_arg; - } else if((strcmp(*argv, "-h") == 0) || - (strcmp(*argv, "-help") == 0) || - (strcmp(*argv, "-?") == 0)) { - fprintf(stderr, "%s\n", helpstring); - return 0; - } else - return usage(*argv, 1); - } - /* Run any sanity checks we want here */ - if(!cert && !dcert && server_mode) - fprintf(stderr, "WARNING: you are running an SSL server without " - "a certificate - this may not work!\n"); + next_arg: + argc--; + argv++; + if (argc > 0) { + if (strcmp(*argv, "-listen") == 0) { + if (argc < 2) + return usage("-listen requires an argument", 0); + argc--; + argv++; + listenhost = *argv; + goto next_arg; + } else if (strcmp(*argv, "-proxy") == 0) { + if (argc < 2) + return usage("-proxy requires an argument", 0); + argc--; + argv++; + proxyhost = *argv; + goto next_arg; + } else if (strcmp(*argv, "-maxtunnels") == 0) { + if (argc < 2) + return usage("-maxtunnels requires an argument", 0); + argc--; + argv++; + if (!parse_max_tunnels(*argv, &max_tunnels)) + return 1; + goto next_arg; + } else if (strcmp(*argv, "-cacert") == 0) { + if (argc < 2) + return usage("-cacert requires an argument", 0); + argc--; + argv++; + if (strcmp(*argv, "NULL") == 0) + cacert = NULL; + else + cacert = *argv; + goto next_arg; + } else if (strcmp(*argv, "-cert") == 0) { + if (argc < 2) + return usage("-cert requires an argument", 0); + argc--; + argv++; + if (strcmp(*argv, "NULL") == 0) + cert = NULL; + else + cert = *argv; + goto next_arg; + } else if (strcmp(*argv, "-key") == 0) { + if (argc < 2) + return usage("-key requires an argument", 0); + argc--; + argv++; + if (strcmp(*argv, "NULL") == 0) + key = NULL; + else + key = *argv; + goto next_arg; + } else if (strcmp(*argv, "-dcert") == 0) { + if (argc < 2) + return usage("-dcert requires an argument", 0); + argc--; + argv++; + if (strcmp(*argv, "NULL") == 0) + dcert = NULL; + else + dcert = *argv; + goto next_arg; + } else if (strcmp(*argv, "-dkey") == 0) { + if (argc < 2) + return usage("-dkey requires an argument", 0); + argc--; + argv++; + if (strcmp(*argv, "NULL") == 0) + dkey = NULL; + else + dkey = *argv; + goto next_arg; + } else if (strcmp(*argv, "-engine") == 0) { + if (argc < 2) + return usage("-engine requires an argument", 0); + argc--; + argv++; + engine_id = *argv; + goto next_arg; + } else if (strcmp(*argv, "-server") == 0) { + if (argc < 2) + return usage("-server requires an argument", 0); + argc--; + argv++; + if (!parse_server_mode(*argv, &server_mode)) + return 1; + goto next_arg; + } else if (strcmp(*argv, "-flipped") == 0) { + if (argc < 2) + return usage("-flipped requires an argument", 0); + argc--; + argv++; + if (!parse_server_mode(*argv, &flipped)) + return 1; + goto next_arg; + } else if (strcmp(*argv, "-cipher") == 0) { + if (argc < 2) + return usage("-cipher requires an argument", 0); + argc--; + argv++; + cipher_list = *argv; + goto next_arg; + } else if (strcmp(*argv, "-dh_file") == 0) { + if (argc < 2) + return usage("-dh_file requires an argument", 0); + if (dh_special) + return usage("cannot mix -dh_file with " "-dh_special", 0); + argc--; + argv++; + dh_file = *argv; + goto next_arg; + } else if (strcmp(*argv, "-dh_special") == 0) { + if (argc < 2) + return usage("-dh_special requires an argument", 0); + if (dh_file) + return usage("cannot mix -dh_file with " "-dh_special", 0); + argc--; + argv++; + if (!parse_dh_special(*argv, &dh_special)) + return 1; + goto next_arg; + } else if (strcmp(*argv, "-no_tmp_rsa") == 0) { + tmp_rsa = 0; + goto next_arg; + } else if (strcmp(*argv, "-no_ssl2") == 0) { + ctx_options |= SSL_OP_NO_SSLv2; + goto next_arg; + } else if (strcmp(*argv, "-no_ssl3") == 0) { + ctx_options |= SSL_OP_NO_SSLv3; + goto next_arg; + } else if (strcmp(*argv, "-no_tls1") == 0) { + ctx_options |= SSL_OP_NO_TLSv1; + goto next_arg; + } else if (strcmp(*argv, "-v_peer") == 0) { + verify_mode |= SSL_VERIFY_PEER; + goto next_arg; + } else if (strcmp(*argv, "-v_strict") == 0) { + verify_mode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; + goto next_arg; + } else if (strcmp(*argv, "-v_once") == 0) { + verify_mode |= SSL_VERIFY_CLIENT_ONCE; + goto next_arg; + } else if (strcmp(*argv, "-v_depth") == 0) { + if (argc < 2) + return usage("-v_depth requires an argument", 0); + argc--; + argv++; + if (!parse_verify_depth(*argv, &verify_depth)) + return 1; + goto next_arg; + } else if (strcmp(*argv, "-out_state") == 0) { + out_state = 1; + goto next_arg; + } else if (strcmp(*argv, "-out_verify") == 0) { + if (argc < 2) + return usage("-out_verify requires an argument", 0); + argc--; + argv++; + if (!parse_verify_level(*argv, &out_verify)) + return 1; + goto next_arg; + } else if (strcmp(*argv, "-out_totals") == 0) { + out_totals = 1; + goto next_arg; + } else if (strcmp(*argv, "-out_conns") == 0) { + out_conns = 1; + goto next_arg; + } else if ((strcmp(*argv, "-h") == 0) || + (strcmp(*argv, "-help") == 0) || + (strcmp(*argv, "-?") == 0)) { + fprintf(stderr, "%s\n", helpstring); + return 0; + } else + return usage(*argv, 1); + } + /* Run any sanity checks we want here */ + if (!cert && !dcert && server_mode) + fprintf(stderr, "WARNING: you are running an SSL server without " + "a certificate - this may not work!\n"); - /* Initialise network stuff */ - if(!ip_initialise()) - return err_str0("ip_initialise failed"); - /* Create the SSL_CTX */ - if((world.ssl_ctx = initialise_ssl_ctx(server_mode, engine_id, - cacert, cert, key, dcert, dkey, cipher_list, dh_file, - dh_special, tmp_rsa, ctx_options, out_state, out_verify, - verify_mode, verify_depth)) == NULL) - return err_str1("initialise_ssl_ctx(engine_id=%s) failed", - (engine_id == NULL) ? "NULL" : engine_id); - if(engine_id) - fprintf(stderr, "Info, engine '%s' initialised\n", engine_id); - /* Create the listener */ - if((world.listen_fd = ip_create_listener(listenhost)) == -1) - return err_str1("ip_create_listener(%s) failed", listenhost); - fprintf(stderr, "Info, listening on '%s'\n", listenhost); - if(!ip_parse_address(proxyhost, &proxy_ip, &proxy_port, 0)) - return err_str1("ip_parse_address(%s) failed", proxyhost); - fprintf(stderr, "Info, proxying to '%s' (%d.%d.%d.%d:%d)\n", proxyhost, - (int)proxy_ip[0], (int)proxy_ip[1], - (int)proxy_ip[2], (int)proxy_ip[3], (int)proxy_port); - fprintf(stderr, "Info, set maxtunnels to %d\n", (int)max_tunnels); - fprintf(stderr, "Info, set to operate as an SSL %s\n", - (server_mode ? "server" : "client")); - /* Initialise the rest of the stuff */ - world.tunnels_used = world.tunnels_size = 0; - world.tunnels = NULL; - world.server_mode = server_mode; - selector_init(&world.selector); + /* Initialise network stuff */ + if (!ip_initialise()) + return err_str0("ip_initialise failed"); + /* Create the SSL_CTX */ + if ((world.ssl_ctx = initialise_ssl_ctx(server_mode, engine_id, + cacert, cert, key, dcert, dkey, + cipher_list, dh_file, dh_special, + tmp_rsa, ctx_options, out_state, + out_verify, verify_mode, + verify_depth)) == NULL) + return err_str1("initialise_ssl_ctx(engine_id=%s) failed", + (engine_id == NULL) ? "NULL" : engine_id); + if (engine_id) + fprintf(stderr, "Info, engine '%s' initialised\n", engine_id); + /* Create the listener */ + if ((world.listen_fd = ip_create_listener(listenhost)) == -1) + return err_str1("ip_create_listener(%s) failed", listenhost); + fprintf(stderr, "Info, listening on '%s'\n", listenhost); + if (!ip_parse_address(proxyhost, &proxy_ip, &proxy_port, 0)) + return err_str1("ip_parse_address(%s) failed", proxyhost); + fprintf(stderr, "Info, proxying to '%s' (%d.%d.%d.%d:%d)\n", proxyhost, + (int)proxy_ip[0], (int)proxy_ip[1], + (int)proxy_ip[2], (int)proxy_ip[3], (int)proxy_port); + fprintf(stderr, "Info, set maxtunnels to %d\n", (int)max_tunnels); + fprintf(stderr, "Info, set to operate as an SSL %s\n", + (server_mode ? "server" : "client")); + /* Initialise the rest of the stuff */ + world.tunnels_used = world.tunnels_size = 0; + world.tunnels = NULL; + world.server_mode = server_mode; + selector_init(&world.selector); /* We're ready to loop */ -main_loop: - /* Should we listen for *new* tunnels? */ - if(world.tunnels_used < max_tunnels) - selector_add_listener(&world.selector, world.listen_fd); - /* We should add in our existing tunnels */ - for(loop = 0; loop < world.tunnels_used; loop++) - selector_add_tunala(&world.selector, world.tunnels + loop); - /* Now do the select */ - switch(selector_select(&world.selector)) { - case -1: - if(errno != EINTR) { - fprintf(stderr, "selector_select returned a " - "badness error.\n"); - goto shouldnt_happen; - } - fprintf(stderr, "Warn, selector interrupted by a signal\n"); - goto main_loop; - case 0: - fprintf(stderr, "Warn, selector_select returned 0 - signal?""?\n"); - goto main_loop; - default: - break; - } - /* Accept new connection if we should and can */ - if((world.tunnels_used < max_tunnels) && (selector_get_listener( - &world.selector, world.listen_fd, - &newfd) == 1)) { - /* We have a new connection */ - if(!tunala_world_new_item(&world, newfd, proxy_ip, - proxy_port, flipped)) - fprintf(stderr, "tunala_world_new_item failed\n"); - else if(out_conns) - fprintf(stderr, "Info, new tunnel opened, now up to " - "%d\n", world.tunnels_used); - } - /* Give each tunnel its moment, note the while loop is because it makes - * the logic easier than with "for" to deal with an array that may shift - * because of deletes. */ - loop = 0; - t_item = world.tunnels; - while(loop < world.tunnels_used) { - if(!tunala_item_io(&world.selector, t_item)) { - /* We're closing whether for reasons of an error or a - * natural close. Don't increment loop or t_item because - * the next item is moving to us! */ - if(!out_totals) - goto skip_totals; - fprintf(stderr, "Tunnel closing, traffic stats follow\n"); - /* Display the encrypted (over the network) stats */ - fprintf(stderr, io_stats_dirty, - buffer_total_in(state_machine_get_buffer( - &t_item->sm,SM_DIRTY_IN)), - buffer_total_out(state_machine_get_buffer( - &t_item->sm,SM_DIRTY_OUT))); - /* Display the local (tunnelled) stats. NB: Data we - * *receive* is data sent *out* of the state_machine on - * its 'clean' side. Hence the apparent back-to-front - * OUT/IN mixup here :-) */ - fprintf(stderr, io_stats_clean, - buffer_total_out(state_machine_get_buffer( - &t_item->sm,SM_CLEAN_OUT)), - buffer_total_in(state_machine_get_buffer( - &t_item->sm,SM_CLEAN_IN))); -skip_totals: - tunala_world_del_item(&world, loop); - if(out_conns) - fprintf(stderr, "Info, tunnel closed, down to %d\n", - world.tunnels_used); - } - else { - /* Move to the next item */ - loop++; - t_item++; - } - } - goto main_loop; - /* Should never get here */ -shouldnt_happen: - abort(); - return 1; + main_loop: + /* Should we listen for *new* tunnels? */ + if (world.tunnels_used < max_tunnels) + selector_add_listener(&world.selector, world.listen_fd); + /* We should add in our existing tunnels */ + for (loop = 0; loop < world.tunnels_used; loop++) + selector_add_tunala(&world.selector, world.tunnels + loop); + /* Now do the select */ + switch (selector_select(&world.selector)) { + case -1: + if (errno != EINTR) { + fprintf(stderr, "selector_select returned a " "badness error.\n"); + goto shouldnt_happen; + } + fprintf(stderr, "Warn, selector interrupted by a signal\n"); + goto main_loop; + case 0: + fprintf(stderr, "Warn, selector_select returned 0 - signal?" "?\n"); + goto main_loop; + default: + break; + } + /* Accept new connection if we should and can */ + if ((world.tunnels_used < max_tunnels) + && (selector_get_listener(&world.selector, world.listen_fd, &newfd) == + 1)) { + /* We have a new connection */ + if (!tunala_world_new_item(&world, newfd, proxy_ip, + proxy_port, flipped)) + fprintf(stderr, "tunala_world_new_item failed\n"); + else if (out_conns) + fprintf(stderr, "Info, new tunnel opened, now up to " + "%d\n", world.tunnels_used); + } + /* + * Give each tunnel its moment, note the while loop is because it makes + * the logic easier than with "for" to deal with an array that may shift + * because of deletes. + */ + loop = 0; + t_item = world.tunnels; + while (loop < world.tunnels_used) { + if (!tunala_item_io(&world.selector, t_item)) { + /* + * We're closing whether for reasons of an error or a natural + * close. Don't increment loop or t_item because the next item is + * moving to us! + */ + if (!out_totals) + goto skip_totals; + fprintf(stderr, "Tunnel closing, traffic stats follow\n"); + /* Display the encrypted (over the network) stats */ + fprintf(stderr, io_stats_dirty, + buffer_total_in(state_machine_get_buffer + (&t_item->sm, SM_DIRTY_IN)), + buffer_total_out(state_machine_get_buffer + (&t_item->sm, SM_DIRTY_OUT))); + /* + * Display the local (tunnelled) stats. NB: Data we *receive* is + * data sent *out* of the state_machine on its 'clean' side. + * Hence the apparent back-to-front OUT/IN mixup here :-) + */ + fprintf(stderr, io_stats_clean, + buffer_total_out(state_machine_get_buffer + (&t_item->sm, SM_CLEAN_OUT)), + buffer_total_in(state_machine_get_buffer + (&t_item->sm, SM_CLEAN_IN))); + skip_totals: + tunala_world_del_item(&world, loop); + if (out_conns) + fprintf(stderr, "Info, tunnel closed, down to %d\n", + world.tunnels_used); + } else { + /* Move to the next item */ + loop++; + t_item++; + } + } + goto main_loop; + /* Should never get here */ + shouldnt_happen: + abort(); + return 1; } /****************/ @@ -606,504 +656,528 @@ shouldnt_happen: static int ctx_set_cert(SSL_CTX *ctx, const char *cert, const char *key) { - FILE *fp = NULL; - X509 *x509 = NULL; - EVP_PKEY *pkey = NULL; - int toret = 0; /* Assume an error */ + FILE *fp = NULL; + X509 *x509 = NULL; + EVP_PKEY *pkey = NULL; + int toret = 0; /* Assume an error */ - /* cert */ - if(cert) { - if((fp = fopen(cert, "r")) == NULL) { - fprintf(stderr, "Error opening cert file '%s'\n", cert); - goto err; - } - if(!PEM_read_X509(fp, &x509, NULL, NULL)) { - fprintf(stderr, "Error reading PEM cert from '%s'\n", - cert); - goto err; - } - if(!SSL_CTX_use_certificate(ctx, x509)) { - fprintf(stderr, "Error, cert in '%s' can not be used\n", - cert); - goto err; - } - /* Clear the FILE* for reuse in the "key" code */ - fclose(fp); - fp = NULL; - fprintf(stderr, "Info, operating with cert in '%s'\n", cert); - /* If a cert was given without matching key, we assume the same - * file contains the required key. */ - if(!key) - key = cert; - } else { - if(key) - fprintf(stderr, "Error, can't specify a key without a " - "corresponding certificate\n"); - else - fprintf(stderr, "Error, ctx_set_cert called with " - "NULLs!\n"); - goto err; - } - /* key */ - if(key) { - if((fp = fopen(key, "r")) == NULL) { - fprintf(stderr, "Error opening key file '%s'\n", key); - goto err; - } - if(!PEM_read_PrivateKey(fp, &pkey, NULL, NULL)) { - fprintf(stderr, "Error reading PEM key from '%s'\n", - key); - goto err; - } - if(!SSL_CTX_use_PrivateKey(ctx, pkey)) { - fprintf(stderr, "Error, key in '%s' can not be used\n", - key); - goto err; - } - fprintf(stderr, "Info, operating with key in '%s'\n", key); - } else - fprintf(stderr, "Info, operating without a cert or key\n"); - /* Success */ - toret = 1; err: - if(x509) - X509_free(x509); - if(pkey) - EVP_PKEY_free(pkey); - if(fp) - fclose(fp); - return toret; + /* cert */ + if (cert) { + if ((fp = fopen(cert, "r")) == NULL) { + fprintf(stderr, "Error opening cert file '%s'\n", cert); + goto err; + } + if (!PEM_read_X509(fp, &x509, NULL, NULL)) { + fprintf(stderr, "Error reading PEM cert from '%s'\n", cert); + goto err; + } + if (!SSL_CTX_use_certificate(ctx, x509)) { + fprintf(stderr, "Error, cert in '%s' can not be used\n", cert); + goto err; + } + /* Clear the FILE* for reuse in the "key" code */ + fclose(fp); + fp = NULL; + fprintf(stderr, "Info, operating with cert in '%s'\n", cert); + /* + * If a cert was given without matching key, we assume the same file + * contains the required key. + */ + if (!key) + key = cert; + } else { + if (key) + fprintf(stderr, "Error, can't specify a key without a " + "corresponding certificate\n"); + else + fprintf(stderr, "Error, ctx_set_cert called with " "NULLs!\n"); + goto err; + } + /* key */ + if (key) { + if ((fp = fopen(key, "r")) == NULL) { + fprintf(stderr, "Error opening key file '%s'\n", key); + goto err; + } + if (!PEM_read_PrivateKey(fp, &pkey, NULL, NULL)) { + fprintf(stderr, "Error reading PEM key from '%s'\n", key); + goto err; + } + if (!SSL_CTX_use_PrivateKey(ctx, pkey)) { + fprintf(stderr, "Error, key in '%s' can not be used\n", key); + goto err; + } + fprintf(stderr, "Info, operating with key in '%s'\n", key); + } else + fprintf(stderr, "Info, operating without a cert or key\n"); + /* Success */ + toret = 1; + err: + if (x509) + X509_free(x509); + if (pkey) + EVP_PKEY_free(pkey); + if (fp) + fclose(fp); + return toret; } -static int ctx_set_dh(SSL_CTX *ctx, const char *dh_file, const char *dh_special) +static int ctx_set_dh(SSL_CTX *ctx, const char *dh_file, + const char *dh_special) { - DH *dh = NULL; - FILE *fp = NULL; + DH *dh = NULL; + FILE *fp = NULL; - if(dh_special) { - if(strcmp(dh_special, "NULL") == 0) - return 1; - if(strcmp(dh_special, "standard") == 0) { - if((dh = get_dh512()) == NULL) { - fprintf(stderr, "Error, can't parse 'standard'" - " DH parameters\n"); - return 0; - } - fprintf(stderr, "Info, using 'standard' DH parameters\n"); - goto do_it; - } - if(strcmp(dh_special, "generate") != 0) - /* This shouldn't happen - screening values is handled - * in main(). */ - abort(); - fprintf(stderr, "Info, generating DH parameters ... "); - fflush(stderr); - if(!(dh = DH_new()) || !DH_generate_parameters_ex(dh, 512, - DH_GENERATOR_5, NULL)) { - fprintf(stderr, "error!\n"); - if(dh) - DH_free(dh); - return 0; - } - fprintf(stderr, "complete\n"); - goto do_it; - } - /* So, we're loading dh_file */ - if((fp = fopen(dh_file, "r")) == NULL) { - fprintf(stderr, "Error, couldn't open '%s' for DH parameters\n", - dh_file); - return 0; - } - dh = PEM_read_DHparams(fp, NULL, NULL, NULL); - fclose(fp); - if(dh == NULL) { - fprintf(stderr, "Error, could not parse DH parameters from '%s'\n", - dh_file); - return 0; - } - fprintf(stderr, "Info, using DH parameters from file '%s'\n", dh_file); -do_it: - SSL_CTX_set_tmp_dh(ctx, dh); - DH_free(dh); - return 1; + if (dh_special) { + if (strcmp(dh_special, "NULL") == 0) + return 1; + if (strcmp(dh_special, "standard") == 0) { + if ((dh = get_dh512()) == NULL) { + fprintf(stderr, "Error, can't parse 'standard'" + " DH parameters\n"); + return 0; + } + fprintf(stderr, "Info, using 'standard' DH parameters\n"); + goto do_it; + } + if (strcmp(dh_special, "generate") != 0) + /* + * This shouldn't happen - screening values is handled in main(). + */ + abort(); + fprintf(stderr, "Info, generating DH parameters ... "); + fflush(stderr); + if (!(dh = DH_new()) || !DH_generate_parameters_ex(dh, 512, + DH_GENERATOR_5, + NULL)) { + fprintf(stderr, "error!\n"); + if (dh) + DH_free(dh); + return 0; + } + fprintf(stderr, "complete\n"); + goto do_it; + } + /* So, we're loading dh_file */ + if ((fp = fopen(dh_file, "r")) == NULL) { + fprintf(stderr, "Error, couldn't open '%s' for DH parameters\n", + dh_file); + return 0; + } + dh = PEM_read_DHparams(fp, NULL, NULL, NULL); + fclose(fp); + if (dh == NULL) { + fprintf(stderr, "Error, could not parse DH parameters from '%s'\n", + dh_file); + return 0; + } + fprintf(stderr, "Info, using DH parameters from file '%s'\n", dh_file); + do_it: + SSL_CTX_set_tmp_dh(ctx, dh); + DH_free(dh); + return 1; } static SSL_CTX *initialise_ssl_ctx(int server_mode, const char *engine_id, - const char *CAfile, const char *cert, const char *key, - const char *dcert, const char *dkey, const char *cipher_list, - const char *dh_file, const char *dh_special, int tmp_rsa, - int ctx_options, int out_state, int out_verify, int verify_mode, - unsigned int verify_depth) + const char *CAfile, const char *cert, + const char *key, const char *dcert, + const char *dkey, const char *cipher_list, + const char *dh_file, + const char *dh_special, int tmp_rsa, + int ctx_options, int out_state, + int out_verify, int verify_mode, + unsigned int verify_depth) { - SSL_CTX *ctx = NULL, *ret = NULL; - const SSL_METHOD *meth; - ENGINE *e = NULL; + SSL_CTX *ctx = NULL, *ret = NULL; + const SSL_METHOD *meth; + ENGINE *e = NULL; - OpenSSL_add_ssl_algorithms(); - SSL_load_error_strings(); + OpenSSL_add_ssl_algorithms(); + SSL_load_error_strings(); - meth = (server_mode ? SSLv23_server_method() : SSLv23_client_method()); - if(meth == NULL) - goto err; - if(engine_id) { - ENGINE_load_builtin_engines(); - if((e = ENGINE_by_id(engine_id)) == NULL) { - fprintf(stderr, "Error obtaining '%s' engine, openssl " - "errors follow\n", engine_id); - goto err; - } - if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { - fprintf(stderr, "Error assigning '%s' engine, openssl " - "errors follow\n", engine_id); - goto err; - } - ENGINE_free(e); - } - if((ctx = SSL_CTX_new(meth)) == NULL) - goto err; - /* cacert */ - if(CAfile) { - if(!X509_STORE_load_locations(SSL_CTX_get_cert_store(ctx), - CAfile, NULL)) { - fprintf(stderr, "Error loading CA cert(s) in '%s'\n", - CAfile); - goto err; - } - fprintf(stderr, "Info, operating with CA cert(s) in '%s'\n", - CAfile); - } else - fprintf(stderr, "Info, operating without a CA cert(-list)\n"); - if(!SSL_CTX_set_default_verify_paths(ctx)) { - fprintf(stderr, "Error setting default verify paths\n"); - goto err; - } + meth = (server_mode ? SSLv23_server_method() : SSLv23_client_method()); + if (meth == NULL) + goto err; + if (engine_id) { + ENGINE_load_builtin_engines(); + if ((e = ENGINE_by_id(engine_id)) == NULL) { + fprintf(stderr, "Error obtaining '%s' engine, openssl " + "errors follow\n", engine_id); + goto err; + } + if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { + fprintf(stderr, "Error assigning '%s' engine, openssl " + "errors follow\n", engine_id); + goto err; + } + ENGINE_free(e); + } + if ((ctx = SSL_CTX_new(meth)) == NULL) + goto err; + /* cacert */ + if (CAfile) { + if (!X509_STORE_load_locations(SSL_CTX_get_cert_store(ctx), + CAfile, NULL)) { + fprintf(stderr, "Error loading CA cert(s) in '%s'\n", CAfile); + goto err; + } + fprintf(stderr, "Info, operating with CA cert(s) in '%s'\n", CAfile); + } else + fprintf(stderr, "Info, operating without a CA cert(-list)\n"); + if (!SSL_CTX_set_default_verify_paths(ctx)) { + fprintf(stderr, "Error setting default verify paths\n"); + goto err; + } - /* cert and key */ - if((cert || key) && !ctx_set_cert(ctx, cert, key)) - goto err; - /* dcert and dkey */ - if((dcert || dkey) && !ctx_set_cert(ctx, dcert, dkey)) - goto err; - /* temporary RSA key generation */ - if(tmp_rsa) - SSL_CTX_set_tmp_rsa_callback(ctx, cb_generate_tmp_rsa); + /* cert and key */ + if ((cert || key) && !ctx_set_cert(ctx, cert, key)) + goto err; + /* dcert and dkey */ + if ((dcert || dkey) && !ctx_set_cert(ctx, dcert, dkey)) + goto err; + /* temporary RSA key generation */ + if (tmp_rsa) + SSL_CTX_set_tmp_rsa_callback(ctx, cb_generate_tmp_rsa); - /* cipher_list */ - if(cipher_list) { - if(!SSL_CTX_set_cipher_list(ctx, cipher_list)) { - fprintf(stderr, "Error setting cipher list '%s'\n", - cipher_list); - goto err; - } - fprintf(stderr, "Info, set cipher list '%s'\n", cipher_list); - } else - fprintf(stderr, "Info, operating with default cipher list\n"); + /* cipher_list */ + if (cipher_list) { + if (!SSL_CTX_set_cipher_list(ctx, cipher_list)) { + fprintf(stderr, "Error setting cipher list '%s'\n", cipher_list); + goto err; + } + fprintf(stderr, "Info, set cipher list '%s'\n", cipher_list); + } else + fprintf(stderr, "Info, operating with default cipher list\n"); - /* dh_file & dh_special */ - if((dh_file || dh_special) && !ctx_set_dh(ctx, dh_file, dh_special)) - goto err; + /* dh_file & dh_special */ + if ((dh_file || dh_special) && !ctx_set_dh(ctx, dh_file, dh_special)) + goto err; - /* ctx_options */ - SSL_CTX_set_options(ctx, ctx_options); + /* ctx_options */ + SSL_CTX_set_options(ctx, ctx_options); - /* out_state (output of SSL handshake states to screen). */ - if(out_state) - cb_ssl_info_set_output(stderr); + /* out_state (output of SSL handshake states to screen). */ + if (out_state) + cb_ssl_info_set_output(stderr); - /* out_verify */ - if(out_verify > 0) { - cb_ssl_verify_set_output(stderr); - cb_ssl_verify_set_level(out_verify); - } + /* out_verify */ + if (out_verify > 0) { + cb_ssl_verify_set_output(stderr); + cb_ssl_verify_set_level(out_verify); + } - /* verify_depth */ - cb_ssl_verify_set_depth(verify_depth); + /* verify_depth */ + cb_ssl_verify_set_depth(verify_depth); - /* Success! (includes setting verify_mode) */ - SSL_CTX_set_info_callback(ctx, cb_ssl_info); - SSL_CTX_set_verify(ctx, verify_mode, cb_ssl_verify); - ret = ctx; -err: - if(!ret) { - ERR_print_errors_fp(stderr); - if(ctx) - SSL_CTX_free(ctx); - } - return ret; + /* Success! (includes setting verify_mode) */ + SSL_CTX_set_info_callback(ctx, cb_ssl_info); + SSL_CTX_set_verify(ctx, verify_mode, cb_ssl_verify); + ret = ctx; + err: + if (!ret) { + ERR_print_errors_fp(stderr); + if (ctx) + SSL_CTX_free(ctx); + } + return ret; } /*****************/ /* Selector bits */ /*****************/ -static void selector_sets_init(select_sets_t *s) +static void selector_sets_init(select_sets_t * s) { - s->max = 0; - FD_ZERO(&s->reads); - FD_ZERO(&s->sends); - FD_ZERO(&s->excepts); + s->max = 0; + FD_ZERO(&s->reads); + FD_ZERO(&s->sends); + FD_ZERO(&s->excepts); } -static void selector_init(tunala_selector_t *selector) + +static void selector_init(tunala_selector_t * selector) { - selector_sets_init(&selector->last_selected); - selector_sets_init(&selector->next_select); + selector_sets_init(&selector->last_selected); + selector_sets_init(&selector->next_select); } #define SEL_EXCEPTS 0x00 #define SEL_READS 0x01 #define SEL_SENDS 0x02 -static void selector_add_raw_fd(tunala_selector_t *s, int fd, int flags) +static void selector_add_raw_fd(tunala_selector_t * s, int fd, int flags) { - FD_SET(fd, &s->next_select.excepts); - if(flags & SEL_READS) - FD_SET(fd, &s->next_select.reads); - if(flags & SEL_SENDS) - FD_SET(fd, &s->next_select.sends); - /* Adjust "max" */ - if(s->next_select.max < (fd + 1)) - s->next_select.max = fd + 1; + FD_SET(fd, &s->next_select.excepts); + if (flags & SEL_READS) + FD_SET(fd, &s->next_select.reads); + if (flags & SEL_SENDS) + FD_SET(fd, &s->next_select.sends); + /* Adjust "max" */ + if (s->next_select.max < (fd + 1)) + s->next_select.max = fd + 1; } -static void selector_add_listener(tunala_selector_t *selector, int fd) +static void selector_add_listener(tunala_selector_t * selector, int fd) { - selector_add_raw_fd(selector, fd, SEL_READS); + selector_add_raw_fd(selector, fd, SEL_READS); } -static void selector_add_tunala(tunala_selector_t *s, tunala_item_t *t) +static void selector_add_tunala(tunala_selector_t * s, tunala_item_t * t) { - /* Set clean read if sm.clean_in is not full */ - if(t->clean_read != -1) { - selector_add_raw_fd(s, t->clean_read, - (buffer_full(state_machine_get_buffer(&t->sm, - SM_CLEAN_IN)) ? SEL_EXCEPTS : SEL_READS)); - } - /* Set clean send if sm.clean_out is not empty */ - if(t->clean_send != -1) { - selector_add_raw_fd(s, t->clean_send, - (buffer_empty(state_machine_get_buffer(&t->sm, - SM_CLEAN_OUT)) ? SEL_EXCEPTS : SEL_SENDS)); - } - /* Set dirty read if sm.dirty_in is not full */ - if(t->dirty_read != -1) { - selector_add_raw_fd(s, t->dirty_read, - (buffer_full(state_machine_get_buffer(&t->sm, - SM_DIRTY_IN)) ? SEL_EXCEPTS : SEL_READS)); - } - /* Set dirty send if sm.dirty_out is not empty */ - if(t->dirty_send != -1) { - selector_add_raw_fd(s, t->dirty_send, - (buffer_empty(state_machine_get_buffer(&t->sm, - SM_DIRTY_OUT)) ? SEL_EXCEPTS : SEL_SENDS)); - } + /* Set clean read if sm.clean_in is not full */ + if (t->clean_read != -1) { + selector_add_raw_fd(s, t->clean_read, + (buffer_full(state_machine_get_buffer(&t->sm, + SM_CLEAN_IN)) + ? SEL_EXCEPTS : SEL_READS)); + } + /* Set clean send if sm.clean_out is not empty */ + if (t->clean_send != -1) { + selector_add_raw_fd(s, t->clean_send, + (buffer_empty(state_machine_get_buffer(&t->sm, + SM_CLEAN_OUT)) + ? SEL_EXCEPTS : SEL_SENDS)); + } + /* Set dirty read if sm.dirty_in is not full */ + if (t->dirty_read != -1) { + selector_add_raw_fd(s, t->dirty_read, + (buffer_full(state_machine_get_buffer(&t->sm, + SM_DIRTY_IN)) + ? SEL_EXCEPTS : SEL_READS)); + } + /* Set dirty send if sm.dirty_out is not empty */ + if (t->dirty_send != -1) { + selector_add_raw_fd(s, t->dirty_send, + (buffer_empty(state_machine_get_buffer(&t->sm, + SM_DIRTY_OUT)) + ? SEL_EXCEPTS : SEL_SENDS)); + } } -static int selector_select(tunala_selector_t *selector) +static int selector_select(tunala_selector_t * selector) { - memcpy(&selector->last_selected, &selector->next_select, - sizeof(select_sets_t)); - selector_sets_init(&selector->next_select); - return select(selector->last_selected.max, - &selector->last_selected.reads, - &selector->last_selected.sends, - &selector->last_selected.excepts, NULL); + memcpy(&selector->last_selected, &selector->next_select, + sizeof(select_sets_t)); + selector_sets_init(&selector->next_select); + return select(selector->last_selected.max, + &selector->last_selected.reads, + &selector->last_selected.sends, + &selector->last_selected.excepts, NULL); } -/* This returns -1 for error, 0 for no new connections, or 1 for success, in - * which case *newfd is populated. */ -static int selector_get_listener(tunala_selector_t *selector, int fd, int *newfd) +/* + * This returns -1 for error, 0 for no new connections, or 1 for success, in + * which case *newfd is populated. + */ +static int selector_get_listener(tunala_selector_t * selector, int fd, + int *newfd) { - if(FD_ISSET(fd, &selector->last_selected.excepts)) - return -1; - if(!FD_ISSET(fd, &selector->last_selected.reads)) - return 0; - if((*newfd = ip_accept_connection(fd)) == -1) - return -1; - return 1; + if (FD_ISSET(fd, &selector->last_selected.excepts)) + return -1; + if (!FD_ISSET(fd, &selector->last_selected.reads)) + return 0; + if ((*newfd = ip_accept_connection(fd)) == -1) + return -1; + return 1; } /************************/ /* "Tunala" world stuff */ /************************/ -static int tunala_world_make_room(tunala_world_t *world) +static int tunala_world_make_room(tunala_world_t * world) { - unsigned int newsize; - tunala_item_t *newarray; + unsigned int newsize; + tunala_item_t *newarray; - if(world->tunnels_used < world->tunnels_size) - return 1; - newsize = (world->tunnels_size == 0 ? 16 : - ((world->tunnels_size * 3) / 2)); - if((newarray = malloc(newsize * sizeof(tunala_item_t))) == NULL) - return 0; - memset(newarray, 0, newsize * sizeof(tunala_item_t)); - if(world->tunnels_used > 0) - memcpy(newarray, world->tunnels, - world->tunnels_used * sizeof(tunala_item_t)); - if(world->tunnels_size > 0) - free(world->tunnels); - /* migrate */ - world->tunnels = newarray; - world->tunnels_size = newsize; - return 1; + if (world->tunnels_used < world->tunnels_size) + return 1; + newsize = (world->tunnels_size == 0 ? 16 : + ((world->tunnels_size * 3) / 2)); + if ((newarray = malloc(newsize * sizeof(tunala_item_t))) == NULL) + return 0; + memset(newarray, 0, newsize * sizeof(tunala_item_t)); + if (world->tunnels_used > 0) + memcpy(newarray, world->tunnels, + world->tunnels_used * sizeof(tunala_item_t)); + if (world->tunnels_size > 0) + free(world->tunnels); + /* migrate */ + world->tunnels = newarray; + world->tunnels_size = newsize; + return 1; } -static int tunala_world_new_item(tunala_world_t *world, int fd, - const char *ip, unsigned short port, int flipped) +static int tunala_world_new_item(tunala_world_t * world, int fd, + const char *ip, unsigned short port, + int flipped) { - tunala_item_t *item; - int newfd; - SSL *new_ssl = NULL; + tunala_item_t *item; + int newfd; + SSL *new_ssl = NULL; - if(!tunala_world_make_room(world)) - return 0; - if((new_ssl = SSL_new(world->ssl_ctx)) == NULL) { - fprintf(stderr, "Error creating new SSL\n"); - ERR_print_errors_fp(stderr); - return 0; - } - item = world->tunnels + (world->tunnels_used++); - state_machine_init(&item->sm); - item->clean_read = item->clean_send = - item->dirty_read = item->dirty_send = -1; - if((newfd = ip_create_connection_split(ip, port)) == -1) - goto err; - /* Which way round? If we're a server, "fd" is the dirty side and the - * connection we open is the clean one. For a client, it's the other way - * around. Unless, of course, we're "flipped" in which case everything - * gets reversed. :-) */ - if((world->server_mode && !flipped) || - (!world->server_mode && flipped)) { - item->dirty_read = item->dirty_send = fd; - item->clean_read = item->clean_send = newfd; - } else { - item->clean_read = item->clean_send = fd; - item->dirty_read = item->dirty_send = newfd; - } - /* We use the SSL's "app_data" to indicate a call-back induced "kill" */ - SSL_set_app_data(new_ssl, NULL); - if(!state_machine_set_SSL(&item->sm, new_ssl, world->server_mode)) - goto err; - return 1; -err: - tunala_world_del_item(world, world->tunnels_used - 1); - return 0; + if (!tunala_world_make_room(world)) + return 0; + if ((new_ssl = SSL_new(world->ssl_ctx)) == NULL) { + fprintf(stderr, "Error creating new SSL\n"); + ERR_print_errors_fp(stderr); + return 0; + } + item = world->tunnels + (world->tunnels_used++); + state_machine_init(&item->sm); + item->clean_read = item->clean_send = + item->dirty_read = item->dirty_send = -1; + if ((newfd = ip_create_connection_split(ip, port)) == -1) + goto err; + /* + * Which way round? If we're a server, "fd" is the dirty side and the + * connection we open is the clean one. For a client, it's the other way + * around. Unless, of course, we're "flipped" in which case everything + * gets reversed. :-) + */ + if ((world->server_mode && !flipped) || (!world->server_mode && flipped)) { + item->dirty_read = item->dirty_send = fd; + item->clean_read = item->clean_send = newfd; + } else { + item->clean_read = item->clean_send = fd; + item->dirty_read = item->dirty_send = newfd; + } + /* + * We use the SSL's "app_data" to indicate a call-back induced "kill" + */ + SSL_set_app_data(new_ssl, NULL); + if (!state_machine_set_SSL(&item->sm, new_ssl, world->server_mode)) + goto err; + return 1; + err: + tunala_world_del_item(world, world->tunnels_used - 1); + return 0; } -static void tunala_world_del_item(tunala_world_t *world, unsigned int idx) +static void tunala_world_del_item(tunala_world_t * world, unsigned int idx) { - tunala_item_t *item = world->tunnels + idx; - if(item->clean_read != -1) - close(item->clean_read); - if(item->clean_send != item->clean_read) - close(item->clean_send); - item->clean_read = item->clean_send = -1; - if(item->dirty_read != -1) - close(item->dirty_read); - if(item->dirty_send != item->dirty_read) - close(item->dirty_send); - item->dirty_read = item->dirty_send = -1; - state_machine_close(&item->sm); - /* OK, now we fix the item array */ - if(idx + 1 < world->tunnels_used) - /* We need to scroll entries to the left */ - memmove(world->tunnels + idx, - world->tunnels + (idx + 1), - (world->tunnels_used - (idx + 1)) * - sizeof(tunala_item_t)); - world->tunnels_used--; + tunala_item_t *item = world->tunnels + idx; + if (item->clean_read != -1) + close(item->clean_read); + if (item->clean_send != item->clean_read) + close(item->clean_send); + item->clean_read = item->clean_send = -1; + if (item->dirty_read != -1) + close(item->dirty_read); + if (item->dirty_send != item->dirty_read) + close(item->dirty_send); + item->dirty_read = item->dirty_send = -1; + state_machine_close(&item->sm); + /* OK, now we fix the item array */ + if (idx + 1 < world->tunnels_used) + /* We need to scroll entries to the left */ + memmove(world->tunnels + idx, + world->tunnels + (idx + 1), + (world->tunnels_used - (idx + 1)) * sizeof(tunala_item_t)); + world->tunnels_used--; } -static int tunala_item_io(tunala_selector_t *selector, tunala_item_t *item) +static int tunala_item_io(tunala_selector_t * selector, tunala_item_t * item) { - int c_r, c_s, d_r, d_s; /* Four boolean flags */ + int c_r, c_s, d_r, d_s; /* Four boolean flags */ - /* Take ourselves out of the gene-pool if there was an except */ - if((item->clean_read != -1) && FD_ISSET(item->clean_read, - &selector->last_selected.excepts)) - return 0; - if((item->clean_send != -1) && FD_ISSET(item->clean_send, - &selector->last_selected.excepts)) - return 0; - if((item->dirty_read != -1) && FD_ISSET(item->dirty_read, - &selector->last_selected.excepts)) - return 0; - if((item->dirty_send != -1) && FD_ISSET(item->dirty_send, - &selector->last_selected.excepts)) - return 0; - /* Grab our 4 IO flags */ - c_r = c_s = d_r = d_s = 0; - if(item->clean_read != -1) - c_r = FD_ISSET(item->clean_read, &selector->last_selected.reads); - if(item->clean_send != -1) - c_s = FD_ISSET(item->clean_send, &selector->last_selected.sends); - if(item->dirty_read != -1) - d_r = FD_ISSET(item->dirty_read, &selector->last_selected.reads); - if(item->dirty_send != -1) - d_s = FD_ISSET(item->dirty_send, &selector->last_selected.sends); - /* If no IO has happened for us, skip needless data looping */ - if(!c_r && !c_s && !d_r && !d_s) - return 1; - if(c_r) - c_r = (buffer_from_fd(state_machine_get_buffer(&item->sm, - SM_CLEAN_IN), item->clean_read) <= 0); - if(c_s) - c_s = (buffer_to_fd(state_machine_get_buffer(&item->sm, - SM_CLEAN_OUT), item->clean_send) <= 0); - if(d_r) - d_r = (buffer_from_fd(state_machine_get_buffer(&item->sm, - SM_DIRTY_IN), item->dirty_read) <= 0); - if(d_s) - d_s = (buffer_to_fd(state_machine_get_buffer(&item->sm, - SM_DIRTY_OUT), item->dirty_send) <= 0); - /* If any of the flags is non-zero, that means they need closing */ - if(c_r) { - close(item->clean_read); - if(item->clean_send == item->clean_read) - item->clean_send = -1; - item->clean_read = -1; - } - if(c_s && (item->clean_send != -1)) { - close(item->clean_send); - if(item->clean_send == item->clean_read) - item->clean_read = -1; - item->clean_send = -1; - } - if(d_r) { - close(item->dirty_read); - if(item->dirty_send == item->dirty_read) - item->dirty_send = -1; - item->dirty_read = -1; - } - if(d_s && (item->dirty_send != -1)) { - close(item->dirty_send); - if(item->dirty_send == item->dirty_read) - item->dirty_read = -1; - item->dirty_send = -1; - } - /* This function name is attributed to the term donated by David - * Schwartz on openssl-dev, message-ID: - * . :-) */ - if(!state_machine_churn(&item->sm)) - /* If the SSL closes, it will also zero-out the _in buffers - * and will in future process just outgoing data. As and - * when the outgoing data has gone, it will return zero - * here to tell us to bail out. */ - return 0; - /* Otherwise, we return zero if both sides are dead. */ - if(((item->clean_read == -1) || (item->clean_send == -1)) && - ((item->dirty_read == -1) || (item->dirty_send == -1))) - return 0; - /* If only one side closed, notify the SSL of this so it can take - * appropriate action. */ - if((item->clean_read == -1) || (item->clean_send == -1)) { - if(!state_machine_close_clean(&item->sm)) - return 0; - } - if((item->dirty_read == -1) || (item->dirty_send == -1)) { - if(!state_machine_close_dirty(&item->sm)) - return 0; - } - return 1; + /* Take ourselves out of the gene-pool if there was an except */ + if ((item->clean_read != -1) && FD_ISSET(item->clean_read, + &selector-> + last_selected.excepts)) + return 0; + if ((item->clean_send != -1) && FD_ISSET(item->clean_send, + &selector-> + last_selected.excepts)) + return 0; + if ((item->dirty_read != -1) && FD_ISSET(item->dirty_read, + &selector-> + last_selected.excepts)) + return 0; + if ((item->dirty_send != -1) && FD_ISSET(item->dirty_send, + &selector-> + last_selected.excepts)) + return 0; + /* Grab our 4 IO flags */ + c_r = c_s = d_r = d_s = 0; + if (item->clean_read != -1) + c_r = FD_ISSET(item->clean_read, &selector->last_selected.reads); + if (item->clean_send != -1) + c_s = FD_ISSET(item->clean_send, &selector->last_selected.sends); + if (item->dirty_read != -1) + d_r = FD_ISSET(item->dirty_read, &selector->last_selected.reads); + if (item->dirty_send != -1) + d_s = FD_ISSET(item->dirty_send, &selector->last_selected.sends); + /* If no IO has happened for us, skip needless data looping */ + if (!c_r && !c_s && !d_r && !d_s) + return 1; + if (c_r) + c_r = (buffer_from_fd(state_machine_get_buffer(&item->sm, + SM_CLEAN_IN), + item->clean_read) <= 0); + if (c_s) + c_s = (buffer_to_fd(state_machine_get_buffer(&item->sm, + SM_CLEAN_OUT), + item->clean_send) <= 0); + if (d_r) + d_r = (buffer_from_fd(state_machine_get_buffer(&item->sm, + SM_DIRTY_IN), + item->dirty_read) <= 0); + if (d_s) + d_s = (buffer_to_fd(state_machine_get_buffer(&item->sm, + SM_DIRTY_OUT), + item->dirty_send) <= 0); + /* If any of the flags is non-zero, that means they need closing */ + if (c_r) { + close(item->clean_read); + if (item->clean_send == item->clean_read) + item->clean_send = -1; + item->clean_read = -1; + } + if (c_s && (item->clean_send != -1)) { + close(item->clean_send); + if (item->clean_send == item->clean_read) + item->clean_read = -1; + item->clean_send = -1; + } + if (d_r) { + close(item->dirty_read); + if (item->dirty_send == item->dirty_read) + item->dirty_send = -1; + item->dirty_read = -1; + } + if (d_s && (item->dirty_send != -1)) { + close(item->dirty_send); + if (item->dirty_send == item->dirty_read) + item->dirty_read = -1; + item->dirty_send = -1; + } + /* + * This function name is attributed to the term donated by David Schwartz + * on openssl-dev, message-ID: + * . :-) + */ + if (!state_machine_churn(&item->sm)) + /* + * If the SSL closes, it will also zero-out the _in buffers and will + * in future process just outgoing data. As and when the outgoing + * data has gone, it will return zero here to tell us to bail out. + */ + return 0; + /* Otherwise, we return zero if both sides are dead. */ + if (((item->clean_read == -1) || (item->clean_send == -1)) && + ((item->dirty_read == -1) || (item->dirty_send == -1))) + return 0; + /* + * If only one side closed, notify the SSL of this so it can take + * appropriate action. + */ + if ((item->clean_read == -1) || (item->clean_send == -1)) { + if (!state_machine_close_clean(&item->sm)) + return 0; + } + if ((item->dirty_read == -1) || (item->dirty_send == -1)) { + if (!state_machine_close_dirty(&item->sm)) + return 0; + } + return 1; } - diff --git a/openssl/demos/tunala/tunala.h b/openssl/demos/tunala/tunala.h index 3a752f259..28860d781 100644 --- a/openssl/demos/tunala/tunala.h +++ b/openssl/demos/tunala/tunala.h @@ -1,215 +1,244 @@ -/* Tunala ("Tunneler with a New Zealand accent") - * - * Written by Geoff Thorpe, but endorsed/supported by noone. Please use this is - * if it's useful or informative to you, but it's only here as a scratchpad for - * ideas about how you might (or might not) program with OpenSSL. If you deploy - * this is in a mission-critical environment, and have not read, understood, - * audited, and modified this code to your satisfaction, and the result is that - * all hell breaks loose and you are looking for a new employer, then it proves - * nothing except perhaps that Darwinism is alive and well. Let's just say, *I* - * don't use this in a mission-critical environment, so it would be stupid for - * anyone to assume that it is solid and/or tested enough when even its author - * doesn't place that much trust in it. You have been warned. - * +/* + * Tunala ("Tunneler with a New Zealand accent") Written by Geoff Thorpe, + * but endorsed/supported by noone. Please use this is if it's useful or + * informative to you, but it's only here as a scratchpad for ideas about how + * you might (or might not) program with OpenSSL. If you deploy this is in a + * mission-critical environment, and have not read, understood, audited, and + * modified this code to your satisfaction, and the result is that all hell + * breaks loose and you are looking for a new employer, then it proves + * nothing except perhaps that Darwinism is alive and well. Let's just say, + * *I* don't use this in a mission-critical environment, so it would be + * stupid for anyone to assume that it is solid and/or tested enough when + * even its author doesn't place that much trust in it. You have been warned. * With thanks to Cryptographic Appliances, Inc. */ #ifndef _TUNALA_H -#define _TUNALA_H +# define _TUNALA_H /* pull in autoconf fluff */ -#ifndef NO_CONFIG_H -#include "config.h" -#else -/* We don't have autoconf, we have to set all of these unless a tweaked Makefile - * tells us not to ... */ +# ifndef NO_CONFIG_H +# include "config.h" +# else +/* + * We don't have autoconf, we have to set all of these unless a tweaked + * Makefile tells us not to ... + */ /* headers */ -#ifndef NO_HAVE_SELECT -#define HAVE_SELECT -#endif -#ifndef NO_HAVE_SOCKET -#define HAVE_SOCKET -#endif -#ifndef NO_HAVE_UNISTD_H -#define HAVE_UNISTD_H -#endif -#ifndef NO_HAVE_FCNTL_H -#define HAVE_FCNTL_H -#endif -#ifndef NO_HAVE_LIMITS_H -#define HAVE_LIMITS_H -#endif +# ifndef NO_HAVE_SELECT +# define HAVE_SELECT +# endif +# ifndef NO_HAVE_SOCKET +# define HAVE_SOCKET +# endif +# ifndef NO_HAVE_UNISTD_H +# define HAVE_UNISTD_H +# endif +# ifndef NO_HAVE_FCNTL_H +# define HAVE_FCNTL_H +# endif +# ifndef NO_HAVE_LIMITS_H +# define HAVE_LIMITS_H +# endif /* features */ -#ifndef NO_HAVE_STRSTR -#define HAVE_STRSTR -#endif -#ifndef NO_HAVE_STRTOUL -#define HAVE_STRTOUL -#endif -#endif - -#if !defined(HAVE_SELECT) || !defined(HAVE_SOCKET) -#error "can't build without some network basics like select() and socket()" -#endif - -#include -#ifndef NO_SYSTEM_H -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_FCNTL_H -#include -#endif -#ifdef HAVE_LIMITS_H -#include -#endif -#include -#include -#include -#include -#include -#endif /* !defined(NO_SYSTEM_H) */ - -#ifndef NO_OPENSSL -#include -#include -#include -#endif /* !defined(NO_OPENSSL) */ - -#ifndef OPENSSL_NO_BUFFER -/* This is the generic "buffer" type that is used when feeding the +# ifndef NO_HAVE_STRSTR +# define HAVE_STRSTR +# endif +# ifndef NO_HAVE_STRTOUL +# define HAVE_STRTOUL +# endif +# endif + +# if !defined(HAVE_SELECT) || !defined(HAVE_SOCKET) +# error "can't build without some network basics like select() and socket()" +# endif + +# include +# ifndef NO_SYSTEM_H +# include +# ifdef HAVE_UNISTD_H +# include +# endif +# ifdef HAVE_FCNTL_H +# include +# endif +# ifdef HAVE_LIMITS_H +# include +# endif +# include +# include +# include +# include +# include +# endif /* !defined(NO_SYSTEM_H) */ + +# ifndef NO_OPENSSL +# include +# include +# include +# endif /* !defined(NO_OPENSSL) */ + +# ifndef OPENSSL_NO_BUFFER +/* + * This is the generic "buffer" type that is used when feeding the * state-machine. It's basically a FIFO with respect to the "adddata" & - * "takedata" type functions that operate on it. */ -#define MAX_DATA_SIZE 16384 + * "takedata" type functions that operate on it. + */ +# define MAX_DATA_SIZE 16384 typedef struct _buffer_t { - unsigned char data[MAX_DATA_SIZE]; - unsigned int used; - /* Statistical values - counts the total number of bytes read in and - * read out (respectively) since "buffer_init()" */ - unsigned long total_in, total_out; + unsigned char data[MAX_DATA_SIZE]; + unsigned int used; + /* + * Statistical values - counts the total number of bytes read in and read + * out (respectively) since "buffer_init()" + */ + unsigned long total_in, total_out; } buffer_t; /* Initialise a buffer structure before use */ -void buffer_init(buffer_t *buf); -/* Cleanup a buffer structure - presently not needed, but if buffer_t is - * converted to using dynamic allocation, this would be required - so should be - * called to protect against an explosion of memory leaks later if the change is - * made. */ -void buffer_close(buffer_t *buf); +void buffer_init(buffer_t * buf); +/* + * Cleanup a buffer structure - presently not needed, but if buffer_t is + * converted to using dynamic allocation, this would be required - so should + * be called to protect against an explosion of memory leaks later if the + * change is made. + */ +void buffer_close(buffer_t * buf); /* Basic functions to manipulate buffers */ -unsigned int buffer_used(buffer_t *buf); /* How much data in the buffer */ -unsigned int buffer_unused(buffer_t *buf); /* How much space in the buffer */ -int buffer_full(buffer_t *buf); /* Boolean, is it full? */ -int buffer_notfull(buffer_t *buf); /* Boolean, is it not full? */ -int buffer_empty(buffer_t *buf); /* Boolean, is it empty? */ -int buffer_notempty(buffer_t *buf); /* Boolean, is it not empty? */ -unsigned long buffer_total_in(buffer_t *buf); /* Total bytes written to buffer */ -unsigned long buffer_total_out(buffer_t *buf); /* Total bytes read from buffer */ - -#if 0 /* Currently used only within buffer.c - better to expose only - * higher-level functions anyway */ -/* Add data to the tail of the buffer, returns the amount that was actually - * added (so, you need to check if return value is less than size) */ -unsigned int buffer_adddata(buffer_t *buf, const unsigned char *ptr, - unsigned int size); - -/* Take data from the front of the buffer (and scroll the rest forward). If +unsigned int buffer_used(buffer_t * buf); /* How much data in the buffer */ +unsigned int buffer_unused(buffer_t * buf); /* How much space in the buffer */ +int buffer_full(buffer_t * buf); /* Boolean, is it full? */ +int buffer_notfull(buffer_t * buf); /* Boolean, is it not full? */ +int buffer_empty(buffer_t * buf); /* Boolean, is it empty? */ +int buffer_notempty(buffer_t * buf); /* Boolean, is it not empty? */ +unsigned long buffer_total_in(buffer_t * buf); /* Total bytes written to + * buffer */ +unsigned long buffer_total_out(buffer_t * buf); /* Total bytes read from + * buffer */ + +# if 0 /* Currently used only within buffer.c - + * better to expose only higher-level + * functions anyway */ +/* + * Add data to the tail of the buffer, returns the amount that was actually + * added (so, you need to check if return value is less than size) + */ +unsigned int buffer_adddata(buffer_t * buf, const unsigned char *ptr, + unsigned int size); + +/* + * Take data from the front of the buffer (and scroll the rest forward). If * "ptr" is NULL, this just removes data off the front of the buffer. Return - * value is the amount actually removed (can be less than size if the buffer has - * too little data). */ -unsigned int buffer_takedata(buffer_t *buf, unsigned char *ptr, - unsigned int size); - -/* Flushes as much data as possible out of the "from" buffer into the "to" - * buffer. Return value is the amount moved. The amount moved can be restricted - * to a maximum by specifying "cap" - setting it to -1 means no limit. */ -unsigned int buffer_tobuffer(buffer_t *to, buffer_t *from, int cap); -#endif - -#ifndef NO_IP + * value is the amount actually removed (can be less than size if the buffer + * has too little data). + */ +unsigned int buffer_takedata(buffer_t * buf, unsigned char *ptr, + unsigned int size); + +/* + * Flushes as much data as possible out of the "from" buffer into the "to" + * buffer. Return value is the amount moved. The amount moved can be + * restricted to a maximum by specifying "cap" - setting it to -1 means no + * limit. + */ +unsigned int buffer_tobuffer(buffer_t * to, buffer_t * from, int cap); +# endif + +# ifndef NO_IP /* Read or write between a file-descriptor and a buffer */ -int buffer_from_fd(buffer_t *buf, int fd); -int buffer_to_fd(buffer_t *buf, int fd); -#endif /* !defined(NO_IP) */ +int buffer_from_fd(buffer_t * buf, int fd); +int buffer_to_fd(buffer_t * buf, int fd); +# endif /* !defined(NO_IP) */ -#ifndef NO_OPENSSL +# ifndef NO_OPENSSL /* Read or write between an SSL or BIO and a buffer */ -void buffer_from_SSL(buffer_t *buf, SSL *ssl); -void buffer_to_SSL(buffer_t *buf, SSL *ssl); -void buffer_from_BIO(buffer_t *buf, BIO *bio); -void buffer_to_BIO(buffer_t *buf, BIO *bio); +void buffer_from_SSL(buffer_t * buf, SSL *ssl); +void buffer_to_SSL(buffer_t * buf, SSL *ssl); +void buffer_from_BIO(buffer_t * buf, BIO *bio); +void buffer_to_BIO(buffer_t * buf, BIO *bio); /* Callbacks */ void cb_ssl_info(const SSL *s, int where, int ret); -void cb_ssl_info_set_output(FILE *fp); /* Called if output should be sent too */ +/* Called if output should be sent too */ +void cb_ssl_info_set_output(FILE *fp); int cb_ssl_verify(int ok, X509_STORE_CTX *ctx); void cb_ssl_verify_set_output(FILE *fp); void cb_ssl_verify_set_depth(unsigned int verify_depth); void cb_ssl_verify_set_level(unsigned int level); RSA *cb_generate_tmp_rsa(SSL *s, int is_export, int keylength); -#endif /* !defined(NO_OPENSSL) */ -#endif /* !defined(OPENSSL_NO_BUFFER) */ +# endif /* !defined(NO_OPENSSL) */ +# endif /* !defined(OPENSSL_NO_BUFFER) */ -#ifndef NO_TUNALA -#ifdef OPENSSL_NO_BUFFER -#error "TUNALA section of tunala.h requires BUFFER support" -#endif +# ifndef NO_TUNALA +# ifdef OPENSSL_NO_BUFFER +# error "TUNALA section of tunala.h requires BUFFER support" +# endif typedef struct _state_machine_t { - SSL *ssl; - BIO *bio_intossl; - BIO *bio_fromssl; - buffer_t clean_in, clean_out; - buffer_t dirty_in, dirty_out; + SSL *ssl; + BIO *bio_intossl; + BIO *bio_fromssl; + buffer_t clean_in, clean_out; + buffer_t dirty_in, dirty_out; } state_machine_t; typedef enum { - SM_CLEAN_IN, SM_CLEAN_OUT, - SM_DIRTY_IN, SM_DIRTY_OUT + SM_CLEAN_IN, SM_CLEAN_OUT, + SM_DIRTY_IN, SM_DIRTY_OUT } sm_buffer_t; -void state_machine_init(state_machine_t *machine); -void state_machine_close(state_machine_t *machine); -buffer_t *state_machine_get_buffer(state_machine_t *machine, sm_buffer_t type); -SSL *state_machine_get_SSL(state_machine_t *machine); -int state_machine_set_SSL(state_machine_t *machine, SSL *ssl, int is_server); +void state_machine_init(state_machine_t * machine); +void state_machine_close(state_machine_t * machine); +buffer_t *state_machine_get_buffer(state_machine_t * machine, + sm_buffer_t type); +SSL *state_machine_get_SSL(state_machine_t * machine); +int state_machine_set_SSL(state_machine_t * machine, SSL *ssl, int is_server); /* Performs the data-IO loop and returns zero if the machine should close */ -int state_machine_churn(state_machine_t *machine); -/* Is used to handle closing conditions - namely when one side of the tunnel has - * closed but the other should finish flushing. */ -int state_machine_close_clean(state_machine_t *machine); -int state_machine_close_dirty(state_machine_t *machine); -#endif /* !defined(NO_TUNALA) */ - -#ifndef NO_IP -/* Initialise anything related to the networking. This includes blocking pesky - * SIGPIPE signals. */ +int state_machine_churn(state_machine_t * machine); +/* + * Is used to handle closing conditions - namely when one side of the tunnel + * has closed but the other should finish flushing. + */ +int state_machine_close_clean(state_machine_t * machine); +int state_machine_close_dirty(state_machine_t * machine); +# endif /* !defined(NO_TUNALA) */ + +# ifndef NO_IP +/* + * Initialise anything related to the networking. This includes blocking + * pesky SIGPIPE signals. + */ int ip_initialise(void); -/* ip is the 4-byte ip address (eg. 127.0.0.1 is {0x7F,0x00,0x00,0x01}), port is - * the port to listen on (host byte order), and the return value is the - * file-descriptor or -1 on error. */ +/* + * ip is the 4-byte ip address (eg. 127.0.0.1 is {0x7F,0x00,0x00,0x01}), port + * is the port to listen on (host byte order), and the return value is the + * file-descriptor or -1 on error. + */ int ip_create_listener_split(const char *ip, unsigned short port); /* Same semantics as above. */ int ip_create_connection_split(const char *ip, unsigned short port); /* Converts a string into the ip/port before calling the above */ int ip_create_listener(const char *address); int ip_create_connection(const char *address); -/* Just does a string conversion on its own. NB: If accept_all_ip is non-zero, - * then the address string could be just a port. Ie. it's suitable for a - * listening address but not a connecting address. */ +/* + * Just does a string conversion on its own. NB: If accept_all_ip is + * non-zero, then the address string could be just a port. Ie. it's suitable + * for a listening address but not a connecting address. + */ int ip_parse_address(const char *address, const char **parsed_ip, - unsigned short *port, int accept_all_ip); -/* Accepts an incoming connection through the listener. Assumes selects and - * what-not have deemed it an appropriate thing to do. */ + unsigned short *port, int accept_all_ip); +/* + * Accepts an incoming connection through the listener. Assumes selects and + * what-not have deemed it an appropriate thing to do. + */ int ip_accept_connection(int listen_fd); -#endif /* !defined(NO_IP) */ +# endif /* !defined(NO_IP) */ /* These functions wrap up things that can be portability hassles. */ int int_strtoul(const char *str, unsigned long *val); -#ifdef HAVE_STRSTR -#define int_strstr strstr -#else +# ifdef HAVE_STRSTR +# define int_strstr strstr +# else char *int_strstr(const char *haystack, const char *needle); -#endif +# endif -#endif /* !defined(_TUNALA_H) */ +#endif /* !defined(_TUNALA_H) */ diff --git a/openssl/demos/x509/mkcert.c b/openssl/demos/x509/mkcert.c index 6a52e5d0f..1e621464d 100644 --- a/openssl/demos/x509/mkcert.c +++ b/openssl/demos/x509/mkcert.c @@ -1,8 +1,7 @@ -/* Certificate creation. Demonstrates some certificate related - * operations. +/* + * Certificate creation. Demonstrates some certificate related operations. */ - #include #include @@ -10,163 +9,161 @@ #include #include #ifndef OPENSSL_NO_ENGINE -#include +# include #endif int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days); int add_ext(X509 *cert, int nid, char *value); int main(int argc, char **argv) - { - BIO *bio_err; - X509 *x509=NULL; - EVP_PKEY *pkey=NULL; +{ + BIO *bio_err; + X509 *x509 = NULL; + EVP_PKEY *pkey = NULL; - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - bio_err=BIO_new_fp(stderr, BIO_NOCLOSE); + bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); - mkcert(&x509,&pkey,512,0,365); + mkcert(&x509, &pkey, 512, 0, 365); - RSA_print_fp(stdout,pkey->pkey.rsa,0); - X509_print_fp(stdout,x509); + RSA_print_fp(stdout, pkey->pkey.rsa, 0); + X509_print_fp(stdout, x509); - PEM_write_PrivateKey(stdout,pkey,NULL,NULL,0,NULL, NULL); - PEM_write_X509(stdout,x509); + PEM_write_PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL); + PEM_write_X509(stdout, x509); - X509_free(x509); - EVP_PKEY_free(pkey); + X509_free(x509); + EVP_PKEY_free(pkey); #ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); + ENGINE_cleanup(); #endif - CRYPTO_cleanup_all_ex_data(); + CRYPTO_cleanup_all_ex_data(); - CRYPTO_mem_leaks(bio_err); - BIO_free(bio_err); - return(0); - } + CRYPTO_mem_leaks(bio_err); + BIO_free(bio_err); + return (0); +} static void callback(int p, int n, void *arg) - { - char c='B'; - - if (p == 0) c='.'; - if (p == 1) c='+'; - if (p == 2) c='*'; - if (p == 3) c='\n'; - fputc(c,stderr); - } +{ + char c = 'B'; + + if (p == 0) + c = '.'; + if (p == 1) + c = '+'; + if (p == 2) + c = '*'; + if (p == 3) + c = '\n'; + fputc(c, stderr); +} int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days) - { - X509 *x; - EVP_PKEY *pk; - RSA *rsa; - X509_NAME *name=NULL; - - if ((pkeyp == NULL) || (*pkeyp == NULL)) - { - if ((pk=EVP_PKEY_new()) == NULL) - { - abort(); - return(0); - } - } - else - pk= *pkeyp; - - if ((x509p == NULL) || (*x509p == NULL)) - { - if ((x=X509_new()) == NULL) - goto err; - } - else - x= *x509p; - - rsa=RSA_generate_key(bits,RSA_F4,callback,NULL); - if (!EVP_PKEY_assign_RSA(pk,rsa)) - { - abort(); - goto err; - } - rsa=NULL; - - X509_set_version(x,2); - ASN1_INTEGER_set(X509_get_serialNumber(x),serial); - X509_gmtime_adj(X509_get_notBefore(x),0); - X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days); - X509_set_pubkey(x,pk); - - name=X509_get_subject_name(x); - - /* This function creates and adds the entry, working out the - * correct string type and performing checks on its length. - * Normally we'd check the return value for errors... - */ - X509_NAME_add_entry_by_txt(name,"C", - MBSTRING_ASC, "UK", -1, -1, 0); - X509_NAME_add_entry_by_txt(name,"CN", - MBSTRING_ASC, "OpenSSL Group", -1, -1, 0); - - /* Its self signed so set the issuer name to be the same as the - * subject. - */ - X509_set_issuer_name(x,name); - - /* Add various extensions: standard extensions */ - add_ext(x, NID_basic_constraints, "critical,CA:TRUE"); - add_ext(x, NID_key_usage, "critical,keyCertSign,cRLSign"); - - add_ext(x, NID_subject_key_identifier, "hash"); - - /* Some Netscape specific extensions */ - add_ext(x, NID_netscape_cert_type, "sslCA"); - - add_ext(x, NID_netscape_comment, "example comment extension"); - +{ + X509 *x; + EVP_PKEY *pk; + RSA *rsa; + X509_NAME *name = NULL; + + if ((pkeyp == NULL) || (*pkeyp == NULL)) { + if ((pk = EVP_PKEY_new()) == NULL) { + abort(); + return (0); + } + } else + pk = *pkeyp; + + if ((x509p == NULL) || (*x509p == NULL)) { + if ((x = X509_new()) == NULL) + goto err; + } else + x = *x509p; + + rsa = RSA_generate_key(bits, RSA_F4, callback, NULL); + if (!EVP_PKEY_assign_RSA(pk, rsa)) { + abort(); + goto err; + } + rsa = NULL; + + X509_set_version(x, 2); + ASN1_INTEGER_set(X509_get_serialNumber(x), serial); + X509_gmtime_adj(X509_get_notBefore(x), 0); + X509_gmtime_adj(X509_get_notAfter(x), (long)60 * 60 * 24 * days); + X509_set_pubkey(x, pk); + + name = X509_get_subject_name(x); + + /* + * This function creates and adds the entry, working out the correct + * string type and performing checks on its length. Normally we'd check + * the return value for errors... + */ + X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, "UK", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "CN", + MBSTRING_ASC, "OpenSSL Group", -1, -1, 0); + + /* + * Its self signed so set the issuer name to be the same as the subject. + */ + X509_set_issuer_name(x, name); + + /* Add various extensions: standard extensions */ + add_ext(x, NID_basic_constraints, "critical,CA:TRUE"); + add_ext(x, NID_key_usage, "critical,keyCertSign,cRLSign"); + + add_ext(x, NID_subject_key_identifier, "hash"); + + /* Some Netscape specific extensions */ + add_ext(x, NID_netscape_cert_type, "sslCA"); + + add_ext(x, NID_netscape_comment, "example comment extension"); #ifdef CUSTOM_EXT - /* Maybe even add our own extension based on existing */ - { - int nid; - nid = OBJ_create("1.2.3.4", "MyAlias", "My Test Alias Extension"); - X509V3_EXT_add_alias(nid, NID_netscape_comment); - add_ext(x, nid, "example comment alias"); - } + /* Maybe even add our own extension based on existing */ + { + int nid; + nid = OBJ_create("1.2.3.4", "MyAlias", "My Test Alias Extension"); + X509V3_EXT_add_alias(nid, NID_netscape_comment); + add_ext(x, nid, "example comment alias"); + } #endif - - if (!X509_sign(x,pk,EVP_sha1())) - goto err; - - *x509p=x; - *pkeyp=pk; - return(1); -err: - return(0); - } - -/* Add extension using V3 code: we can set the config file as NULL - * because we wont reference any other sections. + + if (!X509_sign(x, pk, EVP_sha1())) + goto err; + + *x509p = x; + *pkeyp = pk; + return (1); + err: + return (0); +} + +/* + * Add extension using V3 code: we can set the config file as NULL because we + * wont reference any other sections. */ int add_ext(X509 *cert, int nid, char *value) - { - X509_EXTENSION *ex; - X509V3_CTX ctx; - /* This sets the 'context' of the extensions. */ - /* No configuration database */ - X509V3_set_ctx_nodb(&ctx); - /* Issuer and subject certs: both the target since it is self signed, - * no request and no CRL - */ - X509V3_set_ctx(&ctx, cert, cert, NULL, NULL, 0); - ex = X509V3_EXT_conf_nid(NULL, &ctx, nid, value); - if (!ex) - return 0; - - X509_add_ext(cert,ex,-1); - X509_EXTENSION_free(ex); - return 1; - } - +{ + X509_EXTENSION *ex; + X509V3_CTX ctx; + /* This sets the 'context' of the extensions. */ + /* No configuration database */ + X509V3_set_ctx_nodb(&ctx); + /* + * Issuer and subject certs: both the target since it is self signed, no + * request and no CRL + */ + X509V3_set_ctx(&ctx, cert, cert, NULL, NULL, 0); + ex = X509V3_EXT_conf_nid(NULL, &ctx, nid, value); + if (!ex) + return 0; + + X509_add_ext(cert, ex, -1); + X509_EXTENSION_free(ex); + return 1; +} diff --git a/openssl/demos/x509/mkreq.c b/openssl/demos/x509/mkreq.c index d1cba9dc5..4d2ad79b5 100644 --- a/openssl/demos/x509/mkreq.c +++ b/openssl/demos/x509/mkreq.c @@ -1,4 +1,5 @@ -/* Certificate request creation. Demonstrates some request related +/* + * Certificate request creation. Demonstrates some request related * operations. */ @@ -10,153 +11,158 @@ #include #include #ifndef OPENSSL_NO_ENGINE -#include +# include #endif int mkreq(X509_REQ **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days); int add_ext(STACK_OF(X509_EXTENSION) *sk, int nid, char *value); int main(int argc, char **argv) - { - BIO *bio_err; - X509_REQ *req=NULL; - EVP_PKEY *pkey=NULL; +{ + BIO *bio_err; + X509_REQ *req = NULL; + EVP_PKEY *pkey = NULL; - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - bio_err=BIO_new_fp(stderr, BIO_NOCLOSE); + bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); - mkreq(&req,&pkey,512,0,365); + mkreq(&req, &pkey, 512, 0, 365); - RSA_print_fp(stdout,pkey->pkey.rsa,0); - X509_REQ_print_fp(stdout,req); + RSA_print_fp(stdout, pkey->pkey.rsa, 0); + X509_REQ_print_fp(stdout, req); - PEM_write_X509_REQ(stdout,req); + PEM_write_X509_REQ(stdout, req); - X509_REQ_free(req); - EVP_PKEY_free(pkey); + X509_REQ_free(req); + EVP_PKEY_free(pkey); #ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); + ENGINE_cleanup(); #endif - CRYPTO_cleanup_all_ex_data(); + CRYPTO_cleanup_all_ex_data(); - CRYPTO_mem_leaks(bio_err); - BIO_free(bio_err); - return(0); - } + CRYPTO_mem_leaks(bio_err); + BIO_free(bio_err); + return (0); +} static void callback(int p, int n, void *arg) - { - char c='B'; - - if (p == 0) c='.'; - if (p == 1) c='+'; - if (p == 2) c='*'; - if (p == 3) c='\n'; - fputc(c,stderr); - } +{ + char c = 'B'; + + if (p == 0) + c = '.'; + if (p == 1) + c = '+'; + if (p == 2) + c = '*'; + if (p == 3) + c = '\n'; + fputc(c, stderr); +} int mkreq(X509_REQ **req, EVP_PKEY **pkeyp, int bits, int serial, int days) - { - X509_REQ *x; - EVP_PKEY *pk; - RSA *rsa; - X509_NAME *name=NULL; - STACK_OF(X509_EXTENSION) *exts = NULL; - - if ((pk=EVP_PKEY_new()) == NULL) - goto err; - - if ((x=X509_REQ_new()) == NULL) - goto err; - - rsa=RSA_generate_key(bits,RSA_F4,callback,NULL); - if (!EVP_PKEY_assign_RSA(pk,rsa)) - goto err; - - rsa=NULL; - - X509_REQ_set_pubkey(x,pk); - - name=X509_REQ_get_subject_name(x); - - /* This function creates and adds the entry, working out the - * correct string type and performing checks on its length. - * Normally we'd check the return value for errors... - */ - X509_NAME_add_entry_by_txt(name,"C", - MBSTRING_ASC, "UK", -1, -1, 0); - X509_NAME_add_entry_by_txt(name,"CN", - MBSTRING_ASC, "OpenSSL Group", -1, -1, 0); +{ + X509_REQ *x; + EVP_PKEY *pk; + RSA *rsa; + X509_NAME *name = NULL; + STACK_OF(X509_EXTENSION) *exts = NULL; -#ifdef REQUEST_EXTENSIONS - /* Certificate requests can contain extensions, which can be used - * to indicate the extensions the requestor would like added to - * their certificate. CAs might ignore them however or even choke - * if they are present. - */ + if ((pk = EVP_PKEY_new()) == NULL) + goto err; + + if ((x = X509_REQ_new()) == NULL) + goto err; - /* For request extensions they are all packed in a single attribute. - * We save them in a STACK and add them all at once later... - */ + rsa = RSA_generate_key(bits, RSA_F4, callback, NULL); + if (!EVP_PKEY_assign_RSA(pk, rsa)) + goto err; - exts = sk_X509_EXTENSION_new_null(); - /* Standard extenions */ + rsa = NULL; - add_ext(exts, NID_key_usage, "critical,digitalSignature,keyEncipherment"); + X509_REQ_set_pubkey(x, pk); - /* This is a typical use for request extensions: requesting a value for - * subject alternative name. - */ + name = X509_REQ_get_subject_name(x); - add_ext(exts, NID_subject_alt_name, "email:steve@openssl.org"); + /* + * This function creates and adds the entry, working out the correct + * string type and performing checks on its length. Normally we'd check + * the return value for errors... + */ + X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, "UK", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "CN", + MBSTRING_ASC, "OpenSSL Group", -1, -1, 0); - /* Some Netscape specific extensions */ - add_ext(exts, NID_netscape_cert_type, "client,email"); +#ifdef REQUEST_EXTENSIONS + /* + * Certificate requests can contain extensions, which can be used to + * indicate the extensions the requestor would like added to their + * certificate. CAs might ignore them however or even choke if they are + * present. + */ + /* + * For request extensions they are all packed in a single attribute. We + * save them in a STACK and add them all at once later... + */ + exts = sk_X509_EXTENSION_new_null(); + /* Standard extenions */ -#ifdef CUSTOM_EXT - /* Maybe even add our own extension based on existing */ - { - int nid; - nid = OBJ_create("1.2.3.4", "MyAlias", "My Test Alias Extension"); - X509V3_EXT_add_alias(nid, NID_netscape_comment); - add_ext(x, nid, "example comment alias"); - } -#endif + add_ext(exts, NID_key_usage, "critical,digitalSignature,keyEncipherment"); + + /* + * This is a typical use for request extensions: requesting a value for + * subject alternative name. + */ - /* Now we've created the extensions we add them to the request */ + add_ext(exts, NID_subject_alt_name, "email:steve@openssl.org"); - X509_REQ_add_extensions(x, exts); + /* Some Netscape specific extensions */ + add_ext(exts, NID_netscape_cert_type, "client,email"); - sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free); +# ifdef CUSTOM_EXT + /* Maybe even add our own extension based on existing */ + { + int nid; + nid = OBJ_create("1.2.3.4", "MyAlias", "My Test Alias Extension"); + X509V3_EXT_add_alias(nid, NID_netscape_comment); + add_ext(x, nid, "example comment alias"); + } +# endif + + /* Now we've created the extensions we add them to the request */ + + X509_REQ_add_extensions(x, exts); + + sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free); #endif - - if (!X509_REQ_sign(x,pk,EVP_sha1())) - goto err; - - *req=x; - *pkeyp=pk; - return(1); -err: - return(0); - } - -/* Add extension using V3 code: we can set the config file as NULL - * because we wont reference any other sections. + + if (!X509_REQ_sign(x, pk, EVP_sha1())) + goto err; + + *req = x; + *pkeyp = pk; + return (1); + err: + return (0); +} + +/* + * Add extension using V3 code: we can set the config file as NULL because we + * wont reference any other sections. */ int add_ext(STACK_OF(X509_EXTENSION) *sk, int nid, char *value) - { - X509_EXTENSION *ex; - ex = X509V3_EXT_conf_nid(NULL, NULL, nid, value); - if (!ex) - return 0; - sk_X509_EXTENSION_push(sk, ex); - - return 1; - } - +{ + X509_EXTENSION *ex; + ex = X509V3_EXT_conf_nid(NULL, NULL, nid, value); + if (!ex) + return 0; + sk_X509_EXTENSION_push(sk, ex); + + return 1; +} -- cgit v1.2.3