diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
| commit | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (patch) | |
| tree | c800a66664ea3af61eb13928db45a26275930b0b /openssl/include | |
| parent | d79e641dea89c0d5d651b11971c4c9e14df34629 (diff) | |
| parent | 67326634496ef21b4acbf4cef2f05040d34aef9b (diff) | |
| download | vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.gz vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.bz2 vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/crypto/opensslconf.h
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/include')
| -rw-r--r-- | openssl/include/openssl/cmac.h | 1 | ||||
| -rw-r--r-- | openssl/include/openssl/srp.h | 1 | ||||
| -rw-r--r-- | openssl/include/openssl/srtp.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/openssl/include/openssl/cmac.h b/openssl/include/openssl/cmac.h new file mode 100644 index 000000000..bfb70c468 --- /dev/null +++ b/openssl/include/openssl/cmac.h @@ -0,0 +1 @@ +../../crypto/cmac/cmac.h
\ No newline at end of file diff --git a/openssl/include/openssl/srp.h b/openssl/include/openssl/srp.h new file mode 100644 index 000000000..16b73ebd3 --- /dev/null +++ b/openssl/include/openssl/srp.h @@ -0,0 +1 @@ +../../crypto/srp/srp.h
\ No newline at end of file diff --git a/openssl/include/openssl/srtp.h b/openssl/include/openssl/srtp.h new file mode 100644 index 000000000..9800e4ee4 --- /dev/null +++ b/openssl/include/openssl/srtp.h @@ -0,0 +1 @@ +../../ssl/srtp.h
\ No newline at end of file |