aboutsummaryrefslogtreecommitdiff
path: root/openssl/times
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-30 12:36:28 +0000
committermarha <marha@users.sourceforge.net>2010-03-30 12:36:28 +0000
commitff48c0d9098080b51ea12710029135916d117806 (patch)
tree96e6af9caf170ba21a1027b24e306a07e27d7b75 /openssl/times
parentbb731f5ac92655c4860a41fa818a7a63005f8369 (diff)
downloadvcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz
vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2
vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip
svn merge -r514:HEAD ^/branches/released .
Diffstat (limited to 'openssl/times')
-rw-r--r--openssl/times/x86/des3s.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/times/x86/des3s.cpp b/openssl/times/x86/des3s.cpp
index 02d527c05..cd2b1126f 100644
--- a/openssl/times/x86/des3s.cpp
+++ b/openssl/times/x86/des3s.cpp
@@ -60,7 +60,7 @@ void main(int argc,char *argv[])
des_encrypt3(&data[0],key1,key2,key3);
}
- printf("des %d %d (%d)\n",
+ printf("des3 %d %d (%d)\n",
e1-s1,e2-s2,((e2-s2)-(e1-s1)));
}
}