diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libssl/doc/standards.txt | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libssl/doc/standards.txt')
| -rw-r--r-- | src/lib/libssl/doc/standards.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/libssl/doc/standards.txt b/src/lib/libssl/doc/standards.txt index a5ce778f8e..7bada8d35f 100644 --- a/src/lib/libssl/doc/standards.txt +++ b/src/lib/libssl/doc/standards.txt | |||
| @@ -69,6 +69,10 @@ PKCS#12: Personal Information Exchange Syntax Standard, version 1.0. | |||
| 69 | 3174 US Secure Hash Algorithm 1 (SHA1). D. Eastlake 3rd, P. Jones. | 69 | 3174 US Secure Hash Algorithm 1 (SHA1). D. Eastlake 3rd, P. Jones. |
| 70 | September 2001. (Format: TXT=35525 bytes) (Status: INFORMATIONAL) | 70 | September 2001. (Format: TXT=35525 bytes) (Status: INFORMATIONAL) |
| 71 | 71 | ||
| 72 | 3161 Internet X.509 Public Key Infrastructure, Time-Stamp Protocol (TSP) | ||
| 73 | C. Adams, P. Cain, D. Pinkas, R. Zuccherato. August 2001 | ||
| 74 | (Status: PROPOSED STANDARD) | ||
| 75 | |||
| 72 | 3268 Advanced Encryption Standard (AES) Ciphersuites for Transport | 76 | 3268 Advanced Encryption Standard (AES) Ciphersuites for Transport |
| 73 | Layer Security (TLS). P. Chown. June 2002. (Format: TXT=13530 bytes) | 77 | Layer Security (TLS). P. Chown. June 2002. (Format: TXT=13530 bytes) |
| 74 | (Status: PROPOSED STANDARD) | 78 | (Status: PROPOSED STANDARD) |