diff options
author | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
commit | ff48c0d9098080b51ea12710029135916d117806 (patch) | |
tree | 96e6af9caf170ba21a1027b24e306a07e27d7b75 /openssl/include | |
parent | bb731f5ac92655c4860a41fa818a7a63005f8369 (diff) | |
download | vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2 vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip |
svn merge -r514:HEAD ^/branches/released .
Diffstat (limited to 'openssl/include')
-rw-r--r-- | openssl/include/openssl/camellia.h (renamed from openssl/include/openssl/fips.h) | 0 | ||||
-rw-r--r-- | openssl/include/openssl/cms.h (renamed from openssl/include/openssl/fips_rand.h) | 0 | ||||
-rw-r--r-- | openssl/include/openssl/mdc2.h (renamed from openssl/include/openssl/md2.h) | 0 | ||||
-rw-r--r-- | openssl/include/openssl/modes.h (renamed from openssl/include/openssl/pq_compat.h) | 0 | ||||
-rw-r--r-- | openssl/include/openssl/seed.h (renamed from openssl/include/openssl/store.h) | 0 | ||||
-rw-r--r-- | openssl/include/openssl/ts.h (renamed from openssl/include/openssl/tmdiff.h) | 0 | ||||
-rw-r--r-- | openssl/include/openssl/whrlpool.h | 0 |
7 files changed, 0 insertions, 0 deletions
diff --git a/openssl/include/openssl/fips.h b/openssl/include/openssl/camellia.h index e69de29bb..e69de29bb 100644 --- a/openssl/include/openssl/fips.h +++ b/openssl/include/openssl/camellia.h diff --git a/openssl/include/openssl/fips_rand.h b/openssl/include/openssl/cms.h index e69de29bb..e69de29bb 100644 --- a/openssl/include/openssl/fips_rand.h +++ b/openssl/include/openssl/cms.h diff --git a/openssl/include/openssl/md2.h b/openssl/include/openssl/mdc2.h index e69de29bb..e69de29bb 100644 --- a/openssl/include/openssl/md2.h +++ b/openssl/include/openssl/mdc2.h diff --git a/openssl/include/openssl/pq_compat.h b/openssl/include/openssl/modes.h index e69de29bb..e69de29bb 100644 --- a/openssl/include/openssl/pq_compat.h +++ b/openssl/include/openssl/modes.h diff --git a/openssl/include/openssl/store.h b/openssl/include/openssl/seed.h index e69de29bb..e69de29bb 100644 --- a/openssl/include/openssl/store.h +++ b/openssl/include/openssl/seed.h diff --git a/openssl/include/openssl/tmdiff.h b/openssl/include/openssl/ts.h index e69de29bb..e69de29bb 100644 --- a/openssl/include/openssl/tmdiff.h +++ b/openssl/include/openssl/ts.h diff --git a/openssl/include/openssl/whrlpool.h b/openssl/include/openssl/whrlpool.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/openssl/include/openssl/whrlpool.h |