diff options
author | simon <simon@FreeBSD.org> | 2006-07-29 19:14:51 +0000 |
---|---|---|
committer | simon <simon@FreeBSD.org> | 2006-07-29 19:14:51 +0000 |
commit | e07cc0214a55c667871ff33ceb54311ec000283e (patch) | |
tree | f898e2a96cfe066221d2bdd627d5eddc70044a57 /crypto/openssl/certs/factory.pem | |
parent | 9159ca2b0ed030ab3c19210cd933875c52c9ed3d (diff) | |
download | FreeBSD-src-e07cc0214a55c667871ff33ceb54311ec000283e.zip FreeBSD-src-e07cc0214a55c667871ff33ceb54311ec000283e.tar.gz |
Resolve conflicts after import of OpenSSL 0.9.8b.
Diffstat (limited to 'crypto/openssl/certs/factory.pem')
-rw-r--r-- | crypto/openssl/certs/factory.pem | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/crypto/openssl/certs/factory.pem b/crypto/openssl/certs/factory.pem deleted file mode 100644 index 8e28b39..0000000 --- a/crypto/openssl/certs/factory.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICTTCCAbagAwIBAgIBADANBgkqhkiG9w0BAQQFADBMMQswCQYDVQQGEwJHQjEM -MAoGA1UEChMDVUNMMRgwFgYDVQQLEw9JQ0UtVEVMIFByb2plY3QxFTATBgNVBAMT -DFRydXN0RmFjdG9yeTAeFw05NzA0MjIxNDM5MTRaFw05ODA0MjIxNDM5MTRaMEwx -CzAJBgNVBAYTAkdCMQwwCgYDVQQKEwNVQ0wxGDAWBgNVBAsTD0lDRS1URUwgUHJv -amVjdDEVMBMGA1UEAxMMVHJ1c3RGYWN0b3J5MIGcMAoGBFUIAQECAgQAA4GNADCB -iQKBgQCEieR8NcXkUW1f0G6aC6u0i8q/98JqS6RxK5YmHIGKCkuTWAUjzLfUa4dt -U9igGCjTuxaDqlzEim+t/02pmiBZT9HaX++35MjQPUWmsChcYU5WyzGErXi+rQaw -zlwS73zM8qiPj/97lXYycWhgL0VaiDSPxRXEUdWoaGruom4mNQIDAQABo0IwQDAd -BgNVHQ4EFgQUHal1LZr7oVg5z6lYzrhTgZRCmcUwDgYDVR0PAQH/BAQDAgH2MA8G -A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAfaggfl6FZoioecjv0dq8 -/DXo/u11iMZvXn08gjX/zl2b4wtPbShOSY5FhkSm8GeySasz+/Nwb/uzfnIhokWi -lfPZHtlCWtXbIy/TN51eJyq04ceDCQDWvLC2enVg9KB+GJ34b5c5VaPRzq8MBxsA -S7ELuYGtmYgYm9NZOIr7yU0= ------END CERTIFICATE----- |