From 3064f8d199d1b1576e13039dd2c85e3cad94f852 Mon Sep 17 00:00:00 2001 From: cameronrich Date: Wed, 29 Nov 2006 01:47:26 +0000 Subject: [PATCH] some typo fixes git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@43 9a5d90b5-6617-0410-8a86-bb477d3ed2e3 --- bindings/Config.in | 6 +++--- bindings/generate_interface.pl | 2 +- samples/perl/axssl.pl | 12 ++---------- ssl/p12.c | 17 +++++++++-------- ssl/test/axTLS.withoutCA.ya | Bin 1576 -> 0 bytes 5 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 ssl/test/axTLS.withoutCA.ya diff --git a/bindings/Config.in b/bindings/Config.in index 5af0c0ce5..bf916b13d 100644 --- a/bindings/Config.in +++ b/bindings/Config.in @@ -10,7 +10,7 @@ config CONFIG_BINDINGS help axTLS supports language bindings in C#, VB.NET, Java and Perl. - Select Y here if you want to build the various bindings. + Select Y here if you want to build the various language bindings. config CONFIG_CSHARP_BINDINGS bool "Create C# bindings" @@ -78,8 +78,8 @@ config CONFIG_PERL_CORE string "Location of Perl CORE" default "c:\\perl\\lib\\CORE" help: - I'm testing with: - "http://www.activestate.com/Products/ActivePerl" at the moment. + works with ActiveState + "http://www.activestate.com/Products/ActivePerl" config CONFIG_PERL_LIB string "Name of Perl Library" diff --git a/bindings/generate_interface.pl b/bindings/generate_interface.pl index 4f0fc25fa..fee6eb4c5 100755 --- a/bindings/generate_interface.pl +++ b/bindings/generate_interface.pl @@ -200,7 +200,7 @@ sub parseFile #=============================================================== -# Determine which module to build from cammand-line options +# Determine which module to build from command-line options use strict; use Getopt::Std; diff --git a/samples/perl/axssl.pl b/samples/perl/axssl.pl index 562d4747c..e0200ea0b 100755 --- a/samples/perl/axssl.pl +++ b/samples/perl/axssl.pl @@ -424,11 +424,7 @@ sub do_client $res = axtlsp::ssl_handshake_status($ssl); if ($res != $axtlsp::SSL_OK) { - if (!$quiet) - { - axtlsp::ssl_display_error($res); - } - + axtlsp::ssl_display_error($res) if !$quiet; axtlsp::ssl_free($ssl); exit 1; } @@ -456,11 +452,7 @@ sub do_client $res = axtlsp::ssl_handshake_status($ssl); if ($res != $axtlsp::SSL_OK) { - if (!$quiet) - { - axtlsp::ssl_display_error($res); - } - + axtlsp::ssl_display_error($res) if not $quiet; exit 1; } diff --git a/ssl/p12.c b/ssl/p12.c index 4f37d08bc..f88594f19 100644 --- a/ssl/p12.c +++ b/ssl/p12.c @@ -268,7 +268,9 @@ int pkcs12_decode(SSLCTX *ssl_ctx, SSLObjLoader *ssl_obj, const char *password) /* work out the MAC start/end points (done on AuthSafes) */ auth_safes_start = offset; auth_safes_end = offset; - asn1_skip_obj(buf, &auth_safes_end, ASN1_SEQUENCE); + if (asn1_skip_obj(buf, &auth_safes_end, ASN1_SEQUENCE) < 0) + goto error; + auth_safes_len = auth_safes_end - auth_safes_start; auth_safes = malloc(auth_safes_len); memcpy(auth_safes, &buf[auth_safes_start], auth_safes_len); @@ -315,9 +317,8 @@ int pkcs12_decode(SSLCTX *ssl_ctx, SSLObjLoader *ssl_obj, const char *password) { int cert_offset = key_offset; - asn1_skip_obj(cert, &cert_offset, ASN1_SEQUENCE); - - if (asn1_next_obj(cert, &key_offset, ASN1_SEQUENCE) < 0 || + if (asn1_skip_obj(cert, &cert_offset, ASN1_SEQUENCE) < 0 || + asn1_next_obj(cert, &key_offset, ASN1_SEQUENCE) < 0 || asn1_skip_obj(cert, &key_offset, ASN1_OID) < 0 || asn1_next_obj(cert, &key_offset, ASN1_EXPLICIT_TAG) < 0 || asn1_next_obj(cert, &key_offset, ASN1_SEQUENCE) < 0 || @@ -421,8 +422,9 @@ static int get_pbe_params(uint8_t *buf, int *offset, static const uint8_t pbeSH1RC4[] = /* pbeWithSHAAnd128BitRC4 */ { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x01, 0x01 }; - int i, len, ret = SSL_NOT_OK; + int i, len; uint8_t *iter = NULL; + int error_code = SSL_ERROR_NOT_SUPPORTED; /* Get the PBE type */ if (asn1_next_obj(buf, offset, ASN1_SEQUENCE) < 0 || @@ -437,7 +439,6 @@ static int get_pbe_params(uint8_t *buf, int *offset, #ifdef CONFIG_SSL_FULL_MODE printf("Error: pkcs8/pkcs12 must use \"PBE-SHA1-RC4-128\"\n"); #endif - ret = SSL_ERROR_NOT_SUPPORTED; goto error; } @@ -462,10 +463,10 @@ static int get_pbe_params(uint8_t *buf, int *offset, } free(iter); - ret = SSL_OK; /* got here - we are ok */ + error_code = SSL_OK; /* got here - we are ok */ error: - return ret; + return error_code; } #endif diff --git a/ssl/test/axTLS.withoutCA.ya b/ssl/test/axTLS.withoutCA.ya deleted file mode 100644 index 9e1bd632a2f3b9e584064412f92364fb120cfe70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1576 zcmY+@c|6k%90%~QKFm2}9Vo{<5szN4=XrXbKfbT;>-G75U*EspUmOLd0tN}-DA12E;k~pYG`<)} z5L8TojzB2T!R@#gM*-jbHG&mWz>Mwa8W;p@xAb2V5Kayz^7jQ%5DbTa2)PYU5o{IT zWr4v$Kq3X~iH*)GB%Pgim!ERFOj$QSunT!1Ud2@Hc2dQxKLZhqBuT-h6@^?~_f#Wp zE4O-^ajUJ*?=w(N|HP(t4J;~F1q;`TrIX^0z3*F{fUO1Vs_6P*?9Awvc^Hkn4R^WM zp+uZ$#+agM)Kc!^j8RsQ@~*O}sL+Je5OW8=^fsmT(z`xjcQ0!pJ7Wv~vL1fBW88MFENX! zTHA(;&e6FBA|lFJ(ACwsCVl@^etkfR$g=SW-psrMC3Qx7D z4Kwq7e5+Msl_z$8OglI0b8iN;)3H>l-;~^skn@H+*hTk^ltp>u)p}_?DKC0$e{$T# z+HmvFY<>|*smJi!{bAyYNuqgh4BfDLj_d*U%>Kznh z3Fc`d-z~zQ8w3%J1YYWpYfE$J(_-gqfIpkb7H z*>)q4gN~+pg)hns3(+}z7DwM_a&KYkXo)wgaMHU*C&kJzU+--$w@J0wkb#iniVmU4 zwmO-|k;Q92q;)ZaK|C5Z*m*CtEgr_3qQt_N?s!Hz`_dv0Eo-I3jy3BpU5IKd$HVz* zy>cHvhCR`e5ETz$2SC5Xe2ToAJCFbVZ2v4j!o+FeOI_%J+w0<8S%LQZb#EsJ9#rV3 z{SMJn<95baDG=`kk1Z<|U`bV$f@`a>s=exE@2q_AD$v0@V4WMZNR1fQ!DUOt=6kM9=rif^`B}X6mVi5d6V&+Vv|#? z&CPlw{&++2#%pXBWNi3bV_9sHY-hf_{5ZntvpI`7)JNWMh9F6opZ4cA*mwMS)z;IJ z6);Nt;<(FG(MIL?NVqKTX85=%20BhInebK;6nzqw2p>K&J&|YMMAGJANg?t z-_+K#6h_EHThXAd0!?cBb&Fex-)WdJ#S?&0RAGv0#J_}wLmBQ0mqKhOmUelk1UPleJ17 z9P1ShrXjWbLss2bRio{E0ciYV_Jkv<{%|fr<&0}vd2caL*l~4E{IV!K!SkYyD+4XR=#?O${%KQv z)@q9zR1WHXn`eA{`c&mH%rlnTbgR-h%0s2XN}YmL&0V3Nkd!~`3!L7-C;$Ke